summaryrefslogtreecommitdiffstats
path: root/perl-install/interactive
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-22 12:30:52 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-22 12:30:52 +0000
commitb60167a7e9414750f8c5c183e98da811dc9fcee9 (patch)
tree97df66a64874f00e47435acc17c9c8f807ac4430 /perl-install/interactive
parentb0bad9c0d6988e6a499741460481faf39e489487 (diff)
downloaddrakx-b60167a7e9414750f8c5c183e98da811dc9fcee9.tar
drakx-b60167a7e9414750f8c5c183e98da811dc9fcee9.tar.gz
drakx-b60167a7e9414750f8c5c183e98da811dc9fcee9.tar.bz2
drakx-b60167a7e9414750f8c5c183e98da811dc9fcee9.tar.xz
drakx-b60167a7e9414750f8c5c183e98da811dc9fcee9.zip
(create_widgets_block) restore support for right alignement for simple
widgets while still not using fillers when packing both a label & a widget (as in eg ask_user_and_root()) regression introduced in r245853 on 2008-09-17: "(create_widget,create_widgets_block) better layout for right aligned widgets"
Diffstat (limited to 'perl-install/interactive')
-rw-r--r--perl-install/interactive/gtk.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 29ccae084..df4375209 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -656,10 +656,13 @@ sub create_widgets_block {
]);
}
+ my $eater = gtknew('Label') if $e->{alignment} eq 'right' && !$label_w;
+
$e->{real_w} = gtkpack_(Gtk2::HBox->new,
if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }),
+ if_($eater, 1, $eater),
if_($label_w, $e->{alignment} eq 'right', $label_w),
- (1, $e->{real_w}),
+ (!$eater, $e->{real_w}),
);
}
gtknew('VBox', children => [ map { $_->{grow} || 0, $_->{real_w} } @$l ]);