[Scummvm-git-logs] scummvm master -> 68ee726d2be77fa6eabfc48053e5fce6d8005f5f

[bluegr]

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:
68ee726d2b GUI: Introduce a maximum dialog width/height for the options dialogs


Commit: 68ee726d2be77fa6eabfc48053e5fce6d8005f5f
    https://github.com/scummvm/scummvm/commit/68ee726d2be77fa6eabfc48053e5fce6d8005f5f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-06-12T12:55:53+03:00

Commit Message:
GUI: Introduce a maximum dialog width/height for the options dialogs

PR #3976 changed the game and global options dialogs so that they are
inside the ScummVM main window, instead of the game list chooser.

We now limit the option dialog width and size, so that there isn't too
much spacing in large resolutions.

Changed paths:
    gui/themes/common/highres_layout.stx
    gui/themes/residualvm.zip
    gui/themes/scummmodern.zip
    gui/themes/scummremastered.zip


diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 847229f3bb9..9a048971191 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -378,7 +378,25 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '32' shading = 'dim'>
+	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '32' shading = 'dim' resolution='x<800'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
+			<widget name = 'TabWidget' type = 'TabWidget'/>
+			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
+				<space/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Apply'
+						type = 'Button'
+				/>
+				<widget name = 'Ok'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions' overlays = 'screen_center' inset = '32' size='750,550' shading = 'dim' resolution='x>799'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget' type = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
@@ -1209,7 +1227,7 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'GameOptions' overlays = 'screen' inset = '32' shading = 'dim'>
+	<dialog name = 'GameOptions' overlays = 'screen' inset = '32' shading = 'dim' resolution='x<800'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget' type = 'TabWidget'/>
 			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
@@ -1224,6 +1242,21 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'GameOptions' overlays = 'screen_center' inset = '32' size='750,550' shading = 'dim' resolution='x>799'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
+			<widget name = 'TabWidget' type = 'TabWidget'/>
+			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
+				<space/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Ok'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>	
+	</dialog>
+
 	<dialog name = 'GameOptions_KeyMapper' overlays = 'Dialog.GameOptions.TabWidget'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'Container'/>
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index d03f69c6595..d7ad4c0354a 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index e036cd71c2f..dc6b714cddf 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index dc16c3299ad..cea6f7b4c3f 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ