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

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 02:49:31 2005
New Revision: 3125

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Get a display that actually works again.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 02:49:31 2005
@@ -1,5 +1,9 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/ui.cc:
+
+	  Use FILL so that we get a display that actually works.
+
 	* src/pkg_view.cc:
 
 	  When setting up the description, insert all widgets with

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Wed Apr 27 02:49:31 2005
@@ -487,7 +487,7 @@
 							 pkg_item::pkg_columnizer::defaults),
 					   PACKAGE "::UI::Package-Header-Format",
 					   0, 0, 1, 1,
-					   vs_table::ALIGN_CENTER | vs_table::EXPAND | vs_table::SHRINK,
+					   vs_table::ALIGN_CENTER | vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
 					   vs_table::ALIGN_CENTER,
 					   get_color("ScreenHeaderColor"),
 					   "",
@@ -495,8 +495,8 @@
 					   true));
 
   basic_format.push_back(package_view_item("main", 1, 0, 1, 1,
-					   vs_table::EXPAND | vs_table::SHRINK,
-					   vs_table::EXPAND | vs_table::SHRINK,
+					   vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
+					   vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
 					   get_color("DefaultWidgetBackground"),
 					   true));
 
@@ -506,15 +506,15 @@
 							 pkg_item::pkg_columnizer::defaults),
 					   PACKAGE "::UI::Package-Status-Format",
 					   2, 0, 1, 1,
-					   vs_table::ALIGN_CENTER | vs_table::EXPAND | vs_table::SHRINK,
+					   vs_table::ALIGN_CENTER | vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
 					   vs_table::ALIGN_CENTER,
 					   get_color("ScreenStatusColor"),
 					   "", "",
 					   true));
 
   basic_format.push_back(package_view_item("desc", 3, 0, 1, 1,
-					   vs_table::EXPAND | vs_table::SHRINK,
-					   vs_table::EXPAND | vs_table::SHRINK,
+					   vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
+					   vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
 					   get_color("DefaultWidgetBackground"),
 					   "ShowHideDescription", "",
 					   allow_visible_desc && aptcfg->FindB(PACKAGE "::UI::Description-Visible-By-Default", true)));
@@ -1650,24 +1650,24 @@
 
   help_bar *help_label=new help_bar(buf, get_color("ScreenStatusColor"));
   main_table->add_widget_opts(help_label, 0, 0, 1, 1,
-			      vs_table::EXPAND | vs_table::SHRINK,
+			      vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
 			      vs_table::ALIGN_CENTER);
   aptcfg->connect(string(PACKAGE "::UI::HelpBar"),
 		  sigc::mem_fun(*help_label, &help_bar::set_visibility));
 
   main_multiplex=new vs_multiplex;
   main_table->add_widget_opts(main_multiplex, 1, 0, 1, 1,
-			      vs_table::EXPAND | vs_table::SHRINK,
-			      vs_table::EXPAND | vs_table::SHRINK);
+			      vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
+			      vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK);
   main_multiplex->show();
 
   main_table->add_widget_opts(make_broken_indicator(), 2, 0, 1, 1,
-			      vs_table::EXPAND | vs_table::SHRINK,
+			      vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
 			      vs_table::ALIGN_CENTER);
 
   main_status_multiplex=new vs_multiplex;
   main_table->add_widget_opts(main_status_multiplex, 3, 0, 1, 1,
-			      vs_table::EXPAND | vs_table::SHRINK,
+			      vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
 			      vs_table::ALIGN_CENTER);
   main_status_multiplex->show();