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

[Daniel Burrows]

Author: dburrows
Date: Fri Apr 22 02:33:49 2005
New Revision: 3035

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_view.cc
Log:
Ignore both vertical AND horizontal size requests for package trees, descriptions.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Apr 22 02:33:49 2005
@@ -1,5 +1,11 @@
 2005-04-21  Daniel Burrows  <dburrows@debian.org>
 
+	* src/pkg_view.cc:
+
+	  Ignore both horizontal and vertical size requests for main
+	  widgets/descriptions (should make vertical-split themes work --
+	  I believe they were broken otherwise..)
+
 	* src/generic/aptcache.cc, src/generic/aptcache.h:
 
 	  Write rudimentary code for maintaining a set of known solutions

Modified: branches/aptitude-0.3/aptitude/src/pkg_view.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_view.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_view.cc	Fri Apr 22 02:33:49 2005
@@ -447,15 +447,18 @@
       if(i->widget)
 	{
 	  // If we have a main widget or a description widget, the
-	  // vertical size of the widget in question will be ignored.
-	  int yopts=i->yopts;
+	  // size of the widget in question will be ignored.
+	  int xopts=i->xopts, yopts=i->yopts;
 
 	  if(i->type == PACKAGE_VIEW_MAINWIDGET ||
 	     i->type == PACKAGE_VIEW_DESCRIPTION)
-	    yopts|=vs_table::IGNORE_SIZE_REQUEST;
+	    {
+	      xopts|=vs_table::IGNORE_SIZE_REQUEST;
+	      yopts|=vs_table::IGNORE_SIZE_REQUEST;
+	    }
 
 	  rval->add_widget_opts(i->widget, i->row, i->col, i->h, i->w,
-				i->xopts, yopts);
+				xopts, yopts);
 
 	  i->widget->set_bg(i->bg);