dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch

8631a2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8631a2
From: William Jon McCann <william.jon.mccann@gmail.com>
8631a2
Date: Fri, 7 Jun 2013 10:52:32 -0400
8631a2
Subject: [PATCH] Use the standard margin for the timeout string
8631a2
8631a2
So that it aligns with the other messages
8631a2
---
8631a2
 grub-core/normal/menu_text.c | 6 +++---
8631a2
 1 file changed, 3 insertions(+), 3 deletions(-)
8631a2
8631a2
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
8631a2
index 1ed2bd92cf8..7681f7d2893 100644
8631a2
--- a/grub-core/normal/menu_text.c
8631a2
+++ b/grub-core/normal/menu_text.c
8631a2
@@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,
8631a2
   if (bottom_message)
8631a2
     {
8631a2
       grub_term_gotoxy (term,
8631a2
-			(struct grub_term_coordinate) { GRUB_TERM_MARGIN,
8631a2
+			(struct grub_term_coordinate) { STANDARD_MARGIN,
8631a2
 			    geo->timeout_y });
8631a2
 
8631a2
       print_message (nested, edit, term, 0);
8631a2
@@ -407,14 +407,14 @@ menu_text_print_timeout (int timeout, void *dataptr)
8631a2
   if (data->timeout_msg == TIMEOUT_UNKNOWN)
8631a2
     {
8631a2
       data->timeout_msg = grub_print_message_indented_real (msg_translated,
8631a2
-							    3, 1, data->term, 1)
8631a2
+							    STANDARD_MARGIN, 1, data->term, 1)
8631a2
 	<= data->geo.timeout_lines ? TIMEOUT_NORMAL : TIMEOUT_TERSE;
8631a2
       if (data->timeout_msg == TIMEOUT_TERSE)
8631a2
 	{
8631a2
 	  grub_free (msg_translated);
8631a2
 	  msg_translated = grub_xasprintf (_("%ds"), timeout);
8631a2
 	  if (grub_term_width (data->term) < 10)
8631a2
-	    data->timeout_msg = TIMEOUT_TERSE_NO_MARGIN;
8631a2
+	    data->timeout_msg = STANDARD_MARGIN;
8631a2
 	}
8631a2
     }
8631a2