Changeset 52515 in vbox

Timestamp:

Aug 28, 2014 3:14:25 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Native full-screen: More appropriate initial geometry for window which is about to enter full-screen.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -31 +31 @@
 #include "UIMachineWindowFullscreen.h"
 #include "UIMachineView.h"
+#include "UIFrameBuffer.h"
 #include "UIMachineDefs.h"
 #include "UIMiniToolBar.h"
@@ -298 +299 @@
     else
     {
+        /* Load normal geometry first of all: */
+        QRect geo = gEDataManager->machineWindowGeometry(UIVisualStateType_Normal, m_uScreenId, vboxGlobal().managedVMUuid());
+        /* If normal geometry is null => use frame-buffer size: */
+        if (geo.isNull())
+        {
+            const UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(m_uScreenId);
+            geo = QRect(QPoint(0, 0), QSize(pFrameBuffer->width(), pFrameBuffer->height()).boundedTo(workingArea.size()));
+        }
+        /* If frame-buffer size is null => use default size: */
+        if (geo.isNull())
+            geo = QRect(QPoint(0, 0), QSize(800, 600).boundedTo(workingArea.size()));
         /* Move window to the center of working-area: */
-        QRect geo = gEDataManager->machineWindowGeometry(UIVisualStateType_Normal, m_uScreenId, vboxGlobal().managedVMUuid());
         geo.moveCenter(workingArea.center());
         setGeometry(geo);