Changeset 27237 in vbox for trunk/src

Timestamp:

Mar 10, 2010 12:11:51 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: calculate geometry fix for normal, fullscreen, seamless modes.

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMachineView.h (modified) (5 diffs)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.h (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.h (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.h (modified) (1 diff)

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

@@ -340 +340 @@
 {
     m_storedConsoleSize = QSize(iWidth, iHeight);
-}
-
-void UIMachineView::calculateDesktopGeometry()
-{
-    /* This method should not get called until we have initially set up the m_desktopGeometryType: */
-    Assert((m_desktopGeometryType != DesktopGeo_Invalid));
-    /* If we are not doing automatic geometry calculation then there is nothing to do: */
-    if (DesktopGeo_Automatic == m_desktopGeometryType)
-    {
-        /* Available geometry of the desktop.  If the desktop is a single
-         * screen, this will exclude space taken up by desktop taskbars
-         * and things, but this is unfortunately not true for the more
-         * complex case of a desktop spanning multiple screens: */
-        QRect desktop = availableGeometry();
-        /* The area taken up by the machine window on the desktop,
-         * including window frame, title and menu bar and whatnot: */
-        QRect frame = machineWindowWrapper()->machineWindow()->frameGeometry();
-        /* The area taken up by the machine view, so excluding all decorations: */
-        QRect window = geometry();
-        /* To work out how big we can make the console window while still
-         * fitting on the desktop, we calculate desktop - frame + window.
-         * This works because the difference between frame and window
-         * (or at least its width and height) is a constant. */
-        m_desktopGeometry = QSize(desktop.width() - frame.width() + window.width(),
-                                  desktop.height() - frame.height() + window.height());
-    }
 }
 

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

@@ -112 +112 @@
     const QPixmap& pauseShot() const { return m_pauseShot; }
     QSize storedConsoleSize() const { return m_storedConsoleSize; }
-    virtual QSize desktopGeometry() const;
+    DesktopGeo desktopGeometryType() const { return m_desktopGeometryType; }
+    QSize desktopGeometry() const;
 
     /* Protected setters: */
@@ -120 +121 @@
 
     /* Protected helpers: */
-    void calculateDesktopGeometry();
     void updateMouseCursorShape();
 #ifdef Q_WS_WIN32
@@ -126 +126 @@
 #endif
     virtual QRect availableGeometry() = 0;
+    virtual void calculateDesktopGeometry() = 0;
     virtual void maybeRestrictMinimumSize() = 0;
     virtual void updateSliders() =  0;
@@ -153 +154 @@
     bool event(QEvent *pEvent);
     bool eventFilter(QObject *pWatched, QEvent *pEvent);
+
+    /* Protected variables: */
+    QSize m_desktopGeometry;
 
 protected slots:
@@ -222 +226 @@
 
     DesktopGeo m_desktopGeometryType;
-    QSize m_desktopGeometry;
     QSize m_storedConsoleSize;
 

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

@@ -267 +267 @@
 }
 
+void UIMachineViewFullscreen::calculateDesktopGeometry()
+{
+    /* This method should not get called until we have initially set up the desktop geometry type: */
+    Assert((desktopGeometryType() != DesktopGeo_Invalid));
+    /* If we are not doing automatic geometry calculation then there is nothing to do: */
+    if (desktopGeometryType() == DesktopGeo_Automatic)
+    {
+        m_desktopGeometry = QSize(availableGeometry().width(), availableGeometry().height());
+    }
+}
+
 void UIMachineViewFullscreen::maybeRestrictMinimumSize()
 {

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

@@ -79 +79 @@
     void normalizeGeometry(bool /* fAdjustPosition */) {}
     QRect availableGeometry();
+    void calculateDesktopGeometry();
     void maybeRestrictMinimumSize();
     void updateSliders() {}

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

@@ -322 +322 @@
 }
 
+void UIMachineViewNormal::calculateDesktopGeometry()
+{
+    /* This method should not get called until we have initially set up the desktop geometry type: */
+    Assert((desktopGeometryType() != DesktopGeo_Invalid));
+    /* 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,
+         * including window frame, title, menu bar and status bar: */
+        QRect windowGeo = machineWindowWrapper()->machineWindow()->frameGeometry();
+        /* The area taken up by the machine central widget, so excluding all decorations: */
+        QRect centralWidgetGeo = static_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow())->centralWidget()->geometry();
+        /* To work out how big we can make the console window while still fitting on the desktop,
+         * we calculate availableGeometry() - (windowGeo - centralWidgetGeo).
+         * This works because the difference between machine window and machine central widget
+         * (or at least its width and height) is a constant. */
+        m_desktopGeometry = QSize(availableGeometry().width() - (windowGeo.width() - centralWidgetGeo.width()),
+                                  availableGeometry().height() - (windowGeo.height() - centralWidgetGeo.height()));
+    }
+}
+
 void UIMachineViewNormal::maybeRestrictMinimumSize()
 {

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

@@ -77 +77 @@
     void normalizeGeometry(bool fAdjustPosition);
     QRect availableGeometry();
+    void calculateDesktopGeometry();
     void maybeRestrictMinimumSize();
     void updateSliders();

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

@@ -274 +274 @@
 }
 
+void UIMachineViewSeamless::calculateDesktopGeometry()
+{
+    /* This method should not get called until we have initially set up the desktop geometry type: */
+    Assert((desktopGeometryType() != DesktopGeo_Invalid));
+    /* If we are not doing automatic geometry calculation then there is nothing to do: */
+    if (desktopGeometryType() == DesktopGeo_Automatic)
+    {
+        m_desktopGeometry = QSize(availableGeometry().width(), availableGeometry().height());
+    }
+}
+

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

@@ -76 +76 @@
     void normalizeGeometry(bool /* fAdjustPosition */) {}
     QRect availableGeometry();
+    void calculateDesktopGeometry();
     void maybeRestrictMinimumSize() {}
     void updateSliders() {}