Changeset 77937 in vbox

Timestamp:

Mar 28, 2019 1:15:12 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9378: Runtime UI: Do not show framebuffer cursor if mouse integration both supported and enabled.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (3 diffs)
• UIMouseHandler.cpp (modified) (1 diff)

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

@@ -1300 +1300 @@
 void UIFrameBufferPrivate::sltCursorPositionChange()
 {
-    /* Do we have view and valid cursor position? */
-    if (m_pMachineView && m_pMachineView->uisession()->isValidCursorPositionPresent())
+    /* Do we have view and valid cursor position?
+     * Also, please take into account, we are not currently painting
+     * framebuffer cursor if mouse integration is supported and enabled. */
+    if (   m_pMachineView
+        && m_pMachineView->uisession()->isValidPointerShapePresent()
+        && m_pMachineView->uisession()->isValidCursorPositionPresent()
+        && (   !m_pMachineView->uisession()->isMouseIntegrated()
+            || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
     {
         /* Acquire cursor hotspot: */
@@ -1462 +1468 @@
     }
 
-    /* Paint cursor if it has valid shape and position: */
-    if (m_pMachineView->uisession()->isValidPointerShapePresent() && m_pMachineView->uisession()->isValidCursorPositionPresent())
+    /* Paint cursor if it has valid shape and position.
+     * Also, please take into account, we are not currently painting
+     * framebuffer cursor if mouse integration is supported and enabled. */
+    if (   m_pMachineView->uisession()->isValidPointerShapePresent()
+        && m_pMachineView->uisession()->isValidCursorPositionPresent()
+        && (   !m_pMachineView->uisession()->isMouseIntegrated()
+            || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
     {
         /* Acquire session cursor pixmap: */
@@ -1565 +1576 @@
     }
 
-    /* Paint cursor if it has valid shape and position: */
-    if (m_pMachineView->uisession()->isValidPointerShapePresent() && m_pMachineView->uisession()->isValidCursorPositionPresent())
+    /* Paint cursor if it has valid shape and position.
+     * Also, please take into account, we are not currently painting
+     * framebuffer cursor if mouse integration is supported and enabled. */
+    if (   m_pMachineView->uisession()->isValidPointerShapePresent()
+        && m_pMachineView->uisession()->isValidCursorPositionPresent()
+        && (   !m_pMachineView->uisession()->isMouseIntegrated()
+            || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
     {
         /* Acquire session cursor pixmap: */

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

@@ -452 +452 @@
      * We should hide host pointer in case of:
      * 1. mouse is 'captured' or
-     * 2. valid guest mouse cursor position provided to override host cursor with more actual coordinates
-     * 3. machine is NOT 'paused' and mouse is NOT 'captured' and 'integrated' and 'absolute' but host pointer is 'hidden' by the guest. */
+     * 2. machine is NOT 'paused' and mouse is NOT 'captured' and 'integrated' and 'absolute' but host pointer is 'hidden' by the guest. */
     if (uisession()->isMouseCaptured() ||
-        uisession()->isValidCursorPositionPresent() ||
         (!uisession()->isPaused() &&
          uisession()->isMouseIntegrated() &&