Changeset 35247 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 20, 2010 2:19:48 PM (14 years ago)

Author:

vboxsync

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

69094

Message:

FE/Qt: 3635: Scale mode: Keep aspect-ratio during manual window resize (win-host only).

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMachineView.h (modified) (1 diff)
• scale/UIMachineWindowScale.cpp (modified) (1 diff)
• scale/UIMachineWindowScale.h (modified) (1 diff)

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

@@ -141 +141 @@
 }
 
+double UIMachineView::aspectRatio() const
+{
+    return frameBuffer() ? (double)(frameBuffer()->width()) / frameBuffer()->height() : 0;
+}
+
 void UIMachineView::sltMachineStateChanged()
 {

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

@@ -63 +63 @@
     /* Public members: */
     virtual void normalizeGeometry(bool /* bAdjustPosition = false */) = 0;
+
+    /* Framebuffer aspect ratio: */
+    double aspectRatio() const;
 
 signals:

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

@@ -150 +150 @@
     return QIWithRetranslateUI2<QMainWindow>::event(pEvent);
 }
+
+#ifdef Q_WS_WIN
+bool UIMachineWindowScale::winEvent(MSG *pMessage, long *pResult)
+{
+    /* Try to keep aspect ratio during window resize if:
+     * 1. machine view exists and 2. event-type is WM_SIZING and 3. shift key is NOT pressed: */
+    if (machineView() && pMessage->message == WM_SIZING && !(QApplication::keyboardModifiers() & Qt::ShiftModifier))
+    {
+        if (double dAspectRatio = machineView()->aspectRatio())
+        {
+            RECT *pRect = reinterpret_cast<RECT*>(pMessage->lParam);
+            switch (pMessage->wParam)
+            {
+                case WMSZ_LEFT:
+                case WMSZ_RIGHT:
+                {
+                    pRect->bottom = pRect->top + (double)(pRect->right - pRect->left) / dAspectRatio;
+                    break;
+                }
+                case WMSZ_TOP:
+                case WMSZ_BOTTOM:
+                {
+                    pRect->right = pRect->left + (double)(pRect->bottom - pRect->top) * dAspectRatio;
+                    break;
+                }
+                case WMSZ_BOTTOMLEFT:
+                case WMSZ_BOTTOMRIGHT:
+                {
+                    pRect->bottom = pRect->top + (double)(pRect->right - pRect->left) / dAspectRatio;
+                    break;
+                }
+                case WMSZ_TOPLEFT:
+                case WMSZ_TOPRIGHT:
+                {
+                    pRect->top = pRect->bottom - (double)(pRect->right - pRect->left) / dAspectRatio;
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    }
+    /* Pass event to base-class: */
+    return QMainWindow::winEvent(pMessage, pResult);
+}
+#endif /* Q_WS_WIN */
 
 #ifdef Q_WS_X11

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h

@@ -55 +55 @@
     /* Event handlers: */
     bool event(QEvent *pEvent);
+#ifdef Q_WS_WIN
+    bool winEvent(MSG *pMessage, long *pResult); 
+#endif
 #ifdef Q_WS_X11
     bool x11Event(XEvent *pEvent);