summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-10-15 17:05:30 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-10-15 17:05:30 +0000
commitbe684b48acc3da5cd3a9c07b500b134edddd2a9f (patch)
treece6e743fc61f6f55bfec1c22aeea1aebc7023dc8
parent4cf2b859f4d505f75685d1790e703816f51e8306 (diff)
downloaddrakx-be684b48acc3da5cd3a9c07b500b134edddd2a9f.tar
drakx-be684b48acc3da5cd3a9c07b500b134edddd2a9f.tar.gz
drakx-be684b48acc3da5cd3a9c07b500b134edddd2a9f.tar.bz2
drakx-be684b48acc3da5cd3a9c07b500b134edddd2a9f.tar.xz
drakx-be684b48acc3da5cd3a9c07b500b134edddd2a9f.zip
initialize correctly labels for windows resizing
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/partitioning_wizard.pm12
-rw-r--r--perl-install/install/NEWS2
3 files changed, 11 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index bb734e91a..c9b183863 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- finish-install: do not offer to configure 3D desktop if none is
installed (requires drak3d >= 1.27)
- mount windows partitions under /media instead of /mnt (#53392)
+- partitioning wizard:
+ o initialize correctly labels for windows resizing
Version 12.65 - 14 October 2009
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 6fe41bfa6..ca0b9f532 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -345,16 +345,18 @@ sub create_display_box {
ugtk2::gtkset_size_request($mdv_size_label, 150, 20);
ugtk2::gtkpack__($desc, $mdv_size_label);
$mdv_size_label->set_alignment(0,0.5);
- $hpane->signal_connect('size-allocate' => sub {
- my (undef, $alloc) = @_;
- $part->{width} = $alloc->width;
- 0;
- });
sub update_size_labels {
my ($size1, $size2) = @_;
$win_size_label->set_label(" Windows (" . formatXiB($size1, 512) . ")");
$mdv_size_label->set_label(" Mandriva (" . formatXiB($size2, 512) . ")");
}
+ $hpane->signal_connect('size-allocate' => sub {
+ my (undef, $alloc) = @_;
+ $part->{width} = $alloc->width;
+ $part->{req_size} = int($hpane->get_position * $part->{size} / $part->{width});
+ update_size_labels($part->{req_size}, $part->{size}-$part->{req_size});
+ 0;
+ });
update_size_labels($size, $part->{size}-$size);
$hpane->signal_connect('motion-notify-event' => sub {
$part->{req_size} = int($hpane->get_position * $part->{size} / $part->{width});
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 33b5e463c..4f1bc100a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,6 @@
- mount windows partitions under /media instead of /mnt (#53392)
+- partitioning wizard:
+ o initialize correctly labels for windows resizing
Version 12.65 - 14 October 2009