summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-20 01:35:32 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-20 01:56:10 +0100
commitf9104f228828d8871548a917461cbd01285b1fb4 (patch)
tree7a8bdaf8f653e953b7346166ade672f4c1af68de
parent5a10bf42289cdb03e40819db2903041ffc83111d (diff)
downloaddrakx-f9104f228828d8871548a917461cbd01285b1fb4.tar
drakx-f9104f228828d8871548a917461cbd01285b1fb4.tar.gz
drakx-f9104f228828d8871548a917461cbd01285b1fb4.tar.bz2
drakx-f9104f228828d8871548a917461cbd01285b1fb4.tar.xz
drakx-f9104f228828d8871548a917461cbd01285b1fb4.zip
fix sizing partition widgets
ratio would be negative when allocated width was reported as 1 in some cases since commit 807df2a2b558461a2890f9bec0050f0bd974c92e
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/diskdrake/hd_gtk.pm6
-rw-r--r--perl-install/install/NEWS2
3 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1e213a6c9..828264796 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o fix sizing partition widgets
+
Version 16.23 - 16 January 2014
- dont remove pulseaudio-module-bluetooth (mga#12323)
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index e01f65b2b..266e86cd7 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -327,7 +327,11 @@ sub create_automatic_notebooks {
sub create_buttons4partitions {
my ($kind, $totalsectors, @parts) = @_;
- $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 60 if $w->{window}->get_window;
+ if ($w->{window}->get_window) {
+ my $windowwidth = $w->{window}->get_allocated_width;
+ $windowwidth = $::real_windowwidth if $windowwidth <= 1;
+ $width = $windowwidth - first(get_action_box_size()) - 60;
+ }
my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1;
my $i = 1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 415c90218..f99e6d6bc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- fix detecting if basesystem is installed (mga#10722)
thus fixing "basesystem package not selected"
+- partitioning:
+ o fix sizing partition widgets
Version 16.25 - 19 January 2014