From 14eb1e5893eb7bc6748cf388df7cb05a3f05c7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@netscape.net>
Date: Sat, 6 May 2017 20:02:52 +0200
Subject: Increase the default window size of the installer to 1024x768
 (mga#20624)

This permits to correctly display the different panels as some
of them contain quite a lot of data.
---
 images/make_boot_img              | 4 +---
 perl-install/install/gtk.pm       | 4 +++-
 perl-install/install/steps_gtk.pm | 4 ++--
 tools/drakx-in-chroot             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/images/make_boot_img b/images/make_boot_img
index 21c75689c..accf8aef3 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -11,7 +11,7 @@ my ($arch) = $Config{archname} =~ /(.*?)-/;
 
 my $default_append = 'audit=0';
 my $default_acpi = '';
-my $default_vga = "vga=788 splash quiet";
+my $default_vga = "vga=791 splash quiet";
 my $default_iswmd = "noiswmd";
 my $timeout = $ENV{BOOT_AUTOMATIC_METHOD} ? 5 : 150;
 my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin';
@@ -255,8 +255,6 @@ sub syslinux_all_files {
 
     @$kernels or die "syslinux_all_files: no kernel\n";
 
-    $default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash';
-
     each_index {
 	mkdir "$dir/$arch", 0777;
 	_ "cp all.kernels/$_/vmlinuz $dir/$arch";
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:"), 
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 5bcd9d533..6565ec9e0 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -16,14 +16,14 @@ my $COMPRESSED_FILE_REL = $COMPRESSED_LOCATION_REL . 'mdkinst.sqfs';
 my $AUTO_INSTALL_ROOTED = '/tmp/auto_inst.cfg.pl';
 my $DEFCFG_ROOTED = '/tmp/defcfg.pl';
 my $RPMSRATE_ROOTED = '/tmp/rpmsrate';
-my $resolution = '800x600';
+my $resolution = '1024x768';
 my ($disk_iso_repository, $repository_uri);
 
 @ARGV >= 2 or die "usage: drakx-in-chroot <root of distrib> <dir to install to> [options]\n
 \nOptions specific to drakx-in-chroot:
     --flang XX            use XX locale
     --disk-iso            path of a distro
-    --resolution=XXXxYYYY (eg: --resolution=1024x768)\n
+    --resolution=XXXxYYYY (eg: --resolution=800x600)\n
     --repository=<path>   path of packages repository
     --text                text mode installer
     --depth=XX            set screen color depth
-- 
cgit v1.2.1