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