[Scummvm-cvs-logs] SF.net SVN: scummvm:[45139] scummvm/branches/branch-1-0-0/engines/ parallaction

[peres001 at users.sourceforge.net]

Revision: 45139
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45139&view=rev
Author:   peres001
Date:     2009-10-15 23:59:28 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
Backport of r45138. Fixed bug 2879795. Ensure cursor is visible after save/load dialog and debugger are closed.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/parallaction/debug.cpp
    scummvm/branches/branch-1-0-0/engines/parallaction/debug.h
    scummvm/branches/branch-1-0-0/engines/parallaction/parallaction_ns.cpp
    scummvm/branches/branch-1-0-0/engines/parallaction/saveload.cpp

Modified: scummvm/branches/branch-1-0-0/engines/parallaction/debug.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/parallaction/debug.cpp	2009-10-15 23:58:13 UTC (rev 45138)
+++ scummvm/branches/branch-1-0-0/engines/parallaction/debug.cpp	2009-10-15 23:59:28 UTC (rev 45139)
@@ -51,10 +51,13 @@
 
 
 void Debugger::preEnter() {
+	_mouseState = _vm->_input->getMouseState();
 }
 
 
 void Debugger::postEnter() {
+	_vm->_input->setMouseState(_mouseState);
+	_vm->_input->setArrowCursor();	// unselects the active item, if any
 }
 
 bool Debugger::Cmd_Location(int argc, const char **argv) {

Modified: scummvm/branches/branch-1-0-0/engines/parallaction/debug.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/parallaction/debug.h	2009-10-15 23:58:13 UTC (rev 45138)
+++ scummvm/branches/branch-1-0-0/engines/parallaction/debug.h	2009-10-15 23:59:28 UTC (rev 45139)
@@ -3,6 +3,7 @@
 #define PARALLACTION_DEBUGGER_H
 
 #include "gui/debugger.h"
+#include "parallaction/input.h"
 
 namespace Parallaction {
 
@@ -15,6 +16,7 @@
 
 protected:
 	Parallaction *_vm;
+	MouseTriState _mouseState;
 
 	virtual void preEnter();
 	virtual void postEnter();

Modified: scummvm/branches/branch-1-0-0/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/parallaction/parallaction_ns.cpp	2009-10-15 23:58:13 UTC (rev 45138)
+++ scummvm/branches/branch-1-0-0/engines/parallaction/parallaction_ns.cpp	2009-10-15 23:59:28 UTC (rev 45139)
@@ -267,6 +267,7 @@
 	}
 
 	_input->setArrowCursor();
+	_input->setMouseState(MOUSE_ENABLED_SHOW);
 
 	return c;
 }

Modified: scummvm/branches/branch-1-0-0/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/parallaction/saveload.cpp	2009-10-15 23:58:13 UTC (rev 45138)
+++ scummvm/branches/branch-1-0-0/engines/parallaction/saveload.cpp	2009-10-15 23:59:28 UTC (rev 45139)
@@ -361,8 +361,6 @@
 	GUI::TimedMessageDialog dialog("Loading game...", 1500);
 	dialog.runModal();
 
-	_vm->_input->setArrowCursor();
-
 	return true;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.