Changeset 78016 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 4, 2019 1:28:24 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9376: Check for mouse cursor visibility flag, not just cached pointer shape, or stale shape can be applied to framebuffer cursor; Erase framebuffer cursor on position change event if it happens to be hidden by any reason.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (4 diffs)

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

@@ -1304 +1304 @@
      * framebuffer cursor if mouse integration is supported and enabled. */
     if (   m_pMachineView
+        && !m_pMachineView->uisession()->isHidingHostPointer()
         && m_pMachineView->uisession()->isValidPointerShapePresent()
         && m_pMachineView->uisession()->isValidCursorPositionPresent()
@@ -1339 +1340 @@
         /* Remember current cursor rectangle: */
         m_cursorRectangle = cursorRectangle;
+    }
+    /* Don't forget to clear the rectangle in opposite case: */
+    else if (   m_pMachineView
+             && m_cursorRectangle.isValid())
+    {
+        /* Call for a viewport update: */
+        m_pMachineView->viewport()->update(m_cursorRectangle);
+        /* And erase the rectangle after all: */
+        m_cursorRectangle = QRect();
     }
 }
@@ -1471 +1481 @@
      * Also, please take into account, we are not currently painting
      * framebuffer cursor if mouse integration is supported and enabled. */
-    if (   m_pMachineView->uisession()->isValidPointerShapePresent()
+    if (   !m_pMachineView->uisession()->isHidingHostPointer()
+        && m_pMachineView->uisession()->isValidPointerShapePresent()
         && m_pMachineView->uisession()->isValidCursorPositionPresent()
         && (   !m_pMachineView->uisession()->isMouseIntegrated()
@@ -1579 +1590 @@
      * Also, please take into account, we are not currently painting
      * framebuffer cursor if mouse integration is supported and enabled. */
-    if (   m_pMachineView->uisession()->isValidPointerShapePresent()
+    if (   !m_pMachineView->uisession()->isHidingHostPointer()
+        && m_pMachineView->uisession()->isValidPointerShapePresent()
         && m_pMachineView->uisession()->isValidCursorPositionPresent()
         && (   !m_pMachineView->uisession()->isMouseIntegrated()