[Aptitude-svn-commit] r3336 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Mon Jun  6 22:48:32 2005
New Revision: 3336

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc
Log:
Fix coloration of the menus.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun  6 22:48:32 2005
@@ -1,5 +1,11 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vscreen.cc:
+
+	Fix menu coloration by putting full style information into each
+	menu style, rather than implicitly expecting the menu code to
+	inherit from the "Menu" style (which it doesn't).
+
 	* src/vscreen/config/colors.cc, src/vscreen/config/colors.h, src/vscreen/config/style.h:
 
 	Further fixes to how styles and colors are applied to characters.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc	Mon Jun  6 22:48:32 2005
@@ -307,14 +307,13 @@
   set_style("Status",
 	    style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE)+style_attrs_on(A_BOLD));
 
-  set_style("Menu", style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE));
-  set_style("MenuEntry", style());
-  set_style("MenuBorder", style_attrs_on(A_BOLD));
-  set_style("HighlightedMenuEntry", style_attrs_flip(A_REVERSE));
+  set_style("MenuEntry", style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE));
+  set_style("MenuBorder", style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE)+style_attrs_on(A_BOLD));
+  set_style("HighlightedMenuEntry", style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE)+style_attrs_flip(A_REVERSE));
   set_style("DisabledMenuEntry",
-	    style_fg(COLOR_BLACK)+style_attrs_on(A_DIM));
-  set_style("MenuBar", style_attrs_on(A_BOLD));
-  set_style("HighlightedMenuBar", style_attrs_flip(A_REVERSE));
+	    style_fg(COLOR_BLACK)+style_bg(COLOR_BLUE)+style_attrs_on(A_DIM));
+  set_style("MenuBar", style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE)+style_attrs_on(A_BOLD));
+  set_style("HighlightedMenuBar", style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE)+style_attrs_flip(A_REVERSE));
 
   set_style("MultiplexTab", style_fg(COLOR_WHITE)+style_bg(COLOR_BLUE));
   set_style("MultiplexTabHighlighted", style_attrs_flip(A_REVERSE));