nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone
4fe85b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4fe85b
From: William Jon McCann <william.jon.mccann@gmail.com>
4fe85b
Date: Wed, 15 May 2013 16:47:33 -0400
4fe85b
Subject: [PATCH] Don't draw a border around the menu
4fe85b
4fe85b
It looks cleaner without it.
4fe85b
---
4fe85b
 grub-core/normal/menu_text.c | 43 -------------------------------------------
4fe85b
 1 file changed, 43 deletions(-)
4fe85b
4fe85b
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
4fe85b
index 6202c2a16c9..beddd7f81c1 100644
4fe85b
--- a/grub-core/normal/menu_text.c
4fe85b
+++ b/grub-core/normal/menu_text.c
4fe85b
@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
4fe85b
   grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
4fe85b
 }
4fe85b
 
4fe85b
-static void
4fe85b
-draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
4fe85b
-{
4fe85b
-  int i;
4fe85b
-
4fe85b
-  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
4fe85b
-
4fe85b
-  grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
4fe85b
-	geo->first_entry_y - 1 });
4fe85b
-  grub_putcode (GRUB_UNICODE_CORNER_UL, term);
4fe85b
-  for (i = 0; i < geo->entry_width + 1; i++)
4fe85b
-    grub_putcode (GRUB_UNICODE_HLINE, term);
4fe85b
-  grub_putcode (GRUB_UNICODE_CORNER_UR, term);
4fe85b
-
4fe85b
-  for (i = 0; i < geo->num_entries; i++)
4fe85b
-    {
4fe85b
-      grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
4fe85b
-	    geo->first_entry_y + i });
4fe85b
-      grub_putcode (GRUB_UNICODE_VLINE, term);
4fe85b
-      grub_term_gotoxy (term,
4fe85b
-			(struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
4fe85b
-			    geo->first_entry_y + i });
4fe85b
-      grub_putcode (GRUB_UNICODE_VLINE, term);
4fe85b
-    }
4fe85b
-
4fe85b
-  grub_term_gotoxy (term,
4fe85b
-		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
4fe85b
-			geo->first_entry_y - 1 + geo->num_entries + 1 });
4fe85b
-  grub_putcode (GRUB_UNICODE_CORNER_LL, term);
4fe85b
-  for (i = 0; i < geo->entry_width + 1; i++)
4fe85b
-    grub_putcode (GRUB_UNICODE_HLINE, term);
4fe85b
-  grub_putcode (GRUB_UNICODE_CORNER_LR, term);
4fe85b
-
4fe85b
-  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
4fe85b
-
4fe85b
-  grub_term_gotoxy (term,
4fe85b
-		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
4fe85b
-			(geo->first_entry_y - 1 + geo->num_entries
4fe85b
-			 + GRUB_TERM_MARGIN + 1) });
4fe85b
-}
4fe85b
-
4fe85b
 static int
4fe85b
 print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
4fe85b
 {
4fe85b
@@ -403,8 +362,6 @@ grub_menu_init_page (int nested, int edit,
4fe85b
 
4fe85b
   grub_term_normal_color = grub_color_menu_normal;
4fe85b
   grub_term_highlight_color = grub_color_menu_highlight;
4fe85b
-  if (geo->border)
4fe85b
-    draw_border (term, geo);
4fe85b
   grub_term_normal_color = old_color_normal;
4fe85b
   grub_term_highlight_color = old_color_highlight;
4fe85b
   geo->timeout_y = geo->first_entry_y + geo->num_entries