diff options
| author | Eugene Sandulenko | 2018-07-11 22:21:02 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-11 22:45:36 +0200 |
| commit | 04dfa9b0a99033511b30289bac7f9a064769c220 (patch) | |
| tree | f2134e7aeb36a409d61d334564b15abf4f207131 /graphics/macgui | |
| parent | ace8fcca8287ca77eafd94df77d437b623a6cd2c (diff) | |
| download | scummvm-rg350-04dfa9b0a99033511b30289bac7f9a064769c220.tar.gz scummvm-rg350-04dfa9b0a99033511b30289bac7f9a064769c220.tar.bz2 scummvm-rg350-04dfa9b0a99033511b30289bac7f9a064769c220.zip | |
GRAPHICS: MACGUI: Made autohiding menu reentrable
Diffstat (limited to 'graphics/macgui')
| -rw-r--r-- | graphics/macgui/macmenu.cpp | 5 | ||||
| -rw-r--r-- | graphics/macgui/macmenu.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp index 0d25ea7a41..cb8c9b51cc 100644 --- a/graphics/macgui/macmenu.cpp +++ b/graphics/macgui/macmenu.cpp @@ -549,9 +549,12 @@ bool MacMenu::mouseClick(int x, int y) { } bool MacMenu::mouseMove(int x, int y) { - if (_menuActivated) + if (_menuActivated) { if (mouseClick(x, y)) return true; + } else if ((_wm->_mode & kWMModeAutohideMenu) && !_bbox.contains(x, y)) { + _isVisible = false; + } return false; } diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h index 08c8f41c23..c98dd1f0d6 100644 --- a/graphics/macgui/macmenu.h +++ b/graphics/macgui/macmenu.h @@ -66,7 +66,7 @@ public: bool hasAllFocus() { return _menuActivated; } bool isVisible() { return _isVisible; } - void setVisible(bool visible) { _isVisible = visible; } + void setVisible(bool visible) { _isVisible = visible; _contentIsDirty = true; } Common::Rect _bbox; |