diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index ce820a95e..37b31c109 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -220,7 +220,9 @@ sub init_sizes { ($::rootwidth, $::rootheight) = (Gtk3::Gdk::Screen::width, Gtk3::Gdk::Screen::height); $::stepswidth = $::rootwidth <= 640 ? 0 : 196; ($o->{windowwidth}, $o->{windowheight}) = ($::rootwidth - $::stepswidth, $::rootheight); - ($::real_windowwidth, $::real_windowheight) = (576, 465); + # Adapt the window size to available screen width and height. + $::real_windowwidth = $::rootwidth > 800 ? $::rootwidth - 224 : 576; + $::real_windowheight = $::rootheight > 600 ? $::rootheight - 135 : 465; } sub handle_unsafe_mouse { diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 61f367f3f..eb4e42c77 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -114,7 +114,7 @@ sub _launchX { my @options = $wanted_DISPLAY; if ($server eq 'Xnest') { - push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600'); + push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '1024x768'); } else { install::gtk::createXconf($f, $Driver); @@ -600,7 +600,7 @@ sub installPackages { my $progress_total = 0; $box->pack_end(gtkshow(gtknew('VBox', border_width => 7, spacing => 3, children_loose => [ gtknew('ScrolledWindow', child => $pkg_log_widget, - hide_ref => \$show_advertising, height => 250, to_bottom => 1), + hide_ref => \$show_advertising, height => $::real_windowheight - 215, to_bottom => 1), gtknew('ProgressBar', fraction_ref => \ (my $pkg_progress), hide_ref => \$show_advertising), gtknew('HButtonBox', layout => 'start', children_loose => [ N("Time remaining:"), |