[Scummvm-git-logs] scummvm master -> 73ea1caedfbaa4b33a8203d06c0a5fb324828109
sev-
noreply at scummvm.org
Wed Jul 19 13:30:50 UTC 2023
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:
73ea1caedf GUI: Added checkbox to disable BDF scaling. Bump theme version
Commit: 73ea1caedfbaa4b33a8203d06c0a5fb324828109
https://github.com/scummvm/scummvm/commit/73ea1caedfbaa4b33a8203d06c0a5fb324828109
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-07-19T15:30:22+02:00
Commit Message:
GUI: Added checkbox to disable BDF scaling. Bump theme version
Changed paths:
gui/ThemeEngine.h
gui/options.cpp
gui/options.h
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/residualvm.zip
gui/themes/residualvm/THEMERC
gui/themes/scummclassic.zip
gui/themes/scummclassic/THEMERC
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummmodern/THEMERC
gui/themes/scummremastered.zip
gui/themes/scummremastered/THEMERC
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 3478768e9ef..c912fd25ab7 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -36,7 +36,7 @@
#include "graphics/pixelformat.h"
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.11"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.12"
class OSystem;
diff --git a/gui/options.cpp b/gui/options.cpp
index c1145db58c5..9cfd544115c 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2128,6 +2128,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher)
_useSystemDialogsCheckbox = nullptr;
_guiReturnToLauncherAtExit = nullptr;
_guiConfirmExit = nullptr;
+ _guiDisableBDFScaling = nullptr;
#ifdef USE_UPDATES
_updatesPopUpDesc = nullptr;
_updatesPopUp = nullptr;
@@ -2559,6 +2560,13 @@ void GlobalOptionsDialog::addGUIControls(GuiObject *boss, const Common::String &
_guiConfirmExit->setState(ConfMan.getBool("confirm_exit", _domain));
+ _guiDisableBDFScaling = new CheckboxWidget(boss, prefix + "DisableBDFScaling",
+ _("Disable fixed font scaling"),
+ _("Do not upscale fixed fonts in the GUI. This reduces artefacts on low resolution screens")
+ );
+
+ _guiDisableBDFScaling->setState(ConfMan.getBool("gui_disable_fixed_font_scaling", _domain));
+
#ifdef USE_TRANSLATION
_guiLanguagePopUpDesc = new StaticTextWidget(boss, prefix + "GuiLanguagePopupDesc", _("GUI language:"), _("Language of ScummVM GUI"));
_guiLanguagePopUp = new PopUpWidget(boss, prefix + "GuiLanguagePopup");
@@ -3014,6 +3022,12 @@ void GlobalOptionsDialog::apply() {
if (_guiConfirmExit) {
ConfMan.setBool("confirm_exit", _guiConfirmExit->getState(), _domain);
}
+
+ if (_guiDisableBDFScaling) {
+ ConfMan.setBool("gui_disable_fixed_font_scaling", _guiDisableBDFScaling->getState(), _domain);
+ }
+
+
#ifdef USE_DISCORD
if (_discordRpcCheckbox) {
ConfMan.setBool("discord_rpc", _discordRpcCheckbox->getState(), _domain);
diff --git a/gui/options.h b/gui/options.h
index e195e3e3482..6077415b7d0 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -304,6 +304,7 @@ protected:
CheckboxWidget *_useSystemDialogsCheckbox;
CheckboxWidget *_guiReturnToLauncherAtExit;
CheckboxWidget *_guiConfirmExit;
+ CheckboxWidget *_guiDisableBDFScaling;
void addGUIControls(GuiObject *boss, const Common::String &prefix, bool lowres);
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 701f9f848a5..c4adff403d8 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -962,6 +962,11 @@
type = 'Checkbox'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
+ <widget name = 'DisableBDFScaling'
+ type = 'Checkbox'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'UseSystemDialogs'
type = 'Checkbox'
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index 4f9bb1e1475..6f3b7235761 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -821,6 +821,11 @@
type = 'Checkbox'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
+ <widget name = 'DisableBDFScaling'
+ type = 'Checkbox'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
<widget name = 'UseSystemDialogs'
type = 'Checkbox'
@@ -1211,7 +1216,7 @@
height = 'Globals.Line.Height'
/>
<space size = '4' />
-
+
<widget name = 'OpenLinkButton'
width = '160'
height = 'Globals.Line.Height'
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 00045b0d6f1..9ada4ddfeb4 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/residualvm/THEMERC b/gui/themes/residualvm/THEMERC
index 5ef3572b1ff..c97fe731b23 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.11:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.12:ResidualVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index b67493592d2..39a4ccedc93 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index 359c7092a12..9c1f71d51da 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.11:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.12:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index afd2bf5377c..b4d147e3b35 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -728,6 +728,11 @@
type = 'Checkbox'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
+ <widget name = 'DisableBDFScaling'
+ type = 'Checkbox'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'UseSystemDialogs'
type = 'Checkbox'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 87bca6bf287..98587173b5c 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -741,6 +741,11 @@
type = 'Checkbox'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
+ <widget name = 'DisableBDFScaling'
+ type = 'Checkbox'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
<widget name = 'UseSystemDialogs'
type = 'Checkbox'
@@ -1131,7 +1136,7 @@
height = 'Globals.Line.Height'
/>
<space size = '4' />
-
+
<widget name = 'OpenLinkButton'
width = '160'
height = 'Globals.Line.Height'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 3e87fd81ed1..7982a2629b5 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 539a450bc4f..c010790bbac 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.11:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.12:ScummVM Modern Theme:No Author]
%using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 037a5c82062..fe6d413f4de 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC
index 9cc9e5b866f..243bfd7a04f 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.11:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.12:ScummVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
More information about the Scummvm-git-logs
mailing list