[Scummvm-git-logs] scummvm master -> 763517fdfe3d5f3ca4f30f038b7bf7b7424561c5

lephilousophe noreply at scummvm.org
Sat Aug 27 07:19:59 UTC 2022 

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

Summary:
b5704d6ef0 GUI: Remove useless widget
368363ae74 GUI: Move buttons bar below launcher lower
8e9ba83d89 GUI: Move the icons per row slider value to the right
763517fdfe GUI: Make GridWidget accept focus


Commit: b5704d6ef0955279e52ede19ba6a3fd7bb165d96
    https://github.com/scummvm/scummvm/commit/b5704d6ef0955279e52ede19ba6a3fd7bb165d96
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-27T09:19:53+02:00

Commit Message:
GUI: Remove useless widget

Changed paths:
    gui/themes/common/highres_layout.stx
    gui/themes/residualvm.zip
    gui/themes/scummclassic.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 0ec5b820d81..5af560b9f0a 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -297,7 +297,6 @@
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 2, 0' spacing = '2'>
-				<widget name = 'GameList'/>
 				<widget name = 'IconArea'/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 2, 0' spacing = '2'>
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 82cf8ea06a3..16c71cd4f06 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 6dc56fe4048..d9aeb1e3d8e 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 0fdd77090e3..917584294e2 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 e374d6aa503..dd604a64f97 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ


Commit: 368363ae7481dfec8cdef4df320be1c62838f602
    https://github.com/scummvm/scummvm/commit/368363ae7481dfec8cdef4df320be1c62838f602
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-27T09:19:53+02:00

Commit Message:
GUI: Move buttons bar below launcher lower

Else widgets are erased when the launcher widget is redrawn

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 5af560b9f0a..f3234afe0b0 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -224,7 +224,7 @@
 					/>
 				</layout>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '2'>
+			<layout type = 'horizontal' padding = '0, 0, 6, 0' spacing = '2'>
 				<widget name = 'ListSwitch'
 						height = 'Globals.Button.Height'
 						width = 'Globals.Button.Height'
@@ -299,7 +299,7 @@
 			<layout type = 'horizontal' padding = '0, 0, 2, 0' spacing = '2'>
 				<widget name = 'IconArea'/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 2, 0' spacing = '2'>
+			<layout type = 'horizontal' padding = '0, 0, 6, 0' spacing = '2'>
 				<widget name = 'ListSwitch'
 						height = 'Globals.Button.Height'
 						width = 'Globals.Button.Height'
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 16c71cd4f06..38f296bf010 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 917584294e2..7dccb2b1473 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 dd604a64f97..38a81f42817 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ


Commit: 8e9ba83d89127673c76e02f37aba136544e1f4d7
    https://github.com/scummvm/scummvm/commit/8e9ba83d89127673c76e02f37aba136544e1f4d7
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-27T09:19:53+02:00

Commit Message:
GUI: Move the icons per row slider value to the right

Else it's stuck to the slider widget

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 f3234afe0b0..c40fdbdcc1e 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -315,6 +315,8 @@
 						type = 'Slider'
 						rtl = 'no'
 				/>
+				<space size = '6'
+				/>
 				<widget name = 'GridItemsPerRowLabel'
 						type = 'SmallLabel'
 				/>
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 38f296bf010..0f00fb8ded5 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 7dccb2b1473..7ce7a42daa4 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 38a81f42817..3297cacf327 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ


Commit: 763517fdfe3d5f3ca4f30f038b7bf7b7424561c5
    https://github.com/scummvm/scummvm/commit/763517fdfe3d5f3ca4f30f038b7bf7b7424561c5
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-08-27T09:19:53+02:00

Commit Message:
GUI: Make GridWidget accept focus

This avoids the filter text to take the focus.
In Android this prevents the launcher to start with the virtual keyboard
displayed.
In the future, the widget could also take keyboards event into account
like the ListWidget one.

Changed paths:
    gui/widgets/grid.h


diff --git a/gui/widgets/grid.h b/gui/widgets/grid.h
index 657041a31ea..232760fb1bd 100644
--- a/gui/widgets/grid.h
+++ b/gui/widgets/grid.h
@@ -212,6 +212,8 @@ public:
 
 	void reflowLayout() override;
 
+	bool wantsFocus() override { return true; }
+
 	void openTray(int x, int y, int entryID);
 	void openTrayAtSelected();
 	void scrollBarRecalc();

More information about the Scummvm-git-logs mailing list