summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-19 22:07:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-19 22:07:17 +0000
commit94a35dbb62826db3a21ca5aacf5850b17b1522c8 (patch)
tree7b30df3bfb11e2b6c9e606f980947707abf96bcc
parentcd7a2e965a162c96348e429604676232e813b929 (diff)
downloaddrakx-backup-do-not-use-94a35dbb62826db3a21ca5aacf5850b17b1522c8.tar
drakx-backup-do-not-use-94a35dbb62826db3a21ca5aacf5850b17b1522c8.tar.gz
drakx-backup-do-not-use-94a35dbb62826db3a21ca5aacf5850b17b1522c8.tar.bz2
drakx-backup-do-not-use-94a35dbb62826db3a21ca5aacf5850b17b1522c8.tar.xz
drakx-backup-do-not-use-94a35dbb62826db3a21ca5aacf5850b17b1522c8.zip
(ask_from_entries_refW): better sizing in case of scrolls
-rw-r--r--perl-install/interactive_gtk.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index a0860d90e..7c238e129 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -461,16 +461,18 @@ sub ask_from_entries_refW {
1, $create_widgets->(@widgets_always),
if_($common->{ok} || $::isWizard,
0, $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @$l2 ? $advanced_button : ())));
+ my @adv = map { warp_text($_) } @{$common->{advanced_messages}};
+ $total_size += @adv;
$advanced_pack =
gtkpack_(new Gtk::VBox(0,0),
0, '',
- (map {; 0, new Gtk::Label($_) } map { warp_text($_) } @{$common->{advanced_messages}}),
+ (map {; 0, new Gtk::Label($_) } @adv),
0, new Gtk::HSeparator,
1, $create_widgets->(@widgets_advanced));
$pack->pack_start($advanced_pack, 1, 1, 0);
gtkadd($mainw->{window}, $pack);
- $mainw->{window}->set_usize(0, min($total_size > 10 ? 350 : 200, $::windowheight - 60)) if $has_scroll;
+ $mainw->{window}->set_usize(0, min($total_size >= 10 ? 350 : 200, $::windowheight - 60)) if $has_scroll;
$set_advanced->(0);
(@widgets ? $widgets[0]{w} : $common->{focus_cancel} ? $mainw->{cancel} : $mainw->{ok})->grab_focus();