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

Timestamp:

Jul 31, 2013 2:39:13 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Handle new type of 3D related event in IFramebuffer::Notify3DEvent callback.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (3 diffs)
• globals/UIPopupCenter.h (modified) (2 diffs)
• runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• runtime/UIFrameBuffer.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (1 diff)
• runtime/UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp

@@ -303 +303 @@
 }
 
-void UIPopupCenter::raisePopupStack(QWidget *pParent)
+void UIPopupCenter::reinstallPopupStack(QWidget *pParent, bool fAsTopLevel)
 {
     /* Make sure passed parent is valid: */
     if (!pParent)
-    {
-        AssertMsgFailed(("Passed parent is NULL"));
-        return;
-    }
+        return;
 
     /* Do we have a stack for passed parent? */
@@ -317 +314 @@
         return;
 
+    /* Make sure we should really reinstall stack: */
+    if ((fAsTopLevel && m_type == UIPopupIntegrationType_Toplevel) ||
+        (!fAsTopLevel && m_type == UIPopupIntegrationType_Embedded))
+        return;
+
+    LogRelFlow(("UIPopupCenter::reinstallPopupStack: Reinstalling popup-stack as %s.\n",
+                fAsTopLevel ? "top level window" : "embedded widget"));
+
     /* Remove stack: */
     hidePopupStack(pParent);
 
     /* Make sure integration type is correct: */
-    setStackIntegrationType(UIPopupIntegrationType_Toplevel);
+    setStackIntegrationType(fAsTopLevel ? UIPopupIntegrationType_Toplevel : UIPopupIntegrationType_Embedded);
 
     /* Return stack again: */
@@ -389 +394 @@
 }
 
-void UIPopupCenter::sltRaisePopupStack()
-{
-    raisePopupStack(vboxGlobal().activeMachineWindow());
+void UIPopupCenter::sltReinstallPopupStack(bool fAsTopLevel)
+{
+    reinstallPopupStack(vboxGlobal().activeMachineWindow(), fAsTopLevel);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.h

@@ -116 +116 @@
     void sltShowPopupStack();
     void sltHidePopupStack();
-    void sltRaisePopupStack();
+    void sltReinstallPopupStack(bool fAsTopLevel);
     void sltRemovePopupStack();
 
@@ -140 +140 @@
     void showPopupStack(QWidget *pParent);
     void hidePopupStack(QWidget *pParent);
-    void raisePopupStack(QWidget *pParent);
+    void reinstallPopupStack(QWidget *pParent, bool fAsTopLevel);
     void assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);
     void unassignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);

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

@@ -348 +348 @@
         case VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA:
         {
+            /* Notify GUI about 3D overlay visibility change: */
             BOOL fVisible = !!pData;
-
-            /* @todo: implement 3D visibility handling */
-//            /* Notify GUI about 3D event: */
-//            emit sigNotify3DEvent();
-
+            LogRelFlow(("UIFrameBuffer::Notify3DEvent: "
+                        "VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA=%s\n",
+                        fVisible ? "TRUE" : "FALSE"));
+            emit sigNotifyAbout3DOverlayVisibilityChange(fVisible);
             return S_OK;
         }
@@ -427 +427 @@
             m_pMachineView, SLOT(sltHandleSetVisibleRegion(QRegion)),
             Qt::QueuedConnection);
-    connect(this, SIGNAL(sigNotify3DEvent()),
-            m_pMachineView, SLOT(sltNotify3DEvent()),
+    connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
+            m_pMachineView, SLOT(sltHandle3DOverlayVisibilityChange(bool)),
             Qt::QueuedConnection);
 }
@@ -440 +440 @@
     disconnect(this, SIGNAL(sigSetVisibleRegion(QRegion)),
                m_pMachineView, SLOT(sltHandleSetVisibleRegion(QRegion)));
-    disconnect(this, SIGNAL(sigNotify3DEvent()),
-               m_pMachineView, SLOT(sltNotify3DEvent()));
-}
-
+    disconnect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
+               m_pMachineView, SLOT(sltHandle3DOverlayVisibilityChange(bool)));
+}
+

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

@@ -99 +99 @@
     void sigNotifyUpdate(int iX, int iY, int iWidth, int iHeight);
     void sigSetVisibleRegion(QRegion region);
-    void sigNotify3DEvent();
+    void sigNotifyAbout3DOverlayVisibilityChange(bool fVisible);
 
 public:

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

@@ -351 +351 @@
 }
 
-void UIMachineLogic::notifyAbout3DEvent()
-{
-    /* Notify listener about 3D event: */
-    emit sigNotify3DEvent();
+void UIMachineLogic::notifyAbout3DOverlayVisibilityChange(bool fVisible)
+{
+    /* Notify listener about 3D overlay visibility change: */
+    emit sigNotifyAbout3DOverlayVisibilityChange(fVisible);
 }
 
@@ -549 +549 @@
     connect(this, SIGNAL(sigMachineWindowsDestroyed()),
             &popupCenter(), SLOT(sltHidePopupStack()));
-    connect(this, SIGNAL(sigNotify3DEvent()),
-            &popupCenter(), SLOT(sltRaisePopupStack()));
+    connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
+            &popupCenter(), SLOT(sltReinstallPopupStack(bool)));
 }
 
@@ -560 +560 @@
     disconnect(this, SIGNAL(sigMachineWindowsDestroyed()),
                &popupCenter(), SLOT(sltHidePopupStack()));
-    disconnect(this, SIGNAL(sigNotify3DEvent()),
-               &popupCenter(), SLOT(sltRaisePopupStack()));
+    disconnect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
+               &popupCenter(), SLOT(sltReinstallPopupStack(bool)));
 }
 

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

@@ -58 +58 @@
     void sigMachineWindowsCreated();
     void sigMachineWindowsDestroyed();
-    void sigNotify3DEvent();
+    void sigNotifyAbout3DOverlayVisibilityChange(bool fVisible);
 
 public:
@@ -101 +101 @@
     void powerOff(bool fDiscardingState);
 
-    /* API: 3D event stuff: */
-    void notifyAbout3DEvent();
+    /* API: 3D overlay visibility stuff: */
+    void notifyAbout3DOverlayVisibilityChange(bool fVisible);
 
 protected slots:

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

@@ -293 +293 @@
 }
 
-void UIMachineView::sltNotify3DEvent()
-{
-    machineLogic()->notifyAbout3DEvent();
+void UIMachineView::sltHandle3DOverlayVisibilityChange(bool fVisible)
+{
+    machineLogic()->notifyAbout3DOverlayVisibilityChange(fVisible);
 }
 

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

@@ -103 +103 @@
     virtual void sltHandleSetVisibleRegion(QRegion region);
 
-    /* Handler: Frame-buffer Notify3DEvent stuff: */
-    virtual void sltNotify3DEvent();
+    /* Handler: Frame-buffer 3D overlay visibility stuff: */
+    virtual void sltHandle3DOverlayVisibilityChange(bool fVisible);
 
     /* Watch dog for desktop resizes: */