diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-02 13:53:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-02 13:53:18 +0000 |
| commit | 699251f9dfdfae5d5caa49591fa89c96d603fc2d (patch) | |
| tree | d27e4852547c47c9a9b97038618c710270cbb203 | |
| parent | 7b3e6c7768cdb0e4b095ccc769321e609809787c (diff) | |
| download | drakx-backup-do-not-use-699251f9dfdfae5d5caa49591fa89c96d603fc2d.tar drakx-backup-do-not-use-699251f9dfdfae5d5caa49591fa89c96d603fc2d.tar.gz drakx-backup-do-not-use-699251f9dfdfae5d5caa49591fa89c96d603fc2d.tar.bz2 drakx-backup-do-not-use-699251f9dfdfae5d5caa49591fa89c96d603fc2d.tar.xz drakx-backup-do-not-use-699251f9dfdfae5d5caa49591fa89c96d603fc2d.zip | |
ensure the window is big enough in 640x480: remove logo and steps window
| -rw-r--r-- | perl-install/install_gtk.pm | 8 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 25765837c..013dc9bbc 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -110,6 +110,8 @@ sub create_help_window { sub create_steps_window { my ($o) = @_; + return if $::stepswidth == 0; + $o->{steps_window}->destroy if $o->{steps_window}; my $w = bless {}, 'ugtk2'; @@ -138,6 +140,8 @@ sub create_steps_window { sub create_logo_window { my ($o) = @_; + return if $::logowidth == 0; + gtkdestroy($o->{logo_window}); my $w = bless {}, 'ugtk2'; @@ -166,8 +170,8 @@ sub init_sizes() { ($::rootwidth, $::rootheight) = (Gtk2::Gdk->screen_width, Gtk2::Gdk->screen_height); $::live and $::rootheight -= 80; #- ($::rootheight, $::rootwidth) = (min(768, $::rootheight), min(1024, $::rootwidth)); - ($::stepswidth, $::stepsheight) = (160, $::rootheight); - ($::logowidth, $::logoheight) = (500, 40); + ($::stepswidth, $::stepsheight) = $::rootwidth <= 640 ? (0, 0) : (160, $::rootheight); + ($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (500, 40); ($::helpwidth, $::helpheight) = ($::rootwidth - $::stepswidth, 0); ($::windowwidth, $::windowheight) = ($::rootwidth - $::stepswidth, $::rootheight - $::helpheight - $::logoheight); } diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 0c6d0dbed..c56565a96 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -736,8 +736,8 @@ sub new { $::WizardWindow->add($::WizardTable); if ($::isInstall) { - $::WizardTable->set_size_request($::windowwidth * 0.90, $::windowheight * 0.73); - $::WizardWindow->set_uposition($::stepswidth + $::windowwidth * 0.04, $::logoheight + $::windowheight * 0.15); + $::WizardTable->set_size_request($::windowwidth * 0.90, $::windowheight * ($::logoheight ? 0.73 : 0.9)); + $::WizardWindow->set_uposition($::stepswidth + $::windowwidth * 0.04, $::logoheight + $::windowheight * ($::logoheight ? 0.15 : 0.05)); $::WizardWindow->signal_connect(key_press_event => sub { my (undef, $event) = @_; my $d = ${{ Gtk2::Gdk::Event::Key->Sym_F1 => 'help', |