[Scummvm-git-logs] scummvm master -> 4bd10532369157c6e196dc07fa7695ea1c866c79
sev-
noreply at scummvm.org
Sun May 29 14:39:47 UTC 2022
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
8e4e9bab65 JANITORIAL: Fix whitespaces
598e1d4a6a GUI: Make grid icons smaller for 640xY resolution. Bump theme version
4bd1053236 GUI: Properly reload flags/platforms when resolution is changed
Commit: 8e4e9bab65b9797be0ebd123f7696f208c90d581
https://github.com/scummvm/scummvm/commit/8e4e9bab65b9797be0ebd123f7696f208c90d581
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-05-29T16:39:35+02:00
Commit Message:
JANITORIAL: Fix whitespaces
Changed paths:
gui/ThemeEngine.h
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 94ece3ed009..15b4c8b4cc4 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -166,9 +166,9 @@ enum TextColor {
kTextColorAlternativeHover,
kTextColorAlternativeDisabled,
kTextColorOverride,
- kTextColorOverrideInverted,
- kTextColorOverrideHover,
- kTextColorOverrideDisabled,
+ kTextColorOverrideInverted,
+ kTextColorOverrideHover,
+ kTextColorOverrideDisabled,
kTextColorButton,
kTextColorButtonHover,
kTextColorButtonDisabled,
@@ -286,7 +286,7 @@ public:
kFontColorFormatting = -1, ///< Use color from formatting
kFontColorNormal = 0, ///< The default color of the theme
kFontColorAlternate = 1, ///< Alternative font color
- kFontColorOverride = 2, ///< Color of overwritten text
+ kFontColorOverride = 2, ///< Color of overwritten text
kFontColorMax
};
Commit: 598e1d4a6a86dc694c5b61fc24e1f24aa8cb1324
https://github.com/scummvm/scummvm/commit/598e1d4a6a86dc694c5b61fc24e1f24aa8cb1324
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-05-29T16:39:35+02:00
Commit Message:
GUI: Make grid icons smaller for 640xY resolution. Bump theme version
Changed paths:
gui/ThemeEngine.h
gui/themes/common/highres_layout.stx
gui/themes/residualvm.zip
gui/themes/residualvm/THEMERC
gui/themes/scummclassic.zip
gui/themes/scummclassic/THEMERC
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 15b4c8b4cc4..9f1ca7ceb04 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.3"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.4"
class OSystem;
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 8514c6fc362..3fdc0ffddcd 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -69,15 +69,25 @@
<def var = 'Radiobutton.Spacing' value = '15' scalable = 'yes'/>
<def var = 'GridSupported' value = '1'/>
- <def var = 'GridItemThumbnail.Width' value = '192' scalable = 'no'/>
- <def var = 'GridItemThumbnail.Height' value = '192' scalable = 'no'/>
- <def var = 'Grid.FlagIcon.Width' value = '50' scalable = 'no'/>
- <def var = 'Grid.FlagIcon.Height' value = '25' scalable = 'no'/>
- <def var = 'Grid.PlatformIcon.Width' value = '32' scalable = 'no'/>
- <def var = 'Grid.PlatformIcon.Height' value = '32' scalable = 'no'/>
- <def var = 'Grid.XSpacing' value = '40' scalable = 'no'/>
- <def var = 'Grid.YSpacing' value = '30' scalable = 'no'/>
- <def var = 'Grid.ShowTitles' value = '1' scalable = 'no'/>
+ <def var = 'GridItemThumbnail.Width' value = '192' scalable = 'no' resolution = 'x>640' />
+ <def var = 'GridItemThumbnail.Height' value = '192' scalable = 'no' resolution = 'x>640' />
+ <def var = 'Grid.FlagIcon.Width' value = '50' scalable = 'no' resolution = 'x>640' />
+ <def var = 'Grid.FlagIcon.Height' value = '25' scalable = 'no' resolution = 'x>640' />
+ <def var = 'Grid.PlatformIcon.Width' value = '32' scalable = 'no' resolution = 'x>640' />
+ <def var = 'Grid.PlatformIcon.Height' value = '32' scalable = 'no' resolution = 'x>640' />
+ <def var = 'Grid.XSpacing' value = '40' scalable = 'no' resolution = 'x>640' />
+ <def var = 'Grid.YSpacing' value = '30' scalable = 'no' resolution = 'x>640' />
+ <def var = 'Grid.ShowTitles' value = '1' scalable = 'no' resolution = 'x>640' />
+
+ <def var = 'GridItemThumbnail.Width' value = '96' scalable = 'no' resolution = 'x<641' />
+ <def var = 'GridItemThumbnail.Height' value = '96' scalable = 'no' resolution = 'x<641' />
+ <def var = 'Grid.FlagIcon.Width' value = '25' scalable = 'no' resolution = 'x<641' />
+ <def var = 'Grid.FlagIcon.Height' value = '12' scalable = 'no' resolution = 'x<641' />
+ <def var = 'Grid.PlatformIcon.Width' value = '16' scalable = 'no' resolution = 'x<641' />
+ <def var = 'Grid.PlatformIcon.Height' value = '16' scalable = 'no' resolution = 'x<641' />
+ <def var = 'Grid.XSpacing' value = '20' scalable = 'no' resolution = 'x<641' />
+ <def var = 'Grid.YSpacing' value = '15' scalable = 'no' resolution = 'x<641' />
+ <def var = 'Grid.ShowTitles' value = '1' scalable = 'no' resolution = 'x<641' />
<widget name = 'OptionsLabel'
size = '115, Globals.Line.Height'
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index cda53b21013..df2765d2ae3 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 5b8314b25bd..3842eefb196 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.3:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.4:ResidualVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index cc440dfd7c6..745723e6d3f 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 c94d294f082..c545cbc4104 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.3:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.4:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 37dfae9883d..c76f0fac7ad 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 16ee8a5a153..7e0e3c44c23 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.3:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.4:ScummVM Modern Theme:No Author]
%using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index b31165e72d8..5cb9151b798 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 6fcdda70785..1abe11905c8 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.3:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.4:ScummVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
Commit: 4bd10532369157c6e196dc07fa7695ea1c866c79
https://github.com/scummvm/scummvm/commit/4bd10532369157c6e196dc07fa7695ea1c866c79
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-05-29T16:39:35+02:00
Commit Message:
GUI: Properly reload flags/platforms when resolution is changed
Changed paths:
gui/widgets/grid.cpp
diff --git a/gui/widgets/grid.cpp b/gui/widgets/grid.cpp
index bea7a69c07a..81cde27ddd8 100644
--- a/gui/widgets/grid.cpp
+++ b/gui/widgets/grid.cpp
@@ -823,15 +823,16 @@ void GridWidget::reflowLayout() {
int oldThumbnailWidth = _thumbnailWidth;
_thumbnailHeight = g_gui.xmlEval()->getVar("Globals.GridItemThumbnail.Height");
_thumbnailWidth = g_gui.xmlEval()->getVar("Globals.GridItemThumbnail.Width");
+ _flagIconHeight = g_gui.xmlEval()->getVar("Globals.Grid.FlagIcon.Height");
+ _flagIconWidth = g_gui.xmlEval()->getVar("Globals.Grid.FlagIcon.Width");
+ _platformIconHeight = g_gui.xmlEval()->getVar("Globals.Grid.PlatformIcon.Height");
+ _platformIconWidth = g_gui.xmlEval()->getVar("Globals.Grid.PlatformIcon.Width");
if ((oldThumbnailHeight != _thumbnailHeight) || (oldThumbnailWidth != _thumbnailWidth)) {
unloadSurfaces(_loadedSurfaces);
reloadThumbnails();
loadFlagIcons();
+ loadPlatformIcons();
}
- _flagIconHeight = g_gui.xmlEval()->getVar("Globals.Grid.FlagIcon.Height");
- _flagIconWidth = g_gui.xmlEval()->getVar("Globals.Grid.FlagIcon.Width");
- _platformIconHeight = g_gui.xmlEval()->getVar("Globals.Grid.PlatformIcon.Height");
- _platformIconWidth = g_gui.xmlEval()->getVar("Globals.Grid.PlatformIcon.Width");
_minGridXSpacing = g_gui.xmlEval()->getVar("Globals.Grid.XSpacing");
_minGridYSpacing = g_gui.xmlEval()->getVar("Globals.Grid.YSpacing");
_scrollWindowPaddingX = _minGridXSpacing;
More information about the Scummvm-git-logs
mailing list