[Scummvm-git-logs] scummvm master -> 7fd1cf531559208033fb2ef8529b4c4aaf95f5ff
sev-
noreply at scummvm.org
Fri Jun 3 18:39:08 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7fd1cf5315 GUI: Fix selecting theme fonts at low resolutions
Commit: 7fd1cf531559208033fb2ef8529b4c4aaf95f5ff
https://github.com/scummvm/scummvm/commit/7fd1cf531559208033fb2ef8529b4c4aaf95f5ff
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-06-03T20:39:05+02:00
Commit Message:
GUI: Fix selecting theme fonts at low resolutions
Changed paths:
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/scummmodern.zip
gui/themes/scummmodern/scummmodern_gfx.stx
gui/themes/scummremastered.zip
gui/themes/scummremastered/remastered_gfx.stx
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index b45c596ff47..ff607f3ba1c 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -22,25 +22,25 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</palette>"
"<fonts>"
-"<font id='text_default'>"
+"<font resolution='y>399' "
+"id='text_default'>"
"<language id='*' file='helvb12.bdf'/>"
"</font>"
-"<font resolution='y<400' "
-"id='text_default'>"
+"<font id='text_default'>"
"<language id='*' file='clR6x12.bdf'/>"
"</font>"
-"<font id='text_button'>"
+"<font resolution='y>399' "
+"id='text_button'>"
"<language id='*' file='helvb12.bdf'/>"
"</font>"
-"<font resolution='y<400' "
-"id='text_button'>"
+"<font id='text_button'>"
"<language id='*' file='clR6x12.bdf'/>"
"</font>"
-"<font id='text_normal'>"
+"<font resolution='y>399' "
+"id='text_normal'>"
"<language id='*' file='helvb12.bdf'/>"
"</font>"
-"<font resolution='y<400' "
-"id='text_normal'>"
+"<font id='text_normal'>"
"<language id='*' file='clR6x12.bdf'/>"
"</font>"
"<font id='tooltip_normal' "
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index df2765d2ae3..0988598b09e 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 034d19dc31d..66811ef49a7 100644
--- a/gui/themes/residualvm/remastered_gfx.stx
+++ b/gui/themes/residualvm/remastered_gfx.stx
@@ -138,7 +138,8 @@
</bitmaps>
<fonts>
- <font id = 'text_default'
+ <font resolution = 'y>399'
+ id = 'text_default'
file = 'helvb12.bdf'>
<!-- Add these in order of priority. First match is used -->
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
@@ -147,8 +148,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Bold.ttf'/>
<language id = '*' scalable_file = 'FreeSansBold.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_default'
+ <font id = 'text_default'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -157,7 +157,8 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'text_button'
+ <font resolution = 'y>399'
+ id = 'text_button'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
<language id = 'ko' scalable_file = 'NotoSansKR-Bold.otf'/>
@@ -165,8 +166,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Bold.ttf'/>
<language id = '*' scalable_file = 'FreeSansBold.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_button'
+ <font id = 'text_button'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -175,7 +175,8 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'text_normal'
+ <font resolution = 'y>399'
+ id = 'text_normal'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
<language id = 'ko' scalable_file = 'NotoSansKR-Regular.otf'/>
@@ -183,8 +184,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_normal'
+ <font id = 'text_normal'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -202,19 +202,19 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'console'
+ <font resolution = 'y>799'
+ id = 'console'
file = 'builtinConsole'
point_size = '12'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y<800'
+ <font resolution = 'y>399'
id = 'console'
file = 'builtinConsole'
point_size = '10'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'console'
+ <font id = 'console'
file = 'builtinConsole'
point_size = '8'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 745723e6d3f..4e8921e2d8b 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 4da1f21a18c..a62bf3c801a 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/gui/themes/scummclassic/classic_gfx.stx
@@ -42,25 +42,25 @@
</palette>
<fonts>
- <font id = 'text_default'>
+ <font resolution = 'y>399'
+ id = 'text_default'>
<language id = '*' file = 'helvb12.bdf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_default'>
+ <font id = 'text_default'>
<language id = '*' file = 'clR6x12.bdf'/>
</font>
- <font id = 'text_button'>
+ <font resolution = 'y>399'
+ id = 'text_button'>
<language id = '*' file = 'helvb12.bdf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_button'>
+ <font id = 'text_button'>
<language id = '*' file = 'clR6x12.bdf'/>
</font>
- <font id = 'text_normal'>
+ <font resolution = 'y>399'
+ id = 'text_normal'>
<language id = '*' file = 'helvb12.bdf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_normal'>
+ <font id = 'text_normal'>
<language id = '*' file = 'clR6x12.bdf'/>
</font>
<font id = 'tooltip_normal'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index c76f0fac7ad..2d07ab524f0 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 26a46a114ea..cc3a43ff443 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -137,7 +137,8 @@
</bitmaps>
<fonts>
- <font id = 'text_default'
+ <font resolution = 'y>399'
+ id = 'text_default'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
<language id = 'ko' scalable_file = 'NotoSansKR-Bold.otf'/>
@@ -145,8 +146,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Bold.ttf'/>
<language id = '*' scalable_file = 'FreeSansBold.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_default'
+ <font id = 'text_default'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -155,7 +155,8 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'text_button'
+ <font resolution = 'y>399'
+ id = 'text_button'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
<language id = 'ko' scalable_file = 'NotoSansKR-Bold.otf'/>
@@ -163,8 +164,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Bold.ttf'/>
<language id = '*' scalable_file = 'FreeSansBold.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_button'
+ <font id = 'text_button'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -173,7 +173,8 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'text_normal'
+ <font resolution = 'y>399'
+ id = 'text_normal'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
<language id = 'ko' scalable_file = 'NotoSansKR-Regular.otf'/>
@@ -181,8 +182,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_normal'
+ <font id = 'text_normal'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -200,19 +200,19 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeMonoBold.ttf'/>
</font>
- <font id = 'console'
+ <font resolution = 'y>799'
+ id = 'console'
file = 'builtinConsole'
point_size = '12'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y<800'
+ <font resolution = 'y>399'
id = 'console'
file = 'builtinConsole'
point_size = '10'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'console'
+ <font id = 'console'
file = 'builtinConsole'
point_size = '8'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 5cb9151b798..f4d80be5f62 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 395ef0d2802..1bcb572e8ec 100644
--- a/gui/themes/scummremastered/remastered_gfx.stx
+++ b/gui/themes/scummremastered/remastered_gfx.stx
@@ -138,7 +138,8 @@
</bitmaps>
<fonts>
- <font id = 'text_default'
+ <font resolution = 'y>399'
+ id = 'text_default'
file = 'helvb12.bdf'>
<!-- Add these in order of priority. First match is used -->
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
@@ -147,8 +148,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Bold.ttf'/>
<language id = '*' scalable_file = 'FreeSansBold.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_default'
+ <font id = 'text_default'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -157,7 +157,8 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'text_button'
+ <font resolution = 'y>399'
+ id = 'text_button'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Bold.otf'/>
<language id = 'ko' scalable_file = 'NotoSansKR-Bold.otf'/>
@@ -165,8 +166,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Bold.ttf'/>
<language id = '*' scalable_file = 'FreeSansBold.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_button'
+ <font id = 'text_button'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -175,7 +175,8 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'text_normal'
+ <font resolution = 'y>399'
+ id = 'text_normal'
file = 'helvb12.bdf'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
<language id = 'ko' scalable_file = 'NotoSansKR-Regular.otf'/>
@@ -183,8 +184,7 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'text_normal'
+ <font id = 'text_normal'
file = 'clR6x12.bdf'
point_size = '11'>
<language id = 'ja' scalable_file = 'NotoSansJP-Regular.otf'/>
@@ -202,19 +202,19 @@
<language id = 'hi' scalable_file = 'NotoSans-Regular.ttf'/>
<language id = '*' scalable_file = 'FreeSans.ttf'/>
</font>
- <font id = 'console'
+ <font resolution = 'y>799'
+ id = 'console'
file = 'builtinConsole'
point_size = '12'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y<800'
+ <font resolution = 'y>399'
id = 'console'
file = 'builtinConsole'
point_size = '10'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
</font>
- <font resolution = 'y<400'
- id = 'console'
+ <font id = 'console'
file = 'builtinConsole'
point_size = '8'>
<language id = '*' scalable_file = 'SourceCodeVariable-Roman.ttf'/>
More information about the Scummvm-git-logs
mailing list