[Scummvm-git-logs] scummvm branch-2-8 -> 1d991e7890a9d598f08e1e6218f0471cc3bffe11
sev-
noreply at scummvm.org
Sat Dec 16 18:38:33 UTC 2023
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:
5a8c1a208c IOS7: Add note about disabled tap gestures in help
1878f23fb9 GUI: Add scrollbar to backend options widget
9e31779fba IOS7: Update backend options widget
1d991e7890 ANDROID: Update backend options widget layout
Commit: 5a8c1a208ce6720645c98feebbe2aba4a7fde903
https://github.com/scummvm/scummvm/commit/5a8c1a208ce6720645c98feebbe2aba4a7fde903
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-12-16T19:37:55+01:00
Commit Message:
IOS7: Add note about disabled tap gestures in help
The tap gestures are disabled while the virtual controller is
connected. Add a note about it in the help section.
Changed paths:
backends/platform/ios7/ios7_osys_misc.mm
diff --git a/backends/platform/ios7/ios7_osys_misc.mm b/backends/platform/ios7/ios7_osys_misc.mm
index 4cc2e041133..cbe58648416 100644
--- a/backends/platform/ios7/ios7_osys_misc.mm
+++ b/backends/platform/ios7/ios7_osys_misc.mm
@@ -283,6 +283,7 @@ _s(
"### Virtual Gamepad \n"
"\n"
"Devices running iOS 15 or later can connect virtual gamepad controller by swiping two fingers from right to left or through **Global Options > Backend**. The directional button can be configured to either a thumbstick or a dpad.\n"
+"**Note** While the virtual controller is connected it is not possible to perform mouse clicks using tap gestures since they are disabled as long as the virtual controller is visible. Left mouse clicks are performed by pressing the A button. Tap gestures are enabled again when virtual controller is disconnected.\n"
"\n"
"### Global Main Menu\n"
"\n"
Commit: 1878f23fb988fb91ea5f8224bb404b7ba863ed7c
https://github.com/scummvm/scummvm/commit/1878f23fb988fb91ea5f8224bb404b7ba863ed7c
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-12-16T19:38:07+01:00
Commit Message:
GUI: Add scrollbar to backend options widget
Make the backend options widget be of type ScrollContainerWidget.
This will allow backends to decide whether the options dialogue
should be scrollable or not.
Note, this changes the default padding. If not changing the padding
the scrollbar might disappear. Update the padding in each backend
instead.
Changed paths:
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/residualvm.zip
gui/themes/scummclassic.zip
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
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 ac78647fc7a..05a2b970f52 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -702,8 +702,10 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1640,11 +1642,13 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1946,8 +1950,10 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index acc39fdfb23..f7ea53f6b56 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -542,8 +542,10 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1470,11 +1472,13 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1782,8 +1786,10 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index c607f94367b..288fb6aa8b4 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 e1254a27e7c..03377badcad 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 843f0d7540e..5af79cd38b9 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -380,8 +380,10 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1287,11 +1289,13 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1593,8 +1597,10 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index b04c2a9c38c..c557465da14 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -387,8 +387,10 @@
</dialog>
<dialog name = 'GlobalOptions_Backend' overlays = 'Dialog.GlobalOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1299,11 +1301,13 @@
</dialog>
<dialog name = 'GameOptions_Backend' overlays = 'Dialog.GameOptions.TabWidget'>
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'EnableTabCheckbox'
type = 'Checkbox'
/>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1610,8 +1614,10 @@
</dialog>
<dialog name = 'GlobalConfig_Backend' overlays = 'Dialog.GlobalConfig.TabWidget'>
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
- <widget name = 'Container'/>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 0aba5e53e83..c7d8a842f22 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 79bae579190..6feb442cb40 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
Commit: 9e31779fba6c214938872ee91cd616b599e9ee8f
https://github.com/scummvm/scummvm/commit/9e31779fba6c214938872ee91cd616b599e9ee8f
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-12-16T19:38:14+01:00
Commit Message:
IOS7: Update backend options widget
Update the options widget to be scrollable and add padding.
Changed paths:
backends/platform/ios7/ios7_options.mm
diff --git a/backends/platform/ios7/ios7_options.mm b/backends/platform/ios7/ios7_options.mm
index 93d95fa5fd9..2cd9c265a54 100644
--- a/backends/platform/ios7/ios7_options.mm
+++ b/backends/platform/ios7/ios7_options.mm
@@ -92,7 +92,7 @@ private:
};
IOS7OptionsWidget::IOS7OptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
- OptionsContainerWidget(boss, name, "IOS7OptionsDialog", false, domain), _enabled(true) {
+ OptionsContainerWidget(boss, name, "IOS7OptionsDialog", true, domain), _enabled(true) {
_gamepadControllerCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "IOS7OptionsDialog.GamepadController", _("Show Gamepad Controller (iOS 15 and later)"));
_gamepadControllerOpacityDesc = new GUI::StaticTextWidget(widgetsBoss(), "IOS7OptionsDialog.GamepadControllerOpacity", _("Gamepad opacity"));
@@ -177,25 +177,24 @@ void IOS7OptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::Stri
layouts.addDialog(layoutName, overlayedLayout)
.addLayout(GUI::ThemeLayout::kLayoutVertical)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 16, 16)
#if TARGET_OS_IOS
.addWidget("OnscreenControl", "Checkbox")
#endif
.addWidget("GamepadController", "Checkbox")
.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("GamepadControllerLeftButton", "OptionsLabel")
.addWidget("GamepadControllerLeftButtonPopUp", "PopUp")
.closeLayout()
.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("GamepadControllerOpacity", "OptionsLabel")
.addWidget("GamepadControllerOpacitySlider", "Slider")
.addWidget("GamepadControllerOpacityLabel", "OptionsLabel")
.closeLayout()
.addWidget("GamepadControllerMinimalLayout", "Checkbox")
- .addWidget("KeyboardFunctionBar", "Checkbox");
-
+ .addWidget("KeyboardFunctionBar", "Checkbox");
#if TARGET_OS_IOS
layouts.addWidget("PreferredTouchModeText", "", -1, layouts.getVar("Globals.Line.Height"));
@@ -203,19 +202,19 @@ void IOS7OptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::Stri
if (inAppDomain) {
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("TouchModeMenusText", "OptionsLabel")
.addWidget("TouchModeMenus", "PopUp")
.closeLayout();
}
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("TouchMode2DGamesText", "OptionsLabel")
.addWidget("TouchMode2DGames", "PopUp")
.closeLayout();
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("TouchMode3DGamesText", "OptionsLabel")
.addWidget("TouchMode3DGames", "PopUp")
.closeLayout();
@@ -223,13 +222,13 @@ void IOS7OptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::Stri
layouts.addWidget("OrientationText", "", -1, layouts.getVar("Globals.Line.Height"));
if (inAppDomain) {
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("OMenusText", "OptionsLabel")
.addWidget("OMenus", "PopUp")
.closeLayout();
}
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("OGamesText", "OptionsLabel")
.addWidget("OGames", "PopUp")
.closeLayout();
Commit: 1d991e7890a9d598f08e1e6218f0471cc3bffe11
https://github.com/scummvm/scummvm/commit/1d991e7890a9d598f08e1e6218f0471cc3bffe11
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-12-16T19:38:22+01:00
Commit Message:
ANDROID: Update backend options widget layout
Since the default layout don't add padding, add necessary padding in
backend instead.
Changed paths:
backends/platform/android/options.cpp
diff --git a/backends/platform/android/options.cpp b/backends/platform/android/options.cpp
index 28cecb07b0f..8c6186d0572 100644
--- a/backends/platform/android/options.cpp
+++ b/backends/platform/android/options.cpp
@@ -198,24 +198,24 @@ void AndroidOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::S
layouts.addDialog(layoutName, overlayedLayout)
.addLayout(GUI::ThemeLayout::kLayoutVertical)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 16, 16)
.addWidget("OnScreenControl", "Checkbox")
.addWidget("PreferredTouchModeText", "", -1, layouts.getVar("Globals.Line.Height"));
if (inAppDomain) {
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("TMMenusText", "OptionsLabel")
.addWidget("TMMenus", "PopUp")
.closeLayout();
}
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("TM2DGamesText", "OptionsLabel")
.addWidget("TM2DGames", "PopUp")
.closeLayout()
.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("TM3DGamesText", "OptionsLabel")
.addWidget("TM3DGames", "PopUp")
.closeLayout();
@@ -223,13 +223,13 @@ void AndroidOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::S
layouts.addWidget("OrientationText", "", -1, layouts.getVar("Globals.Line.Height"));
if (inAppDomain) {
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("OMenusText", "OptionsLabel")
.addWidget("OMenus", "PopUp")
.closeLayout();
}
layouts.addLayout(GUI::ThemeLayout::kLayoutHorizontal)
- .addPadding(0, 0, 0, 0)
+ .addPadding(16, 16, 0, 0)
.addWidget("OGamesText", "OptionsLabel")
.addWidget("OGames", "PopUp")
.closeLayout();
More information about the Scummvm-git-logs
mailing list