[Scummvm-git-logs] scummvm master -> 29887694d69be4382819e65e7f1b4f2cf66e838f

sev- noreply at scummvm.org
Fri Nov 15 06:32:36 UTC 2024 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a858cc83da GUI: Show resolution switch details at debug level 1
29887694d6 GUI: Narrow down MassAdd dialog list. Fixes bug #15205


Commit: a858cc83dafce377f70d71cdfb8a1d1e609a3b5c
    https://github.com/scummvm/scummvm/commit/a858cc83dafce377f70d71cdfb8a1d1e609a3b5c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-15T07:32:25+01:00

Commit Message:
GUI: Show resolution switch details at debug level 1

Changed paths:
    gui/gui-manager.cpp


diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 73125db1289..a46ad7d6b7a 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -152,7 +152,7 @@ void GuiManager::computeScaleFactor() {
 	if (_theme)
 		_theme->setBaseResolution(_baseWidth, _baseHeight, _scaleFactor);
 
-	debug(3, "Setting %d x %d -> %d x %d -- %g", w, h, _baseWidth, _baseHeight, _scaleFactor);
+	debug(1, "Setting %d x %d -> %d x %d -- %g", w, h, _baseWidth, _baseHeight, _scaleFactor);
 }
 
 Common::Keymap *GuiManager::getKeymap() const {


Commit: 29887694d69be4382819e65e7f1b4f2cf66e838f
    https://github.com/scummvm/scummvm/commit/29887694d69be4382819e65e7f1b4f2cf66e838f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-15T07:32:25+01:00

Commit Message:
GUI: Narrow down MassAdd dialog list. Fixes bug #15205

Also bump theme version

Changed paths:
    gui/ThemeEngine.h
    gui/themes/common/lowres_layout.stx
    gui/themes/default.inc
    gui/themes/residualvm.zip
    gui/themes/residualvm/THEMERC
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/THEMERC
    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 08ae8d5692f..940298eff25 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.19"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.20"
 
 class OSystem;
 
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index dfa0219e228..7266fc2f399 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -2288,15 +2288,15 @@
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '4, 4, 16, 4' align = 'center'>
 			<widget name = 'DirProgressText'
-					width = '280'
+					width = '250'
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'GameProgressText'
-					width = '280'
+					width = '250'
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'GameList'
-					width = '280'
+					width = '250'
 					height = '100'
 			/>
 			<layout type = 'horizontal' padding = '4, 4, 4, 4'>
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 3918b7b6469..03f73168e50 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -5794,15 +5794,15 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<dialog name='MassAdd' overlays='screen_center' shading='dim'>"
 "<layout type='vertical' padding='4,4,16,4' align='center'>"
 "<widget name='DirProgressText' "
-"width='280' "
+"width='250' "
 "height='Globals.Line.Height' "
 "/>"
 "<widget name='GameProgressText' "
-"width='280' "
+"width='250' "
 "height='Globals.Line.Height' "
 "/>"
 "<widget name='GameList' "
-"width='280' "
+"width='250' "
 "height='100' "
 "/>"
 "<layout type='horizontal' padding='4,4,4,4'>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 80ba6d53a4f..2f2cbedc559 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 696bbf44318..ebe7ab10a1d 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.19:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.20:ResidualVM Modern Theme Remastered:No Author]
 %using ../common
 %using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index c34cbc8b1b8..9d0e032fd40 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 35d127f24b0..dd156a77597 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.19:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.20:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 72856fd16dc..ce6066dfb82 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -2095,15 +2095,15 @@
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '4, 4, 16, 4' align = 'center'>
 			<widget name = 'DirProgressText'
-					width = '280'
+					width = '250'
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'GameProgressText'
-					width = '280'
+					width = '250'
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'GameList'
-					width = '280'
+					width = '250'
 					height = '100'
 			/>
 			<layout type = 'horizontal' padding = '4, 4, 4, 4'>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index a5ff5b17a8a..3610f88b615 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 7f89932ca8c..3d2770ba976 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.19:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.20:ScummVM Modern Theme:No Author]
 %using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 9007f19653b..23b64067cf7 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 d5130d97cb3..3908931d861 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.19:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.20:ScummVM Modern Theme Remastered:No Author]
 %using ../common
 %using ../common-svg

More information about the Scummvm-git-logs mailing list