Changeset 57067 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 24, 2015 10:57:41 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Action-pool: Fixing sync issue for the case of switching between two modes with multi-screen layout.

Location:

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

Files:

• UIActionPoolRuntime.cpp (modified) (2 diffs)
• UIActionPoolRuntime.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

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

@@ -1857 +1857 @@
 void UIActionPoolRuntime::setMultiScreenLayout(UIMultiScreenLayout *pMultiScreenLayout)
 {
-    /* Disconnect old stuff: */
-    if (m_pMultiScreenLayout)
-    {
-        disconnect(this, SIGNAL(sigNotifyAboutTriggeringViewScreenRemap(int, int)),
-                   m_pMultiScreenLayout, SLOT(sltHandleScreenLayoutChange(int, int)));
-        disconnect(m_pMultiScreenLayout, SIGNAL(sigScreenLayoutUpdate()),
-                   this, SLOT(sltHandleScreenLayoutUpdate()));
-    }
+    /* Do not allow NULL pointers: */
+    AssertPtrReturnVoid(pMultiScreenLayout);
 
     /* Assign new multi-screen layout: */
@@ -1870 +1864 @@
 
     /* Connect new stuff: */
-    if (m_pMultiScreenLayout)
-    {
-        connect(this, SIGNAL(sigNotifyAboutTriggeringViewScreenRemap(int, int)),
-                m_pMultiScreenLayout, SLOT(sltHandleScreenLayoutChange(int, int)));
-        connect(m_pMultiScreenLayout, SIGNAL(sigScreenLayoutUpdate()),
-                this, SLOT(sltHandleScreenLayoutUpdate()));
-    }
+    connect(this, SIGNAL(sigNotifyAboutTriggeringViewScreenRemap(int, int)),
+            m_pMultiScreenLayout, SLOT(sltHandleScreenLayoutChange(int, int)));
+    connect(m_pMultiScreenLayout, SIGNAL(sigScreenLayoutUpdate()),
+            this, SLOT(sltHandleScreenLayoutUpdate()));
+
+    /* Invalidate View menu: */
+    m_invalidations << UIActionIndexRT_M_View;
+}
+
+void UIActionPoolRuntime::unsetMultiScreenLayout(UIMultiScreenLayout *pMultiScreenLayout)
+{
+    /* Do not allow NULL pointers: */
+    AssertPtrReturnVoid(pMultiScreenLayout);
+
+    /* Disconnect old stuff: */
+    disconnect(this, SIGNAL(sigNotifyAboutTriggeringViewScreenRemap(int, int)),
+               pMultiScreenLayout, SLOT(sltHandleScreenLayoutChange(int, int)));
+    disconnect(pMultiScreenLayout, SIGNAL(sigScreenLayoutUpdate()),
+               this, SLOT(sltHandleScreenLayoutUpdate()));
+
+    /* Unset old multi-screen layout: */
+    if (m_pMultiScreenLayout == pMultiScreenLayout)
+        m_pMultiScreenLayout = 0;
 
     /* Invalidate View menu: */

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

@@ -154 +154 @@
       * @note For menus which uses it to build contents. */
     void setMultiScreenLayout(UIMultiScreenLayout *pMultiScreenLayout);
+    /** Undefines UI multi-screen layout object reference.
+      * @note For menus which uses it to build contents. */
+    void unsetMultiScreenLayout(UIMultiScreenLayout *pMultiScreenLayout);
     /** Returns UI multi-screen layout object reference. */
     UIMultiScreenLayout* multiScreenLayout() const { return m_pMultiScreenLayout; }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -61 +61 @@
 {
     /* Delete multiscreen layout: */
-    actionPool()->toRuntime()->setMultiScreenLayout(0);
+    actionPool()->toRuntime()->unsetMultiScreenLayout(m_pScreenLayout);
     delete m_pScreenLayout;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -59 +59 @@
 {
     /* Delete multiscreen layout: */
-    actionPool()->toRuntime()->setMultiScreenLayout(0);
+    actionPool()->toRuntime()->unsetMultiScreenLayout(m_pScreenLayout);
     delete m_pScreenLayout;
 }