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