diff options
| -rw-r--r-- | perl-install/interactive/gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index acb8179f2..a77f49e8a 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -568,7 +568,7 @@ sub ask_fromW { @widgets_advanced = map_index { $create_widget->($_, $::i + @$l) } @$l2; my $pack = create_box_with_title($mainw, @{$common->{messages}}); - $mainw->{rwindow}->set_size_request(720, 420) if $mainw->{pop_it} && @$l; + ugtk2::set_main_window_size($mainw) if $mainw->{pop_it} && @$l; my $first_time = 1; my $set_advanced = sub { @@ -616,7 +616,7 @@ sub ask_fromW { create_scrolled_window(gtkpack(Gtk2::VBox->new(0,0), $always_pack, if_(@widgets_advanced, $advanced_pack)), - [ 'automatic', 'automatic' ], 'none')) if @$l; + [ 'automatic', 'automatic' ], 'none')) if @$l || !$mainw->{pop_it}; if ($buttons_pack) { if ($::isWizard && !$mainw->{pop_it} && $::isInstall) { diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index d5e680a82..c7665b4a4 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -873,6 +873,7 @@ sub new { $o->{window} = Gtk2::VBox->new(0,0); $o->{window}->set_border_width($::Wizard_splash ? 0 : 10); $o->{rwindow} = $o->{window}; + set_main_window_size($o); if (!defined($::WizardWindow) && !$::isEmbedded) { $::WizardWindow = Gtk2::Window->new('toplevel'); $::WizardWindow->signal_connect(delete_event => sub { die 'wizcancel' }); @@ -882,7 +883,6 @@ sub new { $::WizardWindow->add(gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'out'), $::WizardTable)); if ($::isInstall) { - $::WizardTable->set_size_request($::windowwidth * 0.90, $::windowheight * ($::logoheight ? 0.73 : 0.9)); $::WizardWindow->set_uposition($::stepswidth + $::windowwidth * 0.04 + ($::move && 50), $::logoheight + $::windowheight * ($::logoheight ? 0.12 : 0.05)); $::WizardWindow->signal_connect(key_press_event => sub { my (undef, $event) = @_; @@ -924,7 +924,6 @@ sub new { $::WizardWindow->set_position('center_always') if !$::isStandalone; $::WizardTable->attach($draw1, 0, 2, 0, 1, 'fill', 'fill', 0, 0); - $::WizardTable->set_size_request(540,460); } $::WizardWindow->show_all; flush(); @@ -949,6 +948,14 @@ sub new { $o; } +sub set_main_window_size { + my ($o) = @_; + my ($width, $height) = + $::isInstall ? ($::windowwidth * 0.90, $::windowheight * ($::logoheight ? 0.73 : 0.9)) : + $o->{isWizard} ? (540, 360) : (600, 400); + $o->{window}->set_size_request($width, $height); +} + sub main { my ($o, $o_completed, $o_canceled) = @_; gtkset_mousecursor_normal(); |