From b16b2c4b6b6ad485046ff23fbf1a44cf0ce5ac62 Mon Sep 17 00:00:00 2001 From: ysj1173886760 <1173886760@qq.com> Date: Wed, 28 Jul 2021 15:50:49 +0800 Subject: [PATCH] GRAPHICS: MACGUI: amend the behaviour for list style button --- engines/director/events.cpp | 1 + graphics/macgui/macbutton.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/engines/director/events.cpp b/engines/director/events.cpp index 770dda6991e..48246270c60 100644 --- a/engines/director/events.cpp +++ b/engines/director/events.cpp @@ -151,6 +151,7 @@ bool Movie::processEvent(Common::Event &event) { spriteId = sc->getActiveSpriteIDFromPos(pos); else spriteId = sc->getMouseSpriteIDFromPos(pos); + _currentClickOnSpriteId = sc->getActiveSpriteIDFromPos(pos); _currentHandlingChannelId = spriteId; diff --git a/graphics/macgui/macbutton.cpp b/graphics/macgui/macbutton.cpp index b43730ce89b..72df75b48dc 100644 --- a/graphics/macgui/macbutton.cpp +++ b/graphics/macgui/macbutton.cpp @@ -179,8 +179,8 @@ bool MacButton::processEvent(Common::Event &event) { if (_wm->_mouseDown) { if (_wm->_mode & kWMModeButtonDialogStyle) return true; - else if (!_dims.contains(_wm->_lastClickPos)) - return false; + // hovered widget in macwindow will help us set the button status to non-active. + // so we only care about setting active here is ok. setActive(true); }