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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun  6 17:41:30 2005
New Revision: 3313

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h
Log:
Update the menubar.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun  6 17:41:30 2005
@@ -1,3 +1,9 @@
+2005-06-06  Daniel Burrows  <dburrows@debian.org>
+
+	* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h:
+
+	Update the menubar for the new display protocol.
+
 2005-06-04  Daniel Burrows  <dburrows@debian.org>
 
 	* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc	Mon Jun  6 17:41:30 2005
@@ -425,22 +425,25 @@
   return true;
 }
 
-void vs_menubar::paint()
+void vs_menubar::paint(const style &st)
 {
   if(subwidget)
-    subwidget->display();
+    subwidget->display(st);
 
   if(active || always_visible)
     {
+      const style menubar_style=get_style("MenuBar");
+      const style highlightedmenubar_style=get_style("HighlightedMenuBar");
+
       if(active)
 	for(activemenulist::reverse_iterator i=active_menus.rbegin();
 	    i!=active_menus.rend();
 	    i++)
-	  (*i)->display();
+	  (*i)->display(st);
 
       int loc=0, maxx=getmaxx();
 
-      attrset(get_color("MenuBar"));
+      apply_style(menubar_style);
       move(0, 0);
       for(int i=0; i<maxx; i++)
 	addch(' ');
@@ -448,9 +451,9 @@
       for(itemlist::size_type i=0; i<items.size() && loc<maxx; i++)
 	{
 	  if(active && i==curloc)
-	    attrset(get_color("HighlightedMenuBar"));
+	    apply_style(highlightedmenubar_style);
 	  else
-	    attrset(get_color("MenuBar"));
+	    apply_style(menubar_style);
 
 	  mvaddnstr(0, loc, items[i].title.c_str(), maxx-loc);
 	  loc+=items[i].title.size();

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h	Mon Jun  6 17:41:30 2005
@@ -82,7 +82,7 @@
   void add_widget(vscreen_widget *w) {abort();}
   void rem_widget(vscreen_widget *w) {abort();}
 
-  virtual void paint();
+  virtual void paint(const style &st);
   virtual bool focus_me();
   virtual void dispatch_mouse(short id, int x, int y, int z,
 			      mmask_t bmask);