summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-01-02 15:34:46 +0000
committerThierry Vignaud <tv@mandriva.org>2008-01-02 15:34:46 +0000
commit0645249d999dc089971e0b73f1f59d4f9f5aff04 (patch)
treed2772dd0a9184276b765e2fb38cf32f1807a7dde
parent08ed06c42fc3390ca8983fd52127a75d26c89c48 (diff)
downloadcontrol-center-0645249d999dc089971e0b73f1f59d4f9f5aff04.tar
control-center-0645249d999dc089971e0b73f1f59d4f9f5aff04.tar.gz
control-center-0645249d999dc089971e0b73f1f59d4f9f5aff04.tar.bz2
control-center-0645249d999dc089971e0b73f1f59d4f9f5aff04.tar.xz
control-center-0645249d999dc089971e0b73f1f59d4f9f5aff04.zip
regroup sizing code
-rwxr-xr-xcontrol-center5
1 files changed, 3 insertions, 2 deletions
diff --git a/control-center b/control-center
index 1abca77a..a333b6b6 100755
--- a/control-center
+++ b/control-center
@@ -47,8 +47,6 @@ my $themes_dir = "$mcc_dir/themes/";
my (%tool_pids, %tool_feedback);
my ($version, $conffile, $class_install) = (`cat /etc/mandrakelinux-release` =~ /\b(\d+\.{1}.+\))/, "/etc/mcc.conf", "/etc/sysconfig/system");
-my $root_size = join('x', gtkroot()->get_size());
-my ($default_width, $default_heigth) = member($root_size, '640x480', '800x600') ? (720, 523) : (800, 600);
require_root_capability() if !$::testing; # just to get root capabilities
@@ -1181,6 +1179,9 @@ my ($timeout, %check_boxes, $emb_socket);
# set default size:
+my $root_size = join('x', gtkroot()->get_size());
+my ($default_width, $default_heigth) = member($root_size, '640x480', '800x600') ? (720, 523) : (800, 600);
+
my @min_size = $root_size eq '640x480' ? (620, 460) : (680, 500);
my $window_global = gtkset_size_request(Gtk2::Window->new('toplevel'), @min_size);