[Scummvm-git-logs] scummvm master -> e45bcd350c90f9a26c6c134a10ae26f9a29f1848

[sev-]

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

Summary:
c535f5576c GUI: Fix stuck drag state in ScrollContainer when clicking popups
e45bcd350c GUI: Fix ScrollContainerWidget focus regression


Commit: c535f5576c8f329610e63a94c722e346254bd37f
    https://github.com/scummvm/scummvm/commit/c535f5576c8f329610e63a94c722e346254bd37f
Author: Mohit Bankar (mohitbankar1212 at gmail.com)
Date: 2026-04-24T10:57:34+02:00

Commit Message:
GUI: Fix stuck drag state in ScrollContainer when clicking popups

Changed paths:
    gui/widgets/scrollcontainer.cpp


diff --git a/gui/widgets/scrollcontainer.cpp b/gui/widgets/scrollcontainer.cpp
index 4bf2b30f3e0..4fe633fa6a6 100644
--- a/gui/widgets/scrollcontainer.cpp
+++ b/gui/widgets/scrollcontainer.cpp
@@ -68,6 +68,11 @@ void ScrollContainerWidget::handleMouseDown(int x, int y, int button, int clickC
 		int childX = (x + _scrolledX) - (child->getAbsX() - getAbsX());
 		int childY = (y + _scrolledY) - (child->getAbsY() - getAbsY());
 		child->handleMouseDown(childX, childY, button, clickCount);
+
+		if (child->getFlags() & WIDGET_IGNORE_DRAG) {
+			_isMouseDown = false;
+			_isDragging = false;
+		}
 	}
 }
 


Commit: e45bcd350c90f9a26c6c134a10ae26f9a29f1848
    https://github.com/scummvm/scummvm/commit/e45bcd350c90f9a26c6c134a10ae26f9a29f1848
Author: Mohit Bankar (mohitbankar1212 at gmail.com)
Date: 2026-04-24T10:57:34+02:00

Commit Message:
GUI: Fix ScrollContainerWidget focus regression

Changed paths:
    gui/widgets/scrollcontainer.cpp


diff --git a/gui/widgets/scrollcontainer.cpp b/gui/widgets/scrollcontainer.cpp
index 4fe633fa6a6..cc10cd44cb4 100644
--- a/gui/widgets/scrollcontainer.cpp
+++ b/gui/widgets/scrollcontainer.cpp
@@ -262,6 +262,10 @@ Widget *ScrollContainerWidget::findWidget(int x, int y) {
 	_childUnderMouse = Widget::findWidgetInChain(_firstWidget, x + _scrolledX, y + _scrolledY);
 	if (_childUnderMouse == _verticalScroll) 
 		_childUnderMouse = nullptr;
+
+	if (_childUnderMouse && _childUnderMouse->wantsFocus())
+		return _childUnderMouse;
+
 	return this;
 }