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

Timestamp:

Apr 4, 2019 1:37:38 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129791

Message:

FE/Qt: bugref:9376: Make framebuffer cursor react on mouse pointer shape changes as well, not just on cursor position changes; This handler allows to process animated cursor shapes and hide framebuffer cursor if it's became hidden, like in VM reset case.

File:

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

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

@@ -276 +276 @@
 protected slots:
 
+    /** Handles guest request to change the mouse pointer shape. */
+    void sltMousePointerShapeChange();
     /** Handles guest request to change the cursor position. */
     void sltCursorPositionChange();
@@ -1298 +1300 @@
 }
 
+void UIFrameBufferPrivate::sltMousePointerShapeChange()
+{
+    /* 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()->isHidingHostPointer()
+        && m_pMachineView->uisession()->isValidPointerShapePresent()
+        && m_pMachineView->uisession()->isValidCursorPositionPresent()
+        && (   !m_pMachineView->uisession()->isMouseIntegrated()
+            || !m_pMachineView->uisession()->isMouseSupportsAbsolute()))
+    {
+        /* Call for a viewport update using known shape rectangle: */
+        m_pMachineView->viewport()->update(m_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();
+    }
+}
+
 void UIFrameBufferPrivate::sltCursorPositionChange()
 {
@@ -1369 +1397 @@
 
     /* Attach GUI connections: */
+    connect(m_pMachineView->uisession(), &UISession::sigMousePointerShapeChange,
+            this, &UIFrameBufferPrivate::sltMousePointerShapeChange);
     connect(m_pMachineView->uisession(), &UISession::sigCursorPositionChange,
             this, &UIFrameBufferPrivate::sltCursorPositionChange);