grub2/0473-Use-the-standard-margin-for-the-timeout-string.patch
Peter Jones f74b50e380 Rebase to upstream, fix a pile of bugs. The usual.
Signed-off-by: Peter Jones <pjones@redhat.com>
2013-06-12 15:37:08 -04:00

45 lines
1.6 KiB
Diff

From d9f3f7ecbc3935778b038ed73cb6408d1dd8763c Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 10:52:32 -0400
Subject: [PATCH 473/482] Use the standard margin for the timeout string
So that it aligns with the other messages
---
grub-core/normal/menu_text.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index be803b2..5f6654f 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -366,7 +366,7 @@ grub_menu_init_page (int nested, int edit,
+ geo->border + empty_lines;
if (bottom_message)
{
- grub_term_gotoxy (term, GRUB_TERM_MARGIN,
+ grub_term_gotoxy (term, STANDARD_MARGIN,
geo->timeout_y);
print_message (nested, edit, term, 0);
@@ -403,7 +403,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
if (data->timeout_msg == TIMEOUT_UNKNOWN)
{
data->timeout_msg = grub_print_message_indented_real (msg_translated,
- 3, 1, data->term, 1)
+ STANDARD_MARGIN, 1, data->term, 1)
<= data->geo.timeout_lines ? TIMEOUT_NORMAL : TIMEOUT_TERSE;
if (data->timeout_msg == TIMEOUT_TERSE)
{
@@ -415,7 +415,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
}
grub_print_message_indented (msg_translated,
- data->timeout_msg == TIMEOUT_TERSE_NO_MARGIN ? 0 : 3,
+ data->timeout_msg == TIMEOUT_TERSE_NO_MARGIN ? 0 : STANDARD_MARGIN,
data->timeout_msg == TIMEOUT_TERSE_NO_MARGIN ? 0 : 1,
data->term);
grub_free (msg_translated);
--
1.8.2.1