[Scummvm-cvs-logs] CVS: scummvm/backends/wince/CEgui ToolbarHandler.cpp,1.7,1.8

Nicolas Bacca arisme at users.sourceforge.net
Sun Oct 16 15:56:40 CEST 2005


Update of /cvsroot/scummvm/scummvm/backends/wince/CEgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12521/backends/wince/CEgui

Modified Files:
	ToolbarHandler.cpp 
Log Message:
Toolbar must be visible to process an action.

Index: ToolbarHandler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ToolbarHandler.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ToolbarHandler.cpp	30 Jul 2005 21:10:56 -0000	1.7
+++ ToolbarHandler.cpp	16 Oct 2005 22:53:56 -0000	1.8
@@ -33,7 +33,6 @@
 		_toolbarMap.addKey(name);
 		_toolbarMap[name] = (Toolbar*)&toolbar;
 
-
 		if (!_active) {
 			_active = &((Toolbar&)toolbar);
 			_current = name;
@@ -58,7 +57,7 @@
 	}
 
 	bool ToolbarHandler::action(int x, int y, bool pushed) {
-		if (_active) {
+		if (_active && _active->visible()) {
 			// FIXME !
 			if (_offset > 240)
 				return _active->action(x / 2, (y - _offset) / 2, pushed);





More information about the Scummvm-git-logs mailing list