aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2010-12-02 21:54:55 +0000
committerJohannes Schickel2010-12-02 21:54:55 +0000
commita29adaa77ceb6434fabe72499d94f3fb597e12fd (patch)
treed096025b6d87428ce6b80f4bfb0efec00ba424f4
parentd6fadb2cb47fcb39cc0d866aa7722e765f38baaa (diff)
downloadscummvm-rg350-a29adaa77ceb6434fabe72499d94f3fb597e12fd.tar.gz
scummvm-rg350-a29adaa77ceb6434fabe72499d94f3fb597e12fd.tar.bz2
scummvm-rg350-a29adaa77ceb6434fabe72499d94f3fb597e12fd.zip
GUI: Prevent high res versions of the themes to be picked for 544x333.
This fixes a problem in case the high resolution theme file was picked up before the low resolution theme file and thus it was directly chosen. svn-id: r54746
-rw-r--r--gui/themes/default.inc2
-rw-r--r--gui/themes/scummclassic.zipbin91242 -> 91252 bytes
-rw-r--r--gui/themes/scummclassic/classic_layout.stx2
-rw-r--r--gui/themes/scummmodern.zipbin198574 -> 198584 bytes
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx2
5 files changed, 3 insertions, 3 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 2874a41893..2fc3ac91c4 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,5 +1,5 @@
"<?xml version = '1.0'?>"
-"<layout_info resolution='-320xY,-256x240,-Xx272,-Xx350'> "
+"<layout_info resolution='-320xY,-256x240,-Xx272,-544x333,-Xx350'> "
"<globals> "
"<def var='Line.Height' value='16' /> "
"<def var='Font.Height' value='16' /> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index c802b49ba5..e3377f6d7a 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 7804a8c821..d47da9f486 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -23,7 +23,7 @@
- $Id$
-
-->
-<layout_info resolution = '-320xY, -256x240, -Xx272, -Xx350'>
+<layout_info resolution = '-320xY, -256x240, -Xx272, -544x333, -Xx350'>
<globals>
<def var = 'Line.Height' value = '16' />
<def var = 'Font.Height' value = '16' />
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 6f3e70fbb3..8dda7f1724 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index c00d0c961c..014489191b 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -23,7 +23,7 @@
- $Id$
-
-->
-<layout_info resolution = '-320xY, -256x240, -Xx272, -Xx350'>
+<layout_info resolution = '-320xY, -256x240, -Xx272, -544x333, -Xx350'>
<globals>
<def var = 'Line.Height' value = '16' />
<def var = 'Font.Height' value = '16' />