[Aptitude-devel] r3115 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 01:42:24 2005
New Revision: 3115

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.h
Log:
Display the 'check' of toggle buttons in the vertical center of the button.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 01:42:24 2005
@@ -1,5 +1,10 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_togglebutton.cc:
+
+	  Fix the display of toggle buttons; in particular, make sure the
+	  "check" gets lined up in the center of the button.
+
 	* src/vscreen/testvscreen.cc:
 
 	  In the button test screen, use different settings to insert the

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.cc	Wed Apr 27 01:42:24 2005
@@ -19,9 +19,9 @@
 {
 }
 
-void vs_togglebutton::paint_check()
+void vs_togglebutton::paint_check(int row)
 {
-  mvaddch(0, 0, bracketl);
+  mvaddch(row, 0, bracketl);
 
   if(checked)
     addch(mark);
@@ -39,24 +39,21 @@
 
   for(size_t i=0; i<lines.size(); ++i)
     {
-      if(get_isfocussed())
-	{
-	  bkgdset(get_bg()^A_REVERSE);
-	  attrset(get_bg()^A_REVERSE);
-	}
-
       if(i==checkheight)
-	paint_check();
-      else
-	{
-	  for(int j=0; j<4; ++j)
-	    mvaddch(i, j, ' ');
-	}
-
-      if(get_isfocussed())
 	{
-	  bkgdset(get_bg());
-	  attrset(get_bg());
+	  if(get_isfocussed())
+	    {
+	      bkgdset(get_bg()^A_REVERSE);
+	      attrset(get_bg()^A_REVERSE);
+	    }
+
+	  paint_check(i);
+
+	  if(get_isfocussed())
+	    {
+	      bkgdset(get_bg());
+	      attrset(get_bg());
+	    }
 	}
 
       mvaddnstr(i, 4, lines[i], lines[i].size());

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_togglebutton.h	Wed Apr 27 01:42:24 2005
@@ -15,7 +15,7 @@
   bool checked;
   char bracketl, mark, bracketr;
 
-  void paint_check();
+  void paint_check(int row);
 
 protected:
   void silent_set_checked(bool _checked);