Changeset 26967 in vbox

Timestamp:

Mar 2, 2010 6:32:10 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: multi-monitor captured/released mouse issue fix.

Location:

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

Files:

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

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

@@ -587 +587 @@
     /* Mouse capability state-change updater: */
     connect(uisession(), SIGNAL(sigMouseCapabilityChange()), this, SLOT(sltMouseCapabilityChanged()));
+
+    /* Mouse captivity status-change updater: */
+    connect(uisession(), SIGNAL(sigMouseCapturedStatusChanged()), this, SLOT(sltMouseCapturedStatusChanged()));
 }
 
@@ -1126 +1129 @@
     /* Notify all listeners: */
     emitMouseStateChanged();
+}
+
+void UIMachineView::sltMouseCapturedStatusChanged()
+{
+    if (!uisession()->isMouseCaptured())
+    {
+        /* We will just release mouse if it was released in other than that window: */
+#ifndef Q_WS_WIN32
+        viewport()->releaseMouse();
+#endif
+        /* Also we will unset cursor if mouse was released in other than that window: */
+        viewport()->unsetCursor();
+    }
 }
 

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

@@ -156 +156 @@
     virtual void sltMouseCapabilityChanged();
 
+    /* Session callback handlers: */
+    virtual void sltMouseCapturedStatusChanged();
+
 private slots:
 

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

@@ -128 +128 @@
 
     /* Mouse setters: */
-    void setMouseCaptured(bool fIsMouseCaptured) { m_fIsMouseCaptured = fIsMouseCaptured; }
+    void setMouseCaptured(bool fIsMouseCaptured) { m_fIsMouseCaptured = fIsMouseCaptured; emit sigMouseCapturedStatusChanged(); }
     void setMouseIntegrated(bool fIsMouseIntegrated) { m_fIsMouseIntegrated = fIsMouseIntegrated; }
 
@@ -152 +152 @@
     void sigRuntimeError(bool bIsFatal, const QString &strErrorId, const QString &strMessage);
 
+    /* Session signals: */
+    void sigMouseCapturedStatusChanged();
+
 private slots: