From e8f363f3900308cc3205e76a2b01b3f34b2f18f5 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Sun, 18 Oct 2009 19:27:12 +0000 Subject: partitioning_wizard: use available space in the window --- perl-install/NEWS | 1 + perl-install/fs/partitioning_wizard.pm | 11 ++++++----- perl-install/install/NEWS | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index a00423513..71f4258ae 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -6,6 +6,7 @@ o display mount point if known o display ext2 like ext3/4 o allow setting new windows size with keyboard (#54691) + o use available space Version 12.66 - 15 October 2009 diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 76ff56257..1dbdb0303 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -283,7 +283,7 @@ sub create_display_box { $width -= 24 if $resize || $fill_empty; my $minwidth = 40; - my $display_box = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), $width, 24); + my $display_box = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 24); my $ratio = $totalsectors ? ($width - @parts * ($minwidth+1)) / $totalsectors : 1; while (1) { @@ -393,7 +393,7 @@ sub create_display_box { 'other')); } $w->set_size_request($entry->{size} * $ratio + $minwidth, 0); - ugtk2::gtkpack__($display_box, $ev); + ugtk2::gtkpack($display_box, $ev); } my $sep = Gtk2::Label->new("."); @@ -463,18 +463,19 @@ sub display_choices { $item = Gtk2::EventBox->new; my $b2 = Gtk2::Label->new("Mandriva"); $item->add($b2); - $b2->set_size_request(516,24); + $b2->set_size_request(-1,24); $item->set_name("PART_new"); } elsif ($s eq 'diskdrake') { } else { log::l($s); next; } - ugtk2::gtkpack2__($vbox, + $vbox->set_size_request(1024, -1); + ugtk2::gtkpack($vbox, ugtk2::gtknew('Label', text => $solutions{$s}[1], alignment => [0, 0])); - ugtk2::gtkpack2__($vbox, $item) if defined($item); + ugtk2::gtkpack($vbox, $item) if defined($item); $button->set_group($oldbutton->get_group) if $oldbutton; $oldbutton = $button; $button->signal_connect('pressed', sub { $mainw->{sol} = $solutions{$s} }); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c56791ca8..fbc1ec5cf 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -4,6 +4,7 @@ o display mount point if known o display ext2 like ext3/4 o allow setting new windows size with keyboard (#54691) + o use available space Version 12.66 - 15 October 2009 -- cgit v1.2.1