diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2006-01-12 13:08:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2006-01-12 13:08:04 +0000 |
| commit | 6be298cc4d2e993aa9ca5dff37ca741fdd67e67a (patch) | |
| tree | 66d944284cab32ef4a01ed31bb9716c5fef6b900 /perl-install/Xconfig | |
| parent | 03a9a972ce256129d304d973dd0e1100b1df6190 (diff) | |
| download | drakx-6be298cc4d2e993aa9ca5dff37ca741fdd67e67a.tar drakx-6be298cc4d2e993aa9ca5dff37ca741fdd67e67a.tar.gz drakx-6be298cc4d2e993aa9ca5dff37ca741fdd67e67a.tar.bz2 drakx-6be298cc4d2e993aa9ca5dff37ca741fdd67e67a.tar.xz drakx-6be298cc4d2e993aa9ca5dff37ca741fdd67e67a.zip | |
defaulting to 1024x768 instead of 800x600 when the monitor size is unknown
(since a lot of people expect this, and that's what fedora is doing, cf #20304)
Diffstat (limited to 'perl-install/Xconfig')
| -rw-r--r-- | perl-install/Xconfig/resolution_and_depth.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm index 4842b0adc..294266480 100644 --- a/perl-install/Xconfig/resolution_and_depth.pm +++ b/perl-install/Xconfig/resolution_and_depth.pm @@ -154,9 +154,11 @@ sub choices { put_in_hash($resolution_wanted, $monitors->[0]{preferred_resolution}); } elsif ($monitors->[0]{ModelName} =~ /^Flat Panel (\d+)x(\d+)$/) { put_in_hash($resolution_wanted, { X => $1, Y => $2 }); - } else { - my ($X, $Y) = split('x', size2default_resolution($monitors->[0]{diagonal_size} * 1.08 || 14)); + } elsif ($monitors->[0]{diagonal_size}) { + my ($X, $Y) = split('x', size2default_resolution($monitors->[0]{diagonal_size} * 1.08)); put_in_hash($resolution_wanted, { X => $X, Y => $Y }); + } else { + put_in_hash($resolution_wanted, { X => 1024, Y => 768 }); } } my @matching = grep { $_->{X} eq $resolution_wanted->{X} && $_->{Y} eq $resolution_wanted->{Y} } @resolutions; |