[Scummvm-git-logs] scummvm branch-2-7 -> bf1aa27f60103fe7ee17eec36a06e6bda4fec244
sev-
noreply at scummvm.org
Fri Mar 17 23:15:24 UTC 2023
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fcfe0aaae3 GUI: Support >= and <= in resolution filter
b4f435f346 GUI: Add ability to check layout resolution against constants
b0b4b9541b GUI: THEMES: Switch hardcoded resolution checks for layout switching to constants
bf1aa27f60 GUI: Report threshold height different for IPHONE
Commit: fcfe0aaae39ca3b1bb5cba404577af117f85f5bb
https://github.com/scummvm/scummvm/commit/fcfe0aaae39ca3b1bb5cba404577af117f85f5bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-18T00:12:06+01:00
Commit Message:
GUI: Support >= and <= in resolution filter
Changed paths:
gui/ThemeParser.cpp
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index bb087340b9e..3f404e5a5d3 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -1063,7 +1063,18 @@ bool ThemeParser::resolutionCheck(const Common::String &resolution) {
return false;
}
- int token = atoi(cur.c_str() + 2);
+ bool eq = false;
+ int offset = 2;
+
+ if (cur[2] == '=') {
+ eq = true;
+ offset++;
+ }
+
+ int token = atoi(cur.c_str() + offset);
+
+ if (eq && val == token)
+ return true;
// check inverse for unfulfilled requirements
if (lt) {
Commit: b4f435f346e4cf39060d44bd35534051c2053826
https://github.com/scummvm/scummvm/commit/b4f435f346e4cf39060d44bd35534051c2053826
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-18T00:12:50+01:00
Commit Message:
GUI: Add ability to check layout resolution against constants
Changed paths:
gui/ThemeParser.cpp
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 3f404e5a5d3..2bdc7228b1c 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -1040,7 +1040,7 @@ bool ThemeParser::resolutionCheck(const Common::String &resolution) {
bool lt;
int val;
- if (cur.size() < 5) {
+ if (cur.size() < 3) {
warning("Invalid theme 'resolution' token '%s'", resolution.c_str());
return false;
}
@@ -1071,7 +1071,15 @@ bool ThemeParser::resolutionCheck(const Common::String &resolution) {
offset++;
}
- int token = atoi(cur.c_str() + offset);
+ int token;
+
+ if (cur[offset] == 'W') { // Reported threshold width
+ token = 320;
+ } else if (cur[offset] == 'H') { // Reported threshold height
+ token = 400;
+ } else {
+ token = atoi(cur.c_str() + offset);
+ }
if (eq && val == token)
return true;
Commit: b0b4b9541b5a6f7d59952d8e3463cef20e9a5f60
https://github.com/scummvm/scummvm/commit/b0b4b9541b5a6f7d59952d8e3463cef20e9a5f60
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-18T00:14:20+01:00
Commit Message:
GUI: THEMES: Switch hardcoded resolution checks for layout switching to constants
No theme version bump is required since the previous versions are compatible.
Changed paths:
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/default.inc
gui/themes/residualvm.zip
gui/themes/residualvm/remastered_gfx.stx
gui/themes/scummclassic.zip
gui/themes/scummclassic/classic_gfx.stx
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummmodern/scummmodern_gfx.stx
gui/themes/scummremastered.zip
gui/themes/scummremastered/remastered_gfx.stx
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 29bb5301638..f516b89d5e9 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -19,7 +19,7 @@
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->
-<layout_info resolution = 'y>399'>
+<layout_info resolution = 'y>=H'>
<globals>
<def var = 'Line.Height' value = '16' scalable = 'yes'/>
<def var = 'Font.Height' value = '16' scalable = 'yes'/>
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index d77bd40234c..6c23c5890a0 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -19,7 +19,7 @@
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->
-<layout_info resolution = 'y<400'>
+<layout_info resolution = 'y<H'>
<globals>
<def var = 'Line.Height' value = '12' scalable = 'yes'/>
<def var = 'Font.Height' value = '10' scalable = 'yes'/>
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index df6b58ef7e0..6a59c1c5ac1 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -22,21 +22,21 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</palette>"
"<fonts>"
-"<font resolution='y>399' "
+"<font resolution='y>=H' "
"id='text_default'>"
"<language id='*' file='helvb12.bdf'/>"
"</font>"
"<font id='text_default'>"
"<language id='*' file='clR6x12.bdf'/>"
"</font>"
-"<font resolution='y>399' "
+"<font resolution='y>=H' "
"id='text_button'>"
"<language id='*' file='helvb12.bdf'/>"
"</font>"
"<font id='text_button'>"
"<language id='*' file='clR6x12.bdf'/>"
"</font>"
-"<font resolution='y>399' "
+"<font resolution='y>=H' "
"id='text_normal'>"
"<language id='*' file='helvb12.bdf'/>"
"</font>"
@@ -152,7 +152,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"fg_color='green' "
"/>"
"</drawdata>"
-"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'>"
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -168,7 +168,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='top' "
"/>"
"</drawdata>"
-"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'>"
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -184,7 +184,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='top' "
"/>"
"</drawdata>"
-"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'>"
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -200,7 +200,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='top' "
"/>"
"</drawdata>"
-"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'>"
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -272,7 +272,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"fill='none' "
"/>"
"</drawdata>"
-"<drawdata id='popup_idle' cache='false' resolution='y>399'>"
+"<drawdata id='popup_idle' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -303,7 +303,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_idle_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='popup_idle_rtl' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -334,7 +334,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_idle' cache='false' resolution='y<400'>"
+"<drawdata id='popup_idle' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -365,7 +365,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_idle_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='popup_idle_rtl' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -396,7 +396,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_disabled' cache='false' resolution='y>399'>"
+"<drawdata id='popup_disabled' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -427,7 +427,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_disabled_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='popup_disabled_rtl' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -458,7 +458,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_disabled' cache='false' resolution='y<400'>"
+"<drawdata id='popup_disabled' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -489,7 +489,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_disabled_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='popup_disabled_rtl' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -520,7 +520,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_hover' cache='false' resolution='y>399'>"
+"<drawdata id='popup_hover' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -551,7 +551,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_hover_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='popup_hover_rtl' cache='false' resolution='y>=H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -582,7 +582,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_hover' cache='false' resolution='y<400'>"
+"<drawdata id='popup_hover' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -613,7 +613,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"horizontal_align='start' "
"/>"
"</drawdata>"
-"<drawdata id='popup_hover_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='popup_hover_rtl' cache='false' resolution='y<H'>"
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
@@ -725,7 +725,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"fill='none' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_idle' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_idle' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -756,7 +756,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='0,0,17,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_idle_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_idle_rtl' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -787,7 +787,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='17,0,0,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_idle' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_idle' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -808,7 +808,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_idle_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_idle_rtl' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -829,7 +829,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_left' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_hover_left' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button_hover' "
"vertical_align='center' "
@@ -860,7 +860,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='0,0,17,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_left_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_hover_left_rtl' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button_hover' "
"vertical_align='center' "
@@ -891,7 +891,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='17,0,0,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_left' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_hover_left' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button_hover' "
"vertical_align='center' "
@@ -912,7 +912,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_left_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_hover_left_rtl' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button_hover' "
"vertical_align='center' "
@@ -933,7 +933,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_right' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_hover_right' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -964,7 +964,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='0,0,17,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_right_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_hover_right_rtl' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -995,7 +995,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='17,0,0,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_right' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_hover_right' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -1016,7 +1016,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_hover_right_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_hover_right_rtl' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -1037,7 +1037,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_disabled' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_disabled' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button_disabled' "
"vertical_align='center' "
@@ -1068,7 +1068,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='0,0,17,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_disabled_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_disabled_rtl' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button_disabled' "
"vertical_align='center' "
@@ -1099,7 +1099,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"padding='17,0,0,1' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_disabled' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_disabled' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button_disabled' "
"vertical_align='center' "
@@ -1120,7 +1120,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_disabled_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_disabled_rtl' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button_disabled' "
"vertical_align='center' "
@@ -1141,7 +1141,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_left' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_pressed_left' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_alternative_inverted' "
"vertical_align='center' "
@@ -1163,7 +1163,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_left_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_pressed_left_rtl' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_alternative_inverted' "
"vertical_align='center' "
@@ -1185,7 +1185,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_left' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_pressed_left' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_alternative_inverted' "
"vertical_align='center' "
@@ -1207,7 +1207,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_left_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_pressed_left_rtl' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_alternative_inverted' "
"vertical_align='center' "
@@ -1229,7 +1229,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_right' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_pressed_right' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -1251,7 +1251,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_right_rtl' cache='false' resolution='y>399'>"
+"<drawdata id='dropdown_button_pressed_right_rtl' cache='false' resolution='y>=H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -1273,7 +1273,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_right' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_pressed_right' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -1295,7 +1295,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"orientation='bottom' "
"/>"
"</drawdata>"
-"<drawdata id='dropdown_button_pressed_right_rtl' cache='false' resolution='y<400'>"
+"<drawdata id='dropdown_button_pressed_right_rtl' cache='false' resolution='y<H'>"
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
@@ -1440,7 +1440,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</drawdata>"
"</render_info>"
;
- const char *defaultXML3 = "<layout_info resolution='y>399'>"
+ const char *defaultXML3 = "<layout_info resolution='y>=H'>"
"<globals>"
"<def var='Line.Height' value='16' scalable='yes'/>"
"<def var='Font.Height' value='16' scalable='yes'/>"
@@ -3411,7 +3411,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"</layout_info>"
;
- const char *defaultXML4 = "<layout_info resolution='y<400'>"
+ const char *defaultXML4 = "<layout_info resolution='y<H'>"
"<globals>"
"<def var='Line.Height' value='12' scalable='yes'/>"
"<def var='Font.Height' value='10' scalable='yes'/>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index c93386c9a9b..820a8c341a4 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/residualvm/remastered_gfx.stx b/gui/themes/residualvm/remastered_gfx.stx
index 66811ef49a7..8ccdfc9136e 100644
--- a/gui/themes/residualvm/remastered_gfx.stx
+++ b/gui/themes/residualvm/remastered_gfx.stx
@@ -138,7 +138,7 @@
</bitmaps>
<fonts>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_default'
file = 'helvb12.bdf'>
<!-- Add these in order of priority. First match is used -->
@@ -157,7 +157,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_button'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
@@ -175,7 +175,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_normal'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -208,7 +208,7 @@
point_size = '12'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'console'
file = 'builtinConsole'
point_size = '10'>
@@ -284,7 +284,7 @@
<!-- <defaults fill = 'gradient' fg_color = 'white'/> -->
<cursor file = 'cursor.bmp' hotspot = '0, 0'/>
- <cursor resolution = 'y<400' file = 'cursor_small.bmp' hotspot = '0, 0'/>
+ <cursor resolution = 'y<H' file = 'cursor_small.bmp' hotspot = '0, 0'/>
<!-- Selection (text or list items) -->
<drawdata id = 'text_selection' cache = 'false'>
@@ -365,7 +365,7 @@
</drawdata>
<!-- Buttons at the top and bottom of the scrollbar -->
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'none'
@@ -384,7 +384,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'none'
@@ -403,7 +403,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>=H'>
<!-- <drawstep func = 'roundedsq'
radius = '10'
fill = 'gradient'
@@ -426,7 +426,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<H'>
<!-- <drawstep func = 'roundedsq'
radius = '10'
fill = 'gradient'
@@ -542,7 +542,7 @@
</drawdata>
<!-- Idle popup -->
- <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -580,7 +580,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -619,7 +619,7 @@
/>
</drawdata>
- <drawdata id = 'popup_idle' cache = 'false' resolution ='y<400'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution ='y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -657,7 +657,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -697,7 +697,7 @@
</drawdata>
<!-- Disabled popup -->
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -735,7 +735,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -774,7 +774,7 @@
/>
</drawdata>
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -812,7 +812,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -852,7 +852,7 @@
</drawdata>
<!-- Hovered popup -->
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -890,7 +890,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -929,7 +929,7 @@
/>
</drawdata>
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -967,7 +967,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -1170,7 +1170,7 @@
</drawdata>
<!-- Dropdown button widget -->
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1193,7 +1193,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1216,7 +1216,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1239,7 +1239,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1263,7 +1263,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1286,7 +1286,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1309,7 +1309,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1332,7 +1332,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1356,7 +1356,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1379,7 +1379,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1402,7 +1402,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1425,7 +1425,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1449,7 +1449,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1471,7 +1471,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1493,7 +1493,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1515,7 +1515,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1538,7 +1538,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1561,7 +1561,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1584,7 +1584,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1607,7 +1607,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1631,7 +1631,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1654,7 +1654,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1677,7 +1677,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1700,7 +1700,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 99bae0a9616..6c8e3b63ed8 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx
index a62bf3c801a..d5eed3e2c6e 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/gui/themes/scummclassic/classic_gfx.stx
@@ -42,21 +42,21 @@
</palette>
<fonts>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_default'>
<language id = '*' file = 'helvb12.bdf'/>
</font>
<font id = 'text_default'>
<language id = '*' file = 'clR6x12.bdf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_button'>
<language id = '*' file = 'helvb12.bdf'/>
</font>
<font id = 'text_button'>
<language id = '*' file = 'clR6x12.bdf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_normal'>
<language id = '*' file = 'helvb12.bdf'/>
</font>
@@ -198,7 +198,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -215,7 +215,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -232,7 +232,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -249,7 +249,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -331,7 +331,7 @@
</drawdata>
<!--popup_idle HERE -->
- <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -365,7 +365,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -400,7 +400,7 @@
/>
</drawdata>
- <drawdata id = 'popup_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -434,7 +434,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -469,7 +469,7 @@
/>
</drawdata>
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -501,7 +501,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -534,7 +534,7 @@
/>
</drawdata>
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -568,7 +568,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -603,7 +603,7 @@
/>
</drawdata>
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -635,7 +635,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -668,7 +668,7 @@
/>
</drawdata>
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -702,7 +702,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
@@ -831,7 +831,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -862,7 +862,7 @@
padding = '0,0,17,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -893,7 +893,7 @@
padding = '17,0,0,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -914,7 +914,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -936,7 +936,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_hover'
vertical_align = 'center'
@@ -967,7 +967,7 @@
padding = '0,0,17,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_hover'
vertical_align = 'center'
@@ -998,7 +998,7 @@
padding = '17,0,0,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_hover'
vertical_align = 'center'
@@ -1019,7 +1019,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_hover'
vertical_align = 'center'
@@ -1041,7 +1041,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1072,7 +1072,7 @@
padding = '0,0,17,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1103,7 +1103,7 @@
padding = '17,0,0,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1124,7 +1124,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1146,7 +1146,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1177,7 +1177,7 @@
padding = '0,0,17,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1208,7 +1208,7 @@
padding = '17,0,0,1'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1229,7 +1229,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1251,7 +1251,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_alternative_inverted'
vertical_align = 'center'
@@ -1273,7 +1273,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_alternative_inverted'
vertical_align = 'center'
@@ -1295,7 +1295,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_alternative_inverted'
vertical_align = 'center'
@@ -1317,7 +1317,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_alternative_inverted'
vertical_align = 'center'
@@ -1340,7 +1340,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1362,7 +1362,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1384,7 +1384,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1406,7 +1406,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 4ce5c778ae8..889d2133964 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -19,7 +19,7 @@
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->
-<layout_info resolution = 'y>399'>
+<layout_info resolution = 'y>=H'>
<globals>
<def var = 'Line.Height' value = '16' scalable = 'yes'/>
<def var = 'Font.Height' value = '16' scalable = 'yes'/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 2162d15832e..0f9cc6498f3 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -19,7 +19,7 @@
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->
-<layout_info resolution = 'y<400'>
+<layout_info resolution = 'y<H'>
<globals>
<def var = 'Line.Height' value = '12' scalable = 'yes'/>
<def var = 'Font.Height' value = '10' scalable = 'yes'/>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index f8bef2ef97a..a31bee9c522 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index cc3a43ff443..7b9377ef7b4 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -137,7 +137,7 @@
</bitmaps>
<fonts>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_default'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
@@ -155,7 +155,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_button'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
@@ -173,7 +173,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_normal'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -206,7 +206,7 @@
point_size = '12'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'console'
file = 'builtinConsole'
point_size = '10'>
@@ -282,7 +282,7 @@
<!-- <defaults fill = 'gradient' fg_color = 'white'/> -->
<cursor file = 'cursor.bmp' hotspot = '0, 0'/>
- <cursor resolution = 'y<400' file = 'cursor_small.bmp' hotspot = '0, 0'/>
+ <cursor resolution = 'y<H' file = 'cursor_small.bmp' hotspot = '0, 0'/>
<!-- Selection (text or list items) -->
<drawdata id = 'text_selection' cache = 'false'>
@@ -366,7 +366,7 @@
</drawdata>
<!-- Buttons at the top and bottom of the scrollbar -->
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'none'
@@ -385,7 +385,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'none'
@@ -404,7 +404,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'gradient'
@@ -427,7 +427,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'gradient'
@@ -543,7 +543,7 @@
</drawdata>
<!-- Idle popup -->
- <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -581,7 +581,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -620,7 +620,7 @@
/>
</drawdata>
- <drawdata id = 'popup_idle' cache = 'false' resolution ='y<400'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution ='y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -658,7 +658,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution ='y<400'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution ='y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -698,7 +698,7 @@
</drawdata>
<!-- Disabled popup -->
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -736,7 +736,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -775,7 +775,7 @@
/>
</drawdata>
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -813,7 +813,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -853,7 +853,7 @@
</drawdata>
<!-- Hovered popup -->
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -891,7 +891,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -930,7 +930,7 @@
/>
</drawdata>
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -968,7 +968,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -1171,7 +1171,7 @@
</drawdata>
<!-- Dropdown button widget -->
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1199,7 +1199,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1227,7 +1227,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1255,7 +1255,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1284,7 +1284,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1313,7 +1313,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1342,7 +1342,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1371,7 +1371,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1401,7 +1401,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1430,7 +1430,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1459,7 +1459,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1488,7 +1488,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1518,7 +1518,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1546,7 +1546,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1574,7 +1574,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1602,7 +1602,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1631,7 +1631,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1661,7 +1661,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1691,7 +1691,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1721,7 +1721,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1752,7 +1752,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1782,7 +1782,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1812,7 +1812,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1842,7 +1842,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 5a8d5d773db..09938c743b2 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/remastered_gfx.stx b/gui/themes/scummremastered/remastered_gfx.stx
index 1bcb572e8ec..75563370103 100644
--- a/gui/themes/scummremastered/remastered_gfx.stx
+++ b/gui/themes/scummremastered/remastered_gfx.stx
@@ -138,7 +138,7 @@
</bitmaps>
<fonts>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_default'
file = 'helvb12.bdf'>
<!-- Add these in order of priority. First match is used -->
@@ -157,7 +157,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_button'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
@@ -175,7 +175,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'text_normal'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -208,7 +208,7 @@
point_size = '12'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y>399'
+ <font resolution = 'y>=H'
id = 'console'
file = 'builtinConsole'
point_size = '10'>
@@ -284,7 +284,7 @@
<!-- <defaults fill = 'gradient' fg_color = 'white'/> -->
<cursor file = 'cursor.bmp' hotspot = '0, 0'/>
- <cursor resolution = 'y<400' file = 'cursor_small.bmp' hotspot = '0, 0'/>
+ <cursor resolution = 'y<H' file = 'cursor_small.bmp' hotspot = '0, 0'/>
<!-- Selection (text or list items) -->
<drawdata id = 'text_selection' cache = 'false'>
@@ -365,7 +365,7 @@
</drawdata>
<!-- Buttons at the top and bottom of the scrollbar -->
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'none'
@@ -384,7 +384,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '10'
fill = 'none'
@@ -403,7 +403,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>=H'>
<!-- <drawstep func = 'roundedsq'
radius = '10'
fill = 'gradient'
@@ -426,7 +426,7 @@
/>
</drawdata>
- <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<H'>
<!-- <drawstep func = 'roundedsq'
radius = '10'
fill = 'gradient'
@@ -542,7 +542,7 @@
</drawdata>
<!-- Idle popup -->
- <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -580,7 +580,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -619,7 +619,7 @@
/>
</drawdata>
- <drawdata id = 'popup_idle' cache = 'false' resolution ='y<400'>
+ <drawdata id = 'popup_idle' cache = 'false' resolution ='y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -657,7 +657,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_idle_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -697,7 +697,7 @@
</drawdata>
<!-- Disabled popup -->
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -735,7 +735,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -774,7 +774,7 @@
/>
</drawdata>
- <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -812,7 +812,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_disabled_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -852,7 +852,7 @@
</drawdata>
<!-- Hovered popup -->
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -890,7 +890,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y>=H'>
<drawstep func = 'roundedsq'
stroke = '1'
fg_color = 'lightgray'
@@ -929,7 +929,7 @@
/>
</drawdata>
- <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -967,7 +967,7 @@
horizontal_align = 'start'
/>
</drawdata>
- <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'popup_hover_rtl' cache = 'false' resolution = 'y<H'>
<drawstep func = 'roundedsq'
radius = '5'
stroke = '1'
@@ -1170,7 +1170,7 @@
</drawdata>
<!-- Dropdown button widget -->
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1193,7 +1193,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1216,7 +1216,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1239,7 +1239,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_idle_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1263,7 +1263,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1286,7 +1286,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1309,7 +1309,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1332,7 +1332,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1356,7 +1356,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1379,7 +1379,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1402,7 +1402,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1425,7 +1425,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_hover_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1449,7 +1449,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1471,7 +1471,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1493,7 +1493,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1515,7 +1515,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_disabled_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button_disabled'
vertical_align = 'center'
@@ -1538,7 +1538,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1561,7 +1561,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1584,7 +1584,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1607,7 +1607,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_left_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1631,7 +1631,7 @@
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1654,7 +1654,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>399'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y>=H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1677,7 +1677,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
@@ -1700,7 +1700,7 @@
orientation = 'bottom'
/>
</drawdata>
- <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<400'>
+ <drawdata id = 'dropdown_button_pressed_right_rtl' cache = 'false' resolution = 'y<H'>
<text font = 'text_button'
text_color = 'color_button'
vertical_align = 'center'
Commit: bf1aa27f60103fe7ee17eec36a06e6bda4fec244
https://github.com/scummvm/scummvm/commit/bf1aa27f60103fe7ee17eec36a06e6bda4fec244
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-18T00:15:10+01:00
Commit Message:
GUI: Report threshold height different for IPHONE
It is hacky at the moment, being hardcoded, but I had a dilemma between
hardcoding it for a special case, or introducing yet-another OSystem
API call that will be used only by single platform.
Also, I am struggling with coming up for a proper name for this API.
Changed paths:
gui/ThemeParser.cpp
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 2bdc7228b1c..2a47f08db8a 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -1076,7 +1076,16 @@ bool ThemeParser::resolutionCheck(const Common::String &resolution) {
if (cur[offset] == 'W') { // Reported threshold width
token = 320;
} else if (cur[offset] == 'H') { // Reported threshold height
+#ifndef IPHONE
token = 400;
+#else
+ // HACK. Think about API to move it to OSystem?
+ // iPhone SE (gen3) is 375 × 667 @2, iPhone 14 is 390 × 844 @3
+ //
+ // Hence, we are setting height to 375, so we have highres
+ // theme by default
+ token = 375;
+#endif
} else {
token = atoi(cur.c_str() + offset);
}
More information about the Scummvm-git-logs
mailing list