dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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