thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: MACGUI: Remove mouseDownWidget

Browse source 
The functionality I needed here can be implemented in the Director engine instead.
This commit is contained in:
Nathanael Gentry 2020-07-16 09:26:11 -04:00
parent 5877eae6f4
commit e23c264873
3 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
graphics/macgui/macwindow.cpp
View file

@ -551,7 +551,6 @@ bool MacWindow::processEvent(Common::Event &event) {
case Common::EVENT_LBUTTONUP:
_beingDragged = false;
_beingResized = false;
_wm->_mouseDownWidget = nullptr;
setHighlight(kBorderNone);
break;
@ -569,13 +568,10 @@ bool MacWindow::processEvent(Common::Event &event) {
return false;
}
MacWidget *w = _wm->_mouseDownWidget ? _wm->_mouseDownWidget : findEventHandler(event, _dims.left, _dims.top);
MacWidget *w = findEventHandler(event, _dims.left, _dims.top);
if (w && w != this) {
_wm->_hoveredWidget = w;
if (event.type == Common::EVENT_LBUTTONDOWN)
_wm->_mouseDownWidget = w;
if (w->processEvent(event))
return true;
}

2
graphics/macgui/macwindowmanager.cpp
View file

@ -161,7 +161,6 @@ MacWindowManager::MacWindowManager(uint32 mode, MacPatterns *patterns) {
_activeWidget = nullptr;
_mouseDown = false;
_hoveredWidget = nullptr;
_mouseDownWidget = nullptr;
_mode = mode;
@ -329,7 +328,6 @@ void MacWindowManager::removeWindow(MacWindow *target) {
_windowsToRemove.push_back(target);
_needsRemoval = true;
_hoveredWidget = nullptr;
_mouseDownWidget = nullptr;
if (target->getId() == _activeWindow)
_activeWindow = -1;

1
graphics/macgui/macwindowmanager.h
View file

@ -279,7 +279,6 @@ public:
int _colorBlack, _colorWhite;
MacWidget *_hoveredWidget;
MacWidget *_mouseDownWidget;
private:
void drawDesktop();