[Aptitude-devel] r3214 - in branches/aptitude-0.3/aptitude: . src
Daniel Burrows
dburrows@costa.debian.org
Sat, 30 Apr 2005 23:49:13 +0000
Author: dburrows
Date: Sat Apr 30 23:49:08 2005
New Revision: 3214
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/solution_dialog.cc
Log:
Fix the scrollbar visibility problem in the solution dialog.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Apr 30 23:49:08 2005
@@ -1,5 +1,12 @@
2005-04-30 Daniel Burrows <dburrows@debian.org>
+ * src/solution_dialog.cc:
+
+ Fix up the layout options in the solution dialog. The most
+ important change is that the button box is now shrinkable, which
+ in turn means that the scrollbar will always be visible (because
+ the first column of the table will be preferentially shrunk).
+
* src/cmdline/cmdline_prompt.cc:
After running the resolver, always fall out to the main loop, so
Modified: branches/aptitude-0.3/aptitude/src/solution_dialog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_dialog.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_dialog.cc Sat Apr 30 23:49:08 2005
@@ -130,12 +130,12 @@
t->add_widget_opts(display,
0, 0, 1, 1,
vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK,
- vs_table::FILL | vs_table::SHRINK);
+ vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK);
t->add_widget_opts(scrl,
0, 1, 1, 1,
- 0,
- vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK);
+ vs_table::ALIGN_RIGHT,
+ vs_table::ALIGN_CENTER | vs_table::FILL);
vs_table *bt=new vs_table;
@@ -178,7 +178,7 @@
vs_table::FILL | vs_table::EXPAND, vs_table::FILL);
t->add_widget_opts(bt, 1, 0, 1, 2,
- vs_table::FILL | vs_table::EXPAND, 0);
+ vs_table::FILL | vs_table::EXPAND | vs_table::SHRINK, 0);
return rval;
}