diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-02-28 16:43:07 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-02-28 16:43:07 +0000 |
| commit | bee2e6f27702fbf964dbe63ff59af2568ab514fa (patch) | |
| tree | 4a7ea96f1080085cabaf7e0025065a1bc396db04 | |
| parent | 197448ca3df0cef34ecff894804984648a243966 (diff) | |
| download | drakx-backup-do-not-use-bee2e6f27702fbf964dbe63ff59af2568ab514fa.tar drakx-backup-do-not-use-bee2e6f27702fbf964dbe63ff59af2568ab514fa.tar.gz drakx-backup-do-not-use-bee2e6f27702fbf964dbe63ff59af2568ab514fa.tar.bz2 drakx-backup-do-not-use-bee2e6f27702fbf964dbe63ff59af2568ab514fa.tar.xz drakx-backup-do-not-use-bee2e6f27702fbf964dbe63ff59af2568ab514fa.zip | |
try to fix if no chosen width has been found.
| -rw-r--r-- | perl-install/Xconfigurator.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index be876b71b..7bd9464a0 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -827,6 +827,7 @@ sub chooseResolutionsGtk($$;$) { } } $chosen_w = $best_w; + $chosen_w ||= 640; #- safe guard ? my $set_depth = sub { $depth_combo->entry->set_text(translate($depths{$chosen_depth})) }; @@ -840,7 +841,7 @@ sub chooseResolutionsGtk($$;$) { $monitor{1152} = [ gtkcreate_png("monitor-" . 1024 . ".png") ]; $monitor{1600} = [ gtkcreate_png("monitor-" . 1280 . ".png") ]; - my $pixmap_m = new Gtk::Pixmap( $monitor{$chosen_w}[0] , $monitor{$chosen_w}[1] ); + my $pixmap_mo = new Gtk::Pixmap( $monitor{$chosen_w}[0] , $monitor{$chosen_w}[1] ); while (my ($w, $h) = each %w2h) { my $V = $w . "x" . $h; @@ -867,7 +868,7 @@ sub chooseResolutionsGtk($$;$) { ), 1, gtkpack2(new Gtk::VBox(0,0), gtkpack2__(new Gtk::VBox(0, $::isEmbedded ? 15 : 0), - if_($::isEmbedded, $pixmap_m), + if_($::isEmbedded, $pixmap_mo), if_(!$::isEmbedded, map {$w2widget{$_} } ikeys(%w2widget)), gtkpack2(new Gtk::HBox(0,0), create_packtable({ col_spacings => 5, row_spacings => 5}, @@ -903,7 +904,7 @@ sub chooseResolutionsGtk($$;$) { $w2_combo->entry->signal_connect(changed => sub { ($chosen_w) = $w2_combo->entry->get_text =~ /([^x]*)x.*/; $no_human ? $no_human=0 : $w2widget{$chosen_w}->set_active(1); - $pixmap_m->set($monitor{$chosen_w}[0], $monitor{$chosen_w}[1]); + $pixmap_mo->set($monitor{$chosen_w}[0], $monitor{$chosen_w}[1]); }); } &$set_depth(); |