diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-12 11:35:34 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-12 11:35:34 +0000 |
| commit | 30c91ad54bfca1530c542e1b78f531087b47f71a (patch) | |
| tree | ce9dc40d0102fab1c675105621a731f148f8d149 | |
| parent | 556e09d5b8683e9e01b645017a2943eaa683aa38 (diff) | |
| download | drakx-backup-do-not-use-30c91ad54bfca1530c542e1b78f531087b47f71a.tar drakx-backup-do-not-use-30c91ad54bfca1530c542e1b78f531087b47f71a.tar.gz drakx-backup-do-not-use-30c91ad54bfca1530c542e1b78f531087b47f71a.tar.bz2 drakx-backup-do-not-use-30c91ad54bfca1530c542e1b78f531087b47f71a.tar.xz drakx-backup-do-not-use-30c91ad54bfca1530c542e1b78f531087b47f71a.zip | |
fix embedding:
- prevent subwindows being too small
- prevent subwindows breaking when canceled
| -rw-r--r-- | perl-install/interactive/gtk.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 39463e47e..d4b841c78 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -660,7 +660,7 @@ sub ask_fromW { my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @help, if_(@$l2, $advanced_button)); $pack->pack_start(gtkshow($always_pack), 1, 1, 0); - $advanced_pack = create_scrolled_window($advanced_pack, [ 'never', 'automatic' ], 'none') if !$::isEmbedded; + $advanced_pack = create_scrolled_window($advanced_pack, [ 'never', 'automatic' ], 'none') if !$mainw->{isEmbedded}; $pack->pack_start($advanced_pack, 1, 1, 0) if @widgets_advanced; if ($buttons_pack) { if ($::isWizard && !$mainw->{pop_it} && $::isInstall) { @@ -669,7 +669,7 @@ sub ask_fromW { } $pack->pack_start(gtkshow($buttons_pack), 0, 0, 0); } - gtkadd($mainw->{window}, $::isEmbedded ? create_scrolled_window($pack, [ 'automatic', 'automatic' ], 'none') : $pack); + gtkadd($mainw->{window}, $mainw->{isEmbedded} ? create_scrolled_window($pack, [ 'automatic', 'automatic' ], 'none') : $pack); $set_default_size->() if $has_scroll_always; $set_advanced->($common->{advanced_state}); |