Changeset 9825 for OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer/GraphicsWindowWin32.cpp

Timestamp:

02/27/09 12:14:04 (4 years ago)

Author:

robert

Message:

From Roland Smeenk, "Attached is a small bug fix for the redundant messages that are created in OSG applications on windows. GraphicsWindowWin?32::setCursor is called every frame from the WM_NCHITTEST message. This will result in a call to ::SetCursor?(_currentCursor) every frame, which again causes a WM_MOUSEMOVE to occur. The fix exits GraphicsWindowWin?32::setCursor if the requested cursor already is the current cursor.

"

Merged from svn/trunk using:

svn merge -r 9823:9824 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp

Files:

• OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer/GraphicsWindowWin32.cpp (modified) (1 diff, 1 prop)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer/GraphicsWindowWin32.cpp

@@ -1936 +1936 @@
 void GraphicsWindowWin32::setCursor( MouseCursor mouseCursor )
 {
-    if (mouseCursor != LeftRightCursor && 
-        mouseCursor != UpDownCursor && 
-        mouseCursor != TopLeftCorner && 
-        mouseCursor != TopRightCorner && 
-        mouseCursor != BottomLeftCorner && 
-        mouseCursor != BottomRightCorner)
-    {
-        _appMouseCursor = mouseCursor;
-    }
-
-    _mouseCursor = mouseCursor;
-    HCURSOR newCursor = getOrCreateCursor( mouseCursor);
-    if (newCursor == _currentCursor) return;
-
-    _currentCursor = newCursor;
-    _traits->useCursor = (_currentCursor != NULL);
-
-    if (_mouseCursor != InheritCursor)
-        ::SetCursor(_currentCursor);
+    if (_mouseCursor != mouseCursor)
+    {
+        if (mouseCursor != LeftRightCursor && 
+            mouseCursor != UpDownCursor && 
+            mouseCursor != TopLeftCorner && 
+            mouseCursor != TopRightCorner && 
+            mouseCursor != BottomLeftCorner && 
+            mouseCursor != BottomRightCorner)
+        {
+            _appMouseCursor = mouseCursor;
+        }
+
+        _mouseCursor = mouseCursor;
+        HCURSOR newCursor = getOrCreateCursor( mouseCursor);
+        if (newCursor == _currentCursor) return;
+
+        _currentCursor = newCursor;
+        _traits->useCursor = (_currentCursor != NULL);
+
+        if (_mouseCursor != InheritCursor)
+            ::SetCursor(_currentCursor);
+    }
 }