[Scummvm-cvs-logs] CVS: scummvm/gui TabWidget.cpp,1.14,1.15

Max Horn fingolfin at users.sourceforge.net
Mon Apr 4 10:58:00 CEST 2005


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14531

Modified Files:
	TabWidget.cpp 
Log Message:
Fix for bug #1166231 (GUI: Caret not removed when switching tabs)

Index: TabWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/TabWidget.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TabWidget.cpp	1 Jan 2005 16:09:06 -0000	1.14
+++ TabWidget.cpp	4 Apr 2005 17:57:40 -0000	1.15
@@ -60,7 +60,7 @@
 	// Add a new tab page
 	Tab newTab;
 	 newTab.title = title;
-	 newTab.firstWidget = NULL;
+	 newTab.firstWidget = 0;
 
 	_tabs.push_back(newTab);
 
@@ -84,8 +84,10 @@
 	assert(0 <= tabID && tabID < (int)_tabs.size());
 	if (_activeTab != tabID) {
 		// Exchange the widget lists, and switch to the new tab
-		if (_activeTab != -1)
+		if (_activeTab != -1) {
 			_tabs[_activeTab].firstWidget = _firstWidget;
+			releaseFocus();
+		}
 		_activeTab = tabID;
 		_firstWidget = _tabs[tabID].firstWidget;
 		_boss->draw();





More information about the Scummvm-git-logs mailing list