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

[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:
a66c497529 GUI: Fix display of version in classic theme


Commit: a66c4975292e8b14c6bba2373f4e732e8facf1c9
    https://github.com/scummvm/scummvm/commit/a66c4975292e8b14c6bba2373f4e732e8facf1c9
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2024-11-05T22:36:36Z

Commit Message:
GUI: Fix display of version in classic theme

This fixes bug #14774.
This is a regression from commit 3857f71 that added the help button
to the classic layout. Instead of having the version text widget take
the full width, it added a horizontal layout, with the help button,
the version widget, and a space with the same width as the help button
(to keep the version centered I assume). But it also added two
additional spaces either side of the version text widget with no
specified width for no apparent reason. As a result the version widget
was only taking 1/3rd of the available space. This commit removes
those two spaces. It also changes the variable used to specify the
width of the space on the right to use the same variable that specifies
the width of the help button on the left. This clarifies that this
space is here for centering.

Changed paths:
    gui/themes/default.inc
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/classic_layout.stx
    gui/themes/scummclassic/classic_layout_lowres.stx


diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 59e76bfa97a..c333ff26257 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1546,13 +1546,11 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "width='Globals.Launcher.HelpButton.Width' "
 "rtl='yes' "
 "/>"
-"<space />"
 "<widget name='Version' "
 "height='Globals.Line.Height' "
 "textalign='center' "
 "/>"
-"<space />"
-"<space size='Globals.Button.Height' />"
+"<space size='Globals.Launcher.HelpButton.Width' />"
 "</layout>"
 "<layout type='horizontal' spacing='5' padding='10,0,0,0'>"
 "<widget name='SearchDesc' "
@@ -3937,13 +3935,11 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "width='Globals.Launcher.HelpButton.Width' "
 "rtl='yes' "
 "/>"
-"<space />"
 "<widget name='Version' "
 "height='Globals.Line.Height' "
 "textalign='center' "
 "/>"
-"<space />"
-"<space size='Globals.Button.Height' />"
+"<space size='Globals.Launcher.HelpButton.Width' />"
 "</layout>"
 "<layout type='horizontal' spacing='2' padding='0,0,0,0'>"
 "<widget name='SearchDesc' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index acf1f00f761..bf67e03cfa8 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index dc9f9c54c68..d530b9f683c 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -143,13 +143,11 @@
 						width = 'Globals.Launcher.HelpButton.Width'
 						rtl = 'yes'
 				/>
-				<space />
 				<widget name = 'Version'
 						height = 'Globals.Line.Height'
 						textalign = 'center'
 				/>
-				<space />
-				<space size  = 'Globals.Button.Height' />
+				<space size  = 'Globals.Launcher.HelpButton.Width' />
 			</layout>
 			<layout type = 'horizontal' spacing = '5' padding = '10, 0, 0, 0'>
 				<widget name = 'SearchDesc'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 4b6e659ac73..68911126c8d 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -143,13 +143,11 @@
 						width = 'Globals.Launcher.HelpButton.Width'
 						rtl = 'yes'
 				/>
-				<space />
 				<widget name = 'Version'
 						height = 'Globals.Line.Height'
 						textalign = 'center'
 				/>
-				<space />
-				<space size  = 'Globals.Button.Height' />
+				<space size  = 'Globals.Launcher.HelpButton.Width' />
 			</layout>
 			<layout type = 'horizontal' spacing = '2' padding = '0, 0, 0, 0'>
 				<widget name = 'SearchDesc'