From f429b9881d47f6ab882f71ef95e965d32484d37d Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Fri, 20 Feb 2004 08:53:31 +0000
Subject: don't force buttons a size related to $::windowwidth since this is no
 more used to size the main window (fixes missing Next button in vgahi), use a
 global $::real_windowwidth for sizings related to the main window

---
 perl-install/install_gtk.pm       | 1 +
 perl-install/install_steps_gtk.pm | 2 +-
 perl-install/interactive/gtk.pm   | 2 +-
 perl-install/ugtk2.pm             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 78eee6bc5..b1eebb006 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -238,6 +238,7 @@ sub init_sizes() {
     ($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (500, 40);
     ($::helpwidth,   $::helpheight)   = ($::rootwidth - $::stepswidth, $::move && 15);
     ($::windowwidth, $::windowheight) = ($::rootwidth - $::stepswidth, $::rootheight - $::helpheight - $::logoheight);
+    ($::real_windowwidth, $::real_windowheight) = (576, 418);
     $::move and $::windowwidth -= 100;
 }
 
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 9947d3fb5..2faaa16af 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -641,7 +641,7 @@ sub summary_prompt {
 	};
 	$e->{widget} = Gtk2::Label->new;
 	$e->{widget}->set_property(wrap => 1);
-	$e->{widget}->set_size_request($::windowwidth * 0.65, -1);
+	$e->{widget}->set_size_request($::real_windowwidth * 0.72, -1);
 	push @table, [], [ gtkpack__(Gtk2::HBox->new(0, 30), '', $e->{widget}),
 			   gtksignal_connect(Gtk2::Button->new(N("Configure")), clicked => sub { 
 						 $w->{rwindow}->hide;
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 37e427f7f..d34e9a5f4 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -662,7 +662,7 @@ sub ask_fromW {
     if ($buttons_pack) {
 	if ($::isWizard && !$mainw->{pop_it} && $::isInstall) {
 	    #- is this still needed?
-	    $buttons_pack->set_size_request($::windowwidth * 0.9 - 20, -1);
+	    $buttons_pack->set_size_request($::real_windowwidth - 20, -1);
 	    $buttons_pack = gtkpack__(Gtk2::HBox->new(0,0), $buttons_pack);
 	}
 	$pack->pack_start(gtkshow($buttons_pack), 0, 0, 0);
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index dfa848a38..29f0b4767 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -930,7 +930,7 @@ sub new {
 }
 sub set_main_window_size {
     my ($o) = @_;
-    my ($width, $height) = $::isInstall ? (576, 418) : $o->{isWizard} ? (540, 360) : (600, 400);
+    my ($width, $height) = $::isInstall ? ($::real_windowwidth, $::real_windowheight) : $o->{isWizard} ? (540, 360) : (600, 400);
     $o->{window}->set_size_request($width, $height);
 }
 
-- 
cgit v1.2.1