Changeset 90705 in vbox

Timestamp:

Aug 17, 2021 4:48:16 PM (4 years ago)

Author:

vboxsync

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

146325

Message:

FE/Qt: bugref:8161: Runtime UI / UIMachineView: Stop all DnD related updates before detaching COM stuff.

Location:

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

Files:

• UIMachineView.cpp (modified) (7 diffs)
• UIMachineView.h (modified) (3 diffs)

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

@@ -148 +148 @@
     pMachineView->prepareCommon();
 
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    /* Prepare DnD: */
+    pMachineView->prepareDnd();
+#endif
+
     /* Prepare event-filters: */
     pMachineView->prepareFilters();
@@ -180 +185 @@
         return;
 
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    /* Cleanup DnD: */
+    pMachineView->cleanupDnd();
+#endif
+
     /* Cleanup frame-buffer: */
     pMachineView->cleanupFrameBuffer();
-
-#ifdef VBOX_WITH_DRAG_AND_DROP
-    if (pMachineView->m_pDnDHandler)
-    {
-        delete pMachineView->m_pDnDHandler;
-        pMachineView->m_pDnDHandler = NULL;
-    }
-#endif
 
     /* Cleanup native filters: */
@@ -790 +792 @@
 }
 
+void UIMachineView::sltDetachCOM()
+{
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    /* Cleanup DnD: */
+    cleanupDnd();
+#endif
+}
+
 UIMachineView::UIMachineView(UIMachineWindow *pMachineWindow, ulong uScreenId)
     : QAbstractScrollArea(pMachineWindow->centralWidget())
@@ -949 +959 @@
     /* Setup focus policy: */
     setFocusPolicy(Qt::WheelFocus);
+}
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
+void UIMachineView::prepareDnd()
+{
     /* Enable drag & drop: */
     setAcceptDrops(true);
@@ -956 +969 @@
     /* Create the drag and drop handler instance: */
     m_pDnDHandler = new UIDnDHandler(uisession(), this /* pParent */);
+}
 #endif /* VBOX_WITH_DRAG_AND_DROP */
-}
 
 void UIMachineView::prepareFilters()
@@ -977 +990 @@
 void UIMachineView::prepareConnections()
 {
+    /* UICommon connections: */
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM, this, &UIMachineView::sltDetachCOM);
     /* Desktop resolution change (e.g. monitor hotplug): */
     connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized,
@@ -1004 +1019 @@
     connect(uisession(), &UISession::sigMousePointerShapeChange, this, &UIMachineView::sltMousePointerShapeChange);
 }
+
+#ifdef VBOX_WITH_DRAG_AND_DROP
+void UIMachineView::cleanupDnd()
+{
+    delete m_pDnDHandler;
+    m_pDnDHandler = 0;
+}
+#endif /* VBOX_WITH_DRAG_AND_DROP */
 
 void UIMachineView::cleanupFrameBuffer()

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

@@ -153 +153 @@
     void sltMousePointerShapeChange();
 
+    /** Detaches COM. */
+    void sltDetachCOM();
+
 protected:
 
@@ -166 +169 @@
     virtual void prepareFrameBuffer();
     virtual void prepareCommon();
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    virtual void prepareDnd();
+#endif
     virtual void prepareFilters();
     virtual void prepareConnections();
@@ -174 +180 @@
     //virtual void cleanupConnections() {}
     //virtual void cleanupFilters() {}
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    virtual void cleanupDnd();
+#endif
     //virtual void cleanupCommon() {}
     virtual void cleanupFrameBuffer();