summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-10-15 17:27:49 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-10-15 17:27:49 +0000
commit3f7180214b0d40b825bb4d0bcb165252ec3a7ba1 (patch)
tree4414b6ea812a1d79f69ecf9ef3add0351388c8bc
parentbe684b48acc3da5cd3a9c07b500b134edddd2a9f (diff)
downloaddrakx-3f7180214b0d40b825bb4d0bcb165252ec3a7ba1.tar
drakx-3f7180214b0d40b825bb4d0bcb165252ec3a7ba1.tar.gz
drakx-3f7180214b0d40b825bb4d0bcb165252ec3a7ba1.tar.bz2
drakx-3f7180214b0d40b825bb4d0bcb165252ec3a7ba1.tar.xz
drakx-3f7180214b0d40b825bb4d0bcb165252ec3a7ba1.zip
fix labels for windows resizing when getting back to the screen
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/partitioning_wizard.pm10
-rw-r--r--perl-install/install/NEWS1
3 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c9b183863..74fecd0df 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,7 @@
- mount windows partitions under /media instead of /mnt (#53392)
- partitioning wizard:
o initialize correctly labels for windows resizing
+ o fix labels for windows resizing when getting back to the screen
Version 12.65 - 14 October 2009
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index ca0b9f532..3cbdb3e51 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -345,22 +345,22 @@ 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);
- sub update_size_labels {
+ my $update_size_labels = sub {
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});
+ $update_size_labels->($part->{req_size}, $part->{size}-$part->{req_size});
0;
});
- update_size_labels($size, $part->{size}-$size);
+ $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});
- update_size_labels($part->{req_size}, $part->{size}-$part->{req_size});
+ $update_size_labels->($part->{req_size}, $part->{size}-$part->{req_size});
1;
});
$hpane->signal_connect('button-press-event' => sub {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4f1bc100a..b37607080 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- mount windows partitions under /media instead of /mnt (#53392)
- partitioning wizard:
o initialize correctly labels for windows resizing
+ o fix labels for windows resizing when getting back to the screen
Version 12.65 - 14 October 2009