Changeset 31319 in vbox

Timestamp:

Aug 2, 2010 4:41:47 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: use sheet windows in scale mode

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxCloseVMDlg.cpp (modified) (2 diffs)
• VBoxTakeSnapshotDlg.cpp (modified) (1 diff)
• extensions/QIMessageBox.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)

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

@@ -25 +25 @@
 #include "UIMachineWindowNormal.h"
 
+#ifdef Q_WS_MAC
+# include "VBoxGlobal.h"
+#endif /* Q_WS_MAC */
+
 /* Qt includes */
 #include <QPushButton>
@@ -35 +39 @@
     /* 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)
+    if (vboxGlobal().isSheetWindowsAllowed(aParent))
         setWindowFlags (Qt::Sheet);
 #endif /* Q_WS_MAC */

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

@@ -41 +41 @@
     /* No sheets in another mode than normal for now. Firstly it looks ugly and
      * secondly in some cases it is broken. */
-    if (   qobject_cast<UIMachineWindowNormal*>(pParent)
+    if (   vboxGlobal().isSheetWindowsAllowed(pParent)
         || qobject_cast<VBoxSnapshotsWgt*>(pParent))
-        setWindowFlags (Qt::Sheet);
+        setWindowFlags(Qt::Sheet);
 #endif /* Q_WS_MAC */
 

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

@@ -66 +66 @@
     /* No sheets in another mode than normal for now. Firstly it looks ugly and
      * secondly in some cases it is broken. */
-    if (!(   qobject_cast<UIMachineWindowFullscreen*>(aParent)
-          || qobject_cast<UIMachineWindowSeamless*>(aParent)))
-        setWindowFlags (Qt::Sheet);
+    if (vboxGlobal().isSheetWindowsAllowed(aParent))
+        setWindowFlags(Qt::Sheet);
 #endif /* Q_WS_MAC */
 

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

@@ -40 +40 @@
 # include "VBoxFBOverlay.h"
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+
+#ifdef Q_WS_MAC
+# include "UIMachineWindowFullscreen.h"
+# include "UIMachineWindowSeamless.h"
+#endif /* Q_WS_MAC */
 
 /* Qt includes */
@@ -4128 +4133 @@
 
 #endif
+
+#ifdef Q_WS_MAC
+bool VBoxGlobal::isSheetWindowsAllowed(QWidget *pParent) const
+{
+    if (!(   qobject_cast<UIMachineWindowFullscreen*>(pParent)
+          || qobject_cast<UIMachineWindowSeamless*>(pParent)))
+        return true;
+}
+#endif /* Q_WS_MAC */
 
 // Public slots

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

@@ -639 +639 @@
 #endif
 
+#ifdef Q_WS_MAC
+    bool isSheetWindowsAllowed(QWidget *pParent) const;
+#endif /* Q_WS_MAC */
+
 signals: