[Scummvm-cvs-logs] SF.net SVN: scummvm: [22641] scummvm/trunk/gui

[eriktorbjorn at users.sourceforge.net]

Revision: 22641
Author:   eriktorbjorn
Date:     2006-05-25 16:20:35 -0700 (Thu, 25 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22641&view=rev

Log Message:
-----------
The GUI never asked for the cursor to be visible. I'm not sure why that used to
work before the cursor manager. Oh well, the launcher should have a visible
cursor again, knock on wood.

Modified Paths:
--------------
    scummvm/trunk/graphics/cursorman.cpp
    scummvm/trunk/gui/ThemeNew.cpp
    scummvm/trunk/gui/newgui.cpp
Modified: scummvm/trunk/graphics/cursorman.cpp
===================================================================
--- scummvm/trunk/graphics/cursorman.cpp	2006-05-25 22:53:45 UTC (rev 22640)
+++ scummvm/trunk/graphics/cursorman.cpp	2006-05-25 23:20:35 UTC (rev 22641)
@@ -48,6 +48,8 @@
 		return false;
 
 	_cursorStack.top()->_visible = visible;
+
+	// Should work, even if there's just a dummy cursor on the stack.
 	return g_system->showMouse(visible);
 }
 

Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-05-25 22:53:45 UTC (rev 22640)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-05-25 23:20:35 UTC (rev 22641)
@@ -1551,6 +1551,7 @@
 void ThemeNew::setUpCursor() {
 	PaletteMan.pushCursorPalette(_cursorPal, 0, MAX_CURS_COLORS);
 	CursorMan.pushCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale);
+	CursorMan.showMouse(true);
 }
 
 void ThemeNew::createCursor() {

Modified: scummvm/trunk/gui/newgui.cpp
===================================================================
--- scummvm/trunk/gui/newgui.cpp	2006-05-25 22:53:45 UTC (rev 22640)
+++ scummvm/trunk/gui/newgui.cpp	2006-05-25 23:20:35 UTC (rev 22641)
@@ -158,6 +158,7 @@
 
 		PaletteMan.pushCursorPalette(palette, 0, 4);
 		CursorMan.pushCursor(NULL, 0, 0, 0, 0);
+		CursorMan.showMouse(true);
 	}
 
 	while (!_dialogStack.empty() && activeDialog == _dialogStack.top()) {


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