[Scummvm-git-logs] scummvm master -> e43f0b865c6a2df4a27302bfe067bedc28a9dfef

[criezy]

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:
e43f0b865c GUI: THEMES: Fix error with HelpButton location undefined


Commit: e43f0b865c6a2df4a27302bfe067bedc28a9dfef
    https://github.com/scummvm/scummvm/commit/e43f0b865c6a2df4a27302bfe067bedc28a9dfef
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2023-09-18T22:18:22+01:00

Commit Message:
GUI: THEMES: Fix error with HelpButton location undefined

The HelpButton was not added to the LauncherGrid layout nor
the vertical high-res Launcher layout (used on phones in
portrait mode). This result in an error (e.g. Unable to
load widget position for 'LauncherGrid.HelpButton'.) when
trying to start ScummVM in one of those modes.

Also bump the theme version so that it does not try to load
old themes that do not have this button either.

Changed paths:
    gui/ThemeEngine.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/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 8266b693bfd..e6649b9cf15 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.12"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.13"
 
 class OSystem;
 
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index df37bf32c5e..6d9dd19aa5b 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -254,11 +254,21 @@
 
 	<dialog name = 'Launcher' overlays = 'screen' resolution = 'y>x'>
 		<layout type = 'vertical' align = 'center' padding = '23, 23, 8, 92'>
-			<widget name = 'Logo'
-					width = '287'
-					height = '80'
-					rtl = 'no'
-			/>
+			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 0'>
+				<widget name = 'HelpButton'
+						height = 'Globals.Button.Height'
+						width = 'Globals.Button.Height'
+						rtl = 'yes'
+				/>
+				<space />
+				<widget name = 'Logo'
+						width = '287'
+						height = '80'
+						rtl = 'no'
+				/>
+				<space />
+				<space size  = 'Globals.Button.Height' />
+			</layout>
 			<layout type = 'horizontal'  spacing = '5' padding = '10, 0, 0, 0'>
 				<widget name = 'SearchPic'
 						width = '16'
@@ -341,11 +351,21 @@
 
 	<dialog name = 'LauncherGrid' overlays = 'screen'>
 		<layout type = 'vertical' align = 'center' padding = '23, 23, 8, 66'>
-			<widget name = 'Logo'
-					width = '287'
-					height = '80'
-					rtl = 'no'
-			/>
+			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 0'>
+				<widget name = 'HelpButton'
+						height = 'Globals.Button.Height'
+						width = 'Globals.Button.Height'
+						rtl = 'yes'
+				/>
+				<space />
+				<widget name = 'Logo'
+						width = '287'
+						height = '80'
+						rtl = 'no'
+				/>
+				<space />
+				<space size  = 'Globals.Button.Height' />
+			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 2, 0' spacing = '2'>
 				<widget name = 'SearchPic'
 						width = '16'
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index 1fc3a1d6574..e4fc6c928c4 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -224,10 +224,20 @@
 	</dialog>
 	<dialog name = 'LauncherGrid' overlays = 'screen'>
 		<layout type = 'vertical' align = 'center' padding = '4, 4, 2, 2' spacing = '2'>
-			<widget name = 'Version'
-					height = 'Globals.Line.Height'
-					textalign = 'center'
-			/>
+			<layout type = 'horizontal'  spacing = '5' padding = '0, 0, 0, 0'>
+				<widget name = 'HelpButton'
+						height = 'Globals.Button.Height'
+						width = 'Globals.Button.Height'
+						rtl = 'yes'
+				/>
+				<space />
+				<widget name = 'Version'
+						height = 'Globals.Line.Height'
+						textalign = 'center'
+				/>
+				<space />
+				<space size  = 'Globals.Button.Height' />
+			</layout>
 			<layout type = 'horizontal' spacing = '2' padding = '0, 0, 0, 0'>
 				<widget name = 'SearchDesc'
 						width = '45'
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index cfd23feacdf..a5cfce00a2d 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 c97fe731b23..8ab0db4b5dc 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.12:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.13:ResidualVM Modern Theme Remastered:No Author]
 %using ../common
 %using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index fb6eaae9a1c..aefa0533e32 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 9c1f71d51da..0bb7d105f71 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.12:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.13:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index c43ccbcbd63..8e4f096f9cc 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 c010790bbac..488cd6549e1 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.12:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.13:ScummVM Modern Theme:No Author]
 %using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 2a1d2f60af9..4f8914ca624 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 243bfd7a04f..344fb930284 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.12:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.13:ScummVM Modern Theme Remastered:No Author]
 %using ../common
 %using ../common-svg