nalika / rpms / grub2

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