Changeset 27030 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2010 2:29:25 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: more Mac fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxCloseVMDlg.cpp (modified) (2 diffs)
• extensions/QIMessageBox.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxCloseVMDlg.cpp

@@ -35 +35 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+# include "UIMachineWindowNormal.h"
+#endif /* !VBOX_WITH_NEW_RUNTIME_CORE */
+
 VBoxCloseVMDlg::VBoxCloseVMDlg (QWidget *aParent)
     : QIWithRetranslateUI<QIDialog> (aParent)
 {
 #ifdef Q_WS_MAC
+
+# ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    /* No sheets in another mode than normal for now. Firstly it looks ugly and
+     * secondly in some cases it is broken. */
+    UIMachineWindowNormal *pWnd = qobject_cast<UIMachineWindowNormal*>(aParent);
+    if (pWnd)
+        setWindowFlags (Qt::Sheet);
+# else /* VBOX_WITH_NEW_RUNTIME_CORE */
     /* Sheets are broken if the window is in fullscreen mode. So make it a
      * normal window in that case. */
@@ -46 +58 @@
          !cwnd->isTrueSeamless()))
         setWindowFlags (Qt::Sheet);
+# endif /* !VBOX_WITH_NEW_RUNTIME_CORE */
 #endif /* Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp

@@ -42 +42 @@
 #include <QKeyEvent>
 
+#ifdef VBOX_WITH_NEW_RUNTIME_CORE
+# include "UIMachineWindowNormal.h"
+#endif /* !VBOX_WITH_NEW_RUNTIME_CORE */
 
 /** @class QIMessageBox
@@ -63 +66 @@
 {
 #ifdef Q_WS_MAC
+# ifdef VBOX_WITH_NEW_RUNTIME_CORE
+    /* No sheets in another mode than normal for now. Firstly it looks ugly and
+     * secondly in some cases it is broken. */
+    UIMachineWindowNormal *pWnd = qobject_cast<UIMachineWindowNormal*>(aParent);
+    if (pWnd)
+        setWindowFlags (Qt::Sheet);
+# else /* VBOX_WITH_NEW_RUNTIME_CORE */
     /* Sheets are broken if the window is in fullscreen mode. So make it a
      * normal window in that case. */
@@ -70 +80 @@
          !cwnd->isTrueSeamless()))
         setWindowFlags (Qt::Sheet);
+# endif /* !VBOX_WITH_NEW_RUNTIME_CORE */
 #endif /* Q_WS_MAC */