[Scummvm-git-logs] scummvm master -> 70a7fef8afab68be653aa8bd89924d7466a7fac6
sev-
noreply at scummvm.org
Mon Nov 27 14:55:11 UTC 2023
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:
70a7fef8af GUI: Fix scrollbar visibility for keymaps option tab.
Commit: 70a7fef8afab68be653aa8bd89924d7466a7fac6
https://github.com/scummvm/scummvm/commit/70a7fef8afab68be653aa8bd89924d7466a7fac6
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-11-27T15:55:06+01:00
Commit Message:
GUI: Fix scrollbar visibility for keymaps option tab.
This fixes #14701
Changed paths:
backends/keymapper/remap-widget.cpp
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
gui/widget.cpp
gui/widget.h
diff --git a/backends/keymapper/remap-widget.cpp b/backends/keymapper/remap-widget.cpp
index 57fbf0b18ed..f033d3e6fe7 100644
--- a/backends/keymapper/remap-widget.cpp
+++ b/backends/keymapper/remap-widget.cpp
@@ -104,7 +104,7 @@ void RemapWidget::reflowActionWidgets() {
int spacing = g_gui.xmlEval()->getVar("Globals.KeyMapper.Spacing");
int keyButtonWidth = g_gui.xmlEval()->getVar("Globals.KeyMapper.ButtonWidth");
int resetButtonWidth = g_gui.xmlEval()->getVar("Globals.KeyMapper.ResetWidth");
- int labelWidth = getWidth() - (spacing + keyButtonWidth + spacing);
+ int labelWidth = _w - (spacing + keyButtonWidth + spacing);
labelWidth = MAX(0, labelWidth);
uint textYOff = (buttonHeight - kLineHeight) / 2;
@@ -121,7 +121,7 @@ void RemapWidget::reflowActionWidgets() {
// Insert a keymap separator
uint descriptionX = 2 * spacing + keyButtonWidth;
- uint resetX = getWidth() - spacing - resetButtonWidth;
+ uint resetX = _w - spacing - resetButtonWidth;
KeymapTitleRow keymapTitle = _keymapSeparators[row.keymap];
if (keymapTitle.descriptionText) {
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 167e653ae31..4d73f046fee 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -687,7 +687,9 @@
<dialog name = 'GlobalOptions_KeyMapper' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1623,7 +1625,9 @@
<dialog name = 'GameOptions_KeyMapper' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1927,7 +1931,9 @@
<dialog name = 'GlobalConfig_KeyMapper' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index 08237d8f122..6c8a2521355 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -527,7 +527,9 @@
<dialog name = 'GlobalOptions_KeyMapper' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1453,7 +1455,9 @@
<dialog name = 'GameOptions_KeyMapper' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1763,7 +1767,9 @@
<dialog name = 'GlobalConfig_KeyMapper' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index c7793c4ef66..5ff51ab12c1 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 812c36dff14..3f950f54d7f 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 f3dfed4cab5..160aea12765 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -365,7 +365,9 @@
<dialog name = 'GlobalOptions_KeyMapper' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1270,7 +1272,9 @@
<dialog name = 'GameOptions_KeyMapper' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1574,7 +1578,9 @@
<dialog name = 'GlobalConfig_KeyMapper' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <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 f593f08f222..f81c7037a09 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -372,7 +372,9 @@
<dialog name = 'GlobalOptions_KeyMapper' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1282,7 +1284,9 @@
<dialog name = 'GameOptions_KeyMapper' overlays = 'Dialog.GameOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
@@ -1591,7 +1595,9 @@
<dialog name = 'GlobalConfig_KeyMapper' overlays = 'Dialog.GlobalConfig.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
- <widget name = 'Container'/>
+ <widget name = 'Container'
+ type = 'ScrollContainerWidget'
+ />
</layout>
</dialog>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 03d2b24d388..2954891d18f 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 64b6b6137b7..401551369e2 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/widget.cpp b/gui/widget.cpp
index 5d1ab6e9e2b..a8d2f081371 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -1089,6 +1089,10 @@ OptionsContainerWidget::OptionsContainerWidget(GuiObject *boss, const Common::St
OptionsContainerWidget::~OptionsContainerWidget() {
}
+uint16 OptionsContainerWidget::getWidth() const {
+ return _scrollContainer ? _scrollContainer->getWidth() : _w;
+}
+
void OptionsContainerWidget::reflowLayout() {
Widget::reflowLayout();
diff --git a/gui/widget.h b/gui/widget.h
index 1c0e825967f..4498e2c452e 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -510,6 +510,8 @@ public:
void setParentDialog(Dialog *parentDialog) { _parentDialog = parentDialog; }
void setDomain(const Common::String &domain) { _domain = domain; }
+ uint16 getWidth() const override;
+
protected:
enum {
/** The command that gets sent when the scroll container needs to reflow its contents */
More information about the Scummvm-git-logs
mailing list