From 33b710f83c1fe9e2e641383a22e48e1407dd47bb Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Thu, 15 Oct 2009 17:48:08 +0000 Subject: offer to resize last big enough windows partition instead of the first one, until user can chose --- perl-install/NEWS | 2 ++ perl-install/fs/partitioning_wizard.pm | 9 ++++++--- perl-install/install/NEWS | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 74fecd0df..94c770847 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -4,6 +4,8 @@ - partitioning wizard: o initialize correctly labels for windows resizing o fix labels for windows resizing when getting back to the screen + o offer to resize last big enough windows partition instead + of the first one, until user can chose Version 12.65 - 14 October 2009 diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 3cbdb3e51..b1826f2be 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -297,6 +297,9 @@ sub create_display_box { my $ev; my $desc; + my $last; + + $last = $resize->[-1] if $resize; foreach my $entry (@parts) { my $info = $entry->{device_LABEL}; my $w = Gtk2::Label->new($info); @@ -304,10 +307,10 @@ sub create_display_box { $ev = Gtk2::EventBox->new; $ev->add($w); my $part; - if ($resize) { - ($part) = grep { $_->{device} eq "$entry->{device}" } @$resize; + if ($last && $last->{device} eq "$entry->{device}") { + $part = $last; } - if ($resize && $part && !$desc) { + if ($part) { $ev->set_name("PART_vfat"); $w->set_size_request(ceil($ratio * $part->{min_win}), 0); my $ev2 = Gtk2::EventBox->new; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b37607080..4a85ac570 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -2,6 +2,8 @@ - partitioning wizard: o initialize correctly labels for windows resizing o fix labels for windows resizing when getting back to the screen + o offer to resize last big enough windows partition instead + of the first one, until user can chose Version 12.65 - 14 October 2009 -- cgit v1.2.1