Changeset 27207 in vbox

Timestamp:

Mar 9, 2010 12:15:40 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: mouse-shape-change callback processing fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -1089 +1089 @@
 void UIMachineView::sltMousePointerShapeChanged()
 {
+    /* Mouse supports 'absolute' mode? */
     if (uisession()->isMouseSupportsAbsolute())
     {
-        /* Should we use guest pointer shape? */
-        if (uisession()->isValidPointerShapePresent())
+        /* Should we hide pointer first of all? */
+        if (uisession()->isHidingHostPointer())
+            viewport()->setCursor(Qt::BlankCursor);
+        /* Or should we use guest pointer shape? */
+        else if (uisession()->isValidPointerShapePresent())
             viewport()->setCursor(uisession()->cursor());
-        /* Should we hide pointer at all? */
-        else if (uisession()->isHidingHostPointer())
-            viewport()->setCursor(Qt::BlankCursor);
+        /* Else we have no other way except unset cursor: */
+        else
+            viewport()->unsetCursor();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -663 +663 @@
             UIMousePointerShapeChangeEvent *pConsoleEvent = static_cast<UIMousePointerShapeChangeEvent*>(pEvent);
 
-            /* Remember if we should show cursor: */
-            m_fIsHideHostPointer = !pConsoleEvent->isVisible();
-
-            /* Cache shape dataif present: */
+            /* In case of shape data is present: */
             if (pConsoleEvent->shapeData())
+            {
+                /* We are ignoring visibility flag: */
+                m_fIsHideHostPointer = false;
+
+                /* And updating current cursor shape: */
                 setPointerShape(pConsoleEvent->shapeData(), pConsoleEvent->hasAlpha(),
                                 pConsoleEvent->xHot(), pConsoleEvent->yHot(),
                                 pConsoleEvent->width(), pConsoleEvent->height());
+            }
+            /* In case of shape data is NOT present: */
+            else
+            {
+                /* Remember if we should hide the cursor: */
+                m_fIsHideHostPointer = !pConsoleEvent->isVisible();
+            }
 
             /* Notify listeners about mouse capability changed: */