diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-08-19 14:33:21 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-08-19 14:33:21 +0000 |
| commit | f12dedeffc187e863999f266e7895ba316fcc816 (patch) | |
| tree | 510e7bb79957229b59d98ae70cbef36eb04e93fd | |
| parent | 04408433cf1514ceb2e3e6a45d576af5f293a57a (diff) | |
| download | drakx-f12dedeffc187e863999f266e7895ba316fcc816.tar drakx-f12dedeffc187e863999f266e7895ba316fcc816.tar.gz drakx-f12dedeffc187e863999f266e7895ba316fcc816.tar.bz2 drakx-f12dedeffc187e863999f266e7895ba316fcc816.tar.xz drakx-f12dedeffc187e863999f266e7895ba316fcc816.zip | |
(init_sizes,_create_Window) do not account anymore logo size when computing
positions since it's now included in steps box
| -rw-r--r-- | perl-install/install/gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/mygtk2.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index d541ffbbf..9f3b30b56 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -240,7 +240,7 @@ sub init_sizes { ($::rootwidth, $::rootheight) = (Gtk2::Gdk->screen_width, Gtk2::Gdk->screen_height); $::stepswidth = $::rootwidth <= 640 ? 0 : 196; ($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (800, 75); - ($o->{windowwidth}, $o->{windowheight}) = ($::rootwidth - $::stepswidth, $::rootheight - $::logoheight); + ($o->{windowwidth}, $o->{windowheight}) = ($::rootwidth - $::stepswidth, $::rootheight); ($::real_windowwidth, $::real_windowheight) = (576, 418); } diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index d9e987c00..722952025 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -991,7 +991,7 @@ sub _create_Window { if_($::isInstall, position => [ $::rootwidth + $::stepswidth - ($::o->{windowwidth} + $::real_windowwidth) / 2, - $::logoheight + ($::o->{windowheight} - $::real_windowheight) / 2, + ($::o->{windowheight} - $::real_windowheight) / 2, ]), }); my $w = _gtk(undef, 'Window', 'gtknew', $opts); @@ -1031,7 +1031,7 @@ sub _create_Window { (undef, undef, $wi, $he) = @w_size; $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2), - max(0, $::logoheight + ($::o->{windowheight} - $he) / 2)); + max(0, ($::o->{windowheight} - $he) / 2)); }); #- without this, the focus is broken during install, though this is not needed during X test, why?? $w->show; |