Changeset 27534 in vbox

Timestamp:

Mar 19, 2010 1:31:05 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix broken Qt isMaximized method

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.h (modified) (3 diffs)
• VBoxSelectorWnd.cpp (modified) (1 diff)
• darwin/VBoxUtils-darwin-cocoa.mm (modified) (1 diff)
• darwin/VBoxUtils-darwin.cpp (modified) (1 diff)
• darwin/VBoxUtils-darwin.h (modified) (2 diffs)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (6 diffs)
• runtime/normal/UIMachineWindowNormal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.h

@@ -42 +42 @@
 #endif
 #ifdef Q_WS_MAC
+# include "VBoxUtils.h"
 # include <ApplicationServices/ApplicationServices.h>
 # ifndef QT_MAC_USE_COCOA
@@ -74 +75 @@
     virtual ~VBoxConsoleWnd();
 
-    bool isWindowMaximized() const
+    bool isWindowMaximized()
     {
 #ifdef Q_WS_MAC
@@ -80 +81 @@
          * maximize the window. This situation has to be considered when
          * checking for maximized or fullscreen mode. */
-        return !isTrueSeamless() && QMainWindow::isMaximized();
+        return !isTrueSeamless() && ::darwinIsWindowMaximized(this);
 #else /* Q_WS_MAC */
         return QMainWindow::isMaximized();

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

@@ -734 +734 @@
             .arg (mNormalGeo.x()).arg (y)
             .arg (mNormalGeo.width()).arg (mNormalGeo.height());
+#ifdef Q_WS_MAC
+        if (::darwinIsWindowMaximized(this))
+#else /* Q_WS_MAC */
         if (isMaximized())
+#endif /* !Q_WS_MAC */
             winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin-cocoa.mm

@@ -185 +185 @@
 }
 
+bool darwinIsWindowMaximized(NativeWindowRef aWindow)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    
+    bool fResult = [aWindow isZoomed];
+
+    [pool release];
+    return fResult;
+}
+
 float darwinSmallFontSize()
 {
-    return [NSFont systemFontSizeForControlSize: NSSmallControlSize];
-}
-
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    float size = [NSFont systemFontSizeForControlSize: NSSmallControlSize];
+
+    [pool release];
+    return size;
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp

@@ -105 +105 @@
 {
     ::darwinSetShowsResizeIndicatorImpl (::darwinToNativeWindow (aWidget), aEnabled);
+}
+
+bool darwinIsWindowMaximized(QWidget *aWidget)
+{
+#ifdef QT_MAC_USE_COCOA
+    /* Currently only necessary in the Cocoa version */
+    return ::darwinIsWindowMaximized(::darwinToNativeWindow(aWidget));
+#else /* QT_MAC_USE_COCOA */
+    NOREF (aWidget);
+    return false;
+#endif /* !QT_MAC_USE_COCOA */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.h

@@ -93 +93 @@
 void darwinWindowInvalidateShadowImpl (NativeWindowRef aWindow);
 int  darwinWindowToolBarHeight (NativeWindowRef aWindow);
+bool darwinIsWindowMaximized(NativeWindowRef aWindow);
+
 float darwinSmallFontSize();
 bool darwinSetFrontMostProcess();
@@ -172 +174 @@
 void darwinWindowInvalidateShadow (QWidget *aWidget);
 int  darwinWindowToolBarHeight (QWidget *aWidget);
+bool darwinIsWindowMaximized(QWidget *aWidget);
 QString darwinSystemLanguage (void);
 QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -30 +30 @@
 /* Local includes */
 #include "VBoxGlobal.h"
+#include "VBoxUtils.h"
 
 #include "UIActionsPool.h"
@@ -260 +261 @@
         {
             QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-            if (!isMaximized())
+            if (!isMaximizedChecked())
             {
                 m_normalGeometry.setSize(pResizeEvent->size());
@@ -272 +273 @@
         case QEvent::Move:
         {
-            if (!isMaximized())
+            if (!isMaximizedChecked())
             {
                 m_normalGeometry.moveTo(geometry().x(), geometry().y());
@@ -559 +560 @@
     CMachine machine = session().GetMachine();
 
+    printf("bla\n");
     /* Save extra-data settings: */
     {
@@ -564 +566 @@
                                     .arg(m_normalGeometry.x()).arg(m_normalGeometry.y())
                                     .arg(m_normalGeometry.width()).arg(m_normalGeometry.height());
-        if (isMaximized())
+        if (isMaximizedChecked())
             strWindowPosition += QString(",%1").arg(VBoxDefs::GUI_LastWindowPosition_Max);
         QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastWindowPosition) :
@@ -595 +597 @@
 }
 
+bool UIMachineWindowNormal::isMaximizedChecked()
+{
+#ifdef Q_WS_MAC
+    /* On the Mac the WindowStateChange signal doesn't seems to be delivered
+     * when the user get out of the maximized state. So check this ourself. */
+    return ::darwinIsWindowMaximized(this);
+#endif /* !Q_WS_MAC */
+    return isMaximized();
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -106 +106 @@
     /* Other members: */
     void showSimple();
+    bool isMaximizedChecked();
 
     /* Indicators pool: */