diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-18 21:14:20 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-18 21:14:20 +0000 |
| commit | b8feee1e1e0883126b2e905a6f4dbf5d38546f80 (patch) | |
| tree | b269929b760ac4ef22ee60c5fe84f3e860d845e4 | |
| parent | 8e30d319278a5caa125173b0fe248b9e5b30b2b4 (diff) | |
| download | drakx-b8feee1e1e0883126b2e905a6f4dbf5d38546f80.tar drakx-b8feee1e1e0883126b2e905a6f4dbf5d38546f80.tar.gz drakx-b8feee1e1e0883126b2e905a6f4dbf5d38546f80.tar.bz2 drakx-b8feee1e1e0883126b2e905a6f4dbf5d38546f80.tar.xz drakx-b8feee1e1e0883126b2e905a6f4dbf5d38546f80.zip | |
smaller wizard window in move
| -rw-r--r-- | perl-install/install_gtk.pm | 5 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 57bbd4734..7746dadc3 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -184,7 +184,7 @@ sub update_steps_position { sub create_logo_window { my ($o) = @_; - return if $::logowidth == 0; + return if $::logowidth == 0 || $::move; gtkdestroy($o->{logo_window}); @@ -228,9 +228,10 @@ sub init_sizes() { $::live and $::rootheight -= 80; #- ($::rootheight, $::rootwidth) = (min(768, $::rootheight), min(1024, $::rootwidth)); $::move or $::stepswidth = $::rootwidth <= 640 ? 0 : 160; - $::move or ($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (500, 40); + ($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (500, 40); ($::helpwidth, $::helpheight) = ($::rootwidth - $::stepswidth, 0); ($::windowwidth, $::windowheight) = ($::rootwidth - $::stepswidth, $::rootheight - $::helpheight - $::logoheight); + $::move and $::windowwidth -= 100; } #------------------------------------------------------------------------------ diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 2c187dcd1..f228b39ff 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -837,7 +837,7 @@ sub new { if ($::isInstall) { $::WizardTable->set_size_request($::windowwidth * 0.90, $::windowheight * ($::logoheight ? 0.73 : 0.9)); - $::WizardWindow->set_uposition($::stepswidth + $::windowwidth * 0.04, $::logoheight + $::windowheight * ($::logoheight ? 0.12 : 0.05)); + $::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) = @_; my $d = ${{ $Gtk2::Gdk::Keysyms{F2} => 'screenshot' }}{$event->keyval}; |