Changeset 12097 in vbox for trunk/src/VBox

Timestamp:

Sep 4, 2008 2:30:08 PM (16 years ago)

Author:

vboxsync

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

36038

Message:

FE/Qt4-OSX: Don't use Sheets if we are in fullscreen (bug #3136).

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxCloseVMDlg.h (modified) (1 diff)
• src/QIMessageBox.cpp (modified) (2 diffs)
• src/VBoxCloseVMDlg.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxCloseVMDlg.h

@@ -28 +28 @@
 #include "QIDialog.h"
 
-class VBoxCloseVMDlg : public QIWithRetranslateUI2<QIDialog>,
+class VBoxCloseVMDlg : public QIWithRetranslateUI<QIDialog>,
                        public Ui::VBoxCloseVMDlg
 {

trunk/src/VBox/Frontends/VirtualBox4/src/QIMessageBox.cpp

@@ -27 +27 @@
 #include "QILabel.h"
 #include "QIDialogButtonBox.h"
+#ifdef Q_WS_MAC
+# include "VBoxConsoleWnd.h"
+#endif /* Q_WS_MAC */
 
 /* Qt includes */
@@ -47 +50 @@
                             QWidget *aParent, const char *aName, bool aModal)
     : QIDialog (aParent,
-                Qt::Window | Qt::Sheet | 
+                Qt::Window | 
                 Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
+#ifdef Q_WS_MAC
+    /* Sheets are broken if the window is in fullscreen mode. So make it a
+     * normal window in that case. */
+    VBoxConsoleWnd *cwnd = qobject_cast<VBoxConsoleWnd*> (aParent);
+    if (cwnd != NULL &&
+        !cwnd->isTrueFullscreen() &&
+        !cwnd->isTrueSeamless())
+        setWindowFlags (windowFlags() | Qt::Sheet);
+#endif /* Q_WS_MAC */
+
+
     setWindowTitle (aCaption);
     /* Necessary to later find some of the message boxes */

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

@@ -23 +23 @@
 #include "VBoxCloseVMDlg.h"
 #include "VBoxProblemReporter.h"
+#ifdef Q_WS_MAC
+# include "VBoxConsoleWnd.h"
+#endif /* Q_WS_MAC */
 
 /* Qt includes */
@@ -28 +31 @@
 
 VBoxCloseVMDlg::VBoxCloseVMDlg (QWidget *aParent)
-    : QIWithRetranslateUI2<QIDialog> (aParent, Qt::Sheet)
+    : QIWithRetranslateUI<QIDialog> (aParent)
 {
+#ifdef Q_WS_MAC
+    /* Sheets are broken if the window is in fullscreen mode. So make it a
+     * normal window in that case. */
+    VBoxConsoleWnd *cwnd = qobject_cast<VBoxConsoleWnd*> (aParent);
+    if (cwnd != NULL &&
+        !cwnd->isTrueFullscreen() &&
+        !cwnd->isTrueSeamless())
+        setWindowFlags (Qt::Sheet);
+#endif /* Q_WS_MAC */
+
     /* Apply UI decorations */
     Ui::VBoxCloseVMDlg::setupUi (this);