Changeset 82030 in vbox

Timestamp:

Nov 20, 2019 4:07:24 PM (5 years ago)

Author:

vboxsync

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

134834

Message:

FE/Qt: bugref:9598: UIMachineView and UIMouseHandler: Pass pointer shape change signal from session to handler through machine-view, to keep proper order of events.

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMachineView.h (modified) (1 diff)
• UIMouseHandler.cpp (modified) (2 diffs)

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

@@ -836 +836 @@
     /* Machine state-change updater: */
     connect(uisession(), &UISession::sigMachineStateChange, this, &UIMachineView::sltMachineStateChanged);
+    /* Mouse pointer shape updater: */
+    connect(uisession(), &UISession::sigMousePointerShapeChange, this, &UIMachineView::sigMousePointerShapeChange);
 }
 

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

@@ -70 +70 @@
 signals:
 
+    /** Notifies about mouse pointer shape change. */
+    void sigMousePointerShapeChange();
     /** Notifies about frame-buffer resize. */
     void sigFrameBufferResize();

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

@@ -108 +108 @@
         /* Install event-filter for machine-view: */
         m_views[uIndex]->installEventFilter(this);
+        /* Make machine-view notify mouse-handler about mouse pointer shape change: */
+        connect(m_views[uIndex], &UIMachineView::sigMousePointerShapeChange, this, &UIMouseHandler::sltMousePointerShapeChanged);
         /* Make machine-view notify mouse-handler about frame-buffer resize: */
         connect(m_views[uIndex], &UIMachineView::sigFrameBufferResize, this, &UIMouseHandler::sltMousePointerShapeChanged);
@@ -523 +525 @@
     connect(uisession(), &UISession::sigMouseCapabilityChange, this, &UIMouseHandler::sltMouseCapabilityChanged);
 
-    /* Mouse pointer shape state-change updaters: */
-    connect(uisession(), &UISession::sigMousePointerShapeChange, this, &UIMouseHandler::sltMousePointerShapeChanged);
+    /* Mouse pointer shape state-change updater: */
     connect(this, &UIMouseHandler::sigStateChange, this, &UIMouseHandler::sltMousePointerShapeChanged);