dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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