Changeset 38992 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 13, 2011 9:28:21 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: reverted r74389 as I committed far too much.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (2 diffs)
• scale/UIMachineViewScale.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -549 +549 @@
 QSize UIMachineView::sizeHint() const
 {
-    QSize fb(m_pFrameBuffer->width(), m_pFrameBuffer->height());
-    QSize hint = fb.boundedTo(m_storedConsoleSize);
 #ifdef VBOX_WITH_DEBUGGER
     // TODO: Fix all DEBUGGER stuff!
     /* HACK ALERT! Really ugly workaround for the resizing to 9x1 done by DevVGA if provoked before power on. */
-    if (hint.width() < 16 || hint.height() < 16)
+    QSize fb(m_pFrameBuffer->width(), m_pFrameBuffer->height());
+    if (fb.width() < 16 || fb.height() < 16)
     {
         CMachine machine = uisession()->session().GetMachine();
         if (   vboxGlobal().isStartPausedEnabled()
             || vboxGlobal().isDebuggerAutoShowEnabled(machine))
-        hint = QSize(640, 480);
-    }
-#endif /* VBOX_WITH_DEBUGGER */
-    return QSize(hint.width() + frameWidth() * 2, hint.height() + frameWidth() * 2);
+        fb = QSize(640, 480);
+    }
+    return QSize(fb.width() + frameWidth() * 2, fb.height() + frameWidth() * 2);
+#else /* VBOX_WITH_DEBUGGER */
+    return QSize(m_pFrameBuffer->width() + frameWidth() * 2, m_pFrameBuffer->height() + frameWidth() * 2);
+#endif /* !VBOX_WITH_DEBUGGER */
 }
 

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

@@ -209 +209 @@
     /* This method should not get called until we have initially set up the desktop geometry type: */
     Assert((desktopGeometryType() != DesktopGeo_Invalid));
-    if (desktopGeometryType() != DesktopGeo_Fixed)
+    /* If we are not doing automatic geometry calculation then there is nothing to do: */
+    if (desktopGeometryType() == DesktopGeo_Automatic)
         m_desktopGeometry = workingArea().size();
 }

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

@@ -132 +132 @@
             case QEvent::Resize:
             {
+                const QSize *pSize = &static_cast<QResizeEvent *>(pEvent)
+                                    ->size();
                 if (pEvent->spontaneous() && m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
                     QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));
@@ -306 +308 @@
     /* This method should not get called until we have initially set up the desktop geometry type: */
     Assert((desktopGeometryType() != DesktopGeo_Invalid));
-    if (desktopGeometryType() != DesktopGeo_Fixed)
+    /* If we are not doing automatic geometry calculation then there is nothing to do: */
+    if (desktopGeometryType() == DesktopGeo_Automatic)
     {
         /* The area taken up by the machine window on the desktop,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -372 +372 @@
     /* This method should not get called until we have initially set up the desktop geometry type: */
     Assert((desktopGeometryType() != DesktopGeo_Invalid));
-    if (desktopGeometryType() != DesktopGeo_Fixed)
+    /* If we are not doing automatic geometry calculation then there is nothing to do: */
+    if (desktopGeometryType() == DesktopGeo_Automatic)
     {
         /* The area taken up by the machine window on the desktop,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -227 +227 @@
     /* This method should not get called until we have initially set up the desktop geometry type: */
     Assert((desktopGeometryType() != DesktopGeo_Invalid));
-    if (desktopGeometryType() != DesktopGeo_Fixed)
+    /* If we are not doing automatic geometry calculation then there is nothing to do: */
+    if (desktopGeometryType() == DesktopGeo_Automatic)
         m_desktopGeometry = workingArea().size();
 }