GRAPHICS: MACGUI: Restore screen on exiting from menu

scummvm · Jul 23, 2018 · c48489f · c48489f
1 parent 6fc6ce3
commit c48489f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
@@ -673,6 +673,8 @@ bool MacMenu::mouseMove(int x, int y) {
 		_isVisible = false;
 		if (_wm->_mode & kWMModalMenuMode) {
 			_wm->pauseEngine(false);
+			_wm->_screen = _wm->_screenCopy; // restore screen
+			g_system->copyRectToScreen(_wm->_screenCopy->getBasePtr(0, 0), _wm->_screenCopy->pitch, 0, 0, _wm->_screenCopy->w, _wm->_screenCopy->h);
 		}
 	}
 
@@ -686,6 +688,8 @@ bool MacMenu::mouseRelease(int x, int y) {
 
 		if (_wm->_mode & kWMModalMenuMode) {
 			_wm->pauseEngine(false);
+			_wm->_screen = _wm->_screenCopy; // restore screen
+			g_system->copyRectToScreen(_wm->_screenCopy->getBasePtr(0, 0), _wm->_screenCopy->pitch, 0, 0, _wm->_screenCopy->w, _wm->_screenCopy->h);
 		}
 
 		if (_activeItem != -1 && _activeSubItem != -1 && _items[_activeItem]->subitems[_activeSubItem]->enabled) {

diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
@@ -149,6 +149,7 @@ static void menuTimerHandler(void *refCon);
 
 MacWindowManager::MacWindowManager() {
 	_screen = 0;
+	_screenCopy = 0;
 	_lastId = 0;
 	_activeWindow = -1;
 
@@ -184,6 +185,7 @@ MacWindowManager::~MacWindowManager() {
 		delete _windows[i];
 
 	delete _fontMan;
+	delete _screenCopy;
 
 	g_system->getTimerManager()->removeTimerProc(&menuTimerHandler);
 }
@@ -338,6 +340,7 @@ static void menuTimerHandler(void *refCon) {
 	if (wm->_menuHotzone.contains(wm->_lastMousePos)) {
 		wm->activateMenu();
 		if (wm->_mode & kWMModalMenuMode) {
+			wm->_screenCopy = new ManagedSurface(*wm->_screen);	// Create a copy
 			wm->pauseEngine(true);
 		}
 	}

diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
@@ -235,9 +235,11 @@ class MacWindowManager {
 	void removeFromStack(BaseMacWindow *target);
 	void removeFromWindowList(BaseMacWindow *target);
 
-private:
+public:
 	ManagedSurface *_screen;
+	ManagedSurface *_screenCopy;
 
+private:
 	Common::List<BaseMacWindow *> _windowStack;
 	Common::Array<BaseMacWindow *> _windows;