Changeset 53892 in vbox

Timestamp:

Jan 21, 2015 11:43:32 AM (10 years ago)

Author:

vboxsync

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

97741

Message:

FE/Qt: 6278: Support for scaled video-output: Reapply scale-factor after machine startup (to apply it to 3D service).

Location:

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

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineView.cpp (modified) (1 diff)
• UIMachineView.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

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

@@ -324 +324 @@
     foreach(UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->adjustMachineViewSize();
+}
+
+void UIMachineLogic::applyMachineWindowsScaleFactor()
+{
+    /* By default, the only thing we need is to
+     * apply machine-window scale-factor(s) if necessary: */
+    foreach(UIMachineWindow *pMachineWindow, machineWindows())
+        pMachineWindow->applyMachineWindowScaleFactor();
 }
 

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

@@ -122 +122 @@
     virtual void adjustMachineWindowsGeometry();
 
+    /** Applies machine-window(s) scale-factor. */
+    void applyMachineWindowsScaleFactor();
+
     /* Wrapper to open Machine settings / Network page: */
     void openNetworkSettingsDialog() { sltOpenNetworkSettingsDialog(); }

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

@@ -169 +169 @@
 }
 
-void UIMachineView::adjustAccordingScaleFactor()
+void UIMachineView::applyMachineViewScaleFactor()
 {
     /* Take the scale-factor into account: */

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

@@ -91 +91 @@
     virtual void adjustGuestScreenSize() {}
 
-    /** Adjusts machine-view according scale-factor. */
-    void adjustAccordingScaleFactor();
+    /** Applies machine-view scale-factor. */
+    void applyMachineViewScaleFactor();
 
     /* Framebuffer aspect ratio: */

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

@@ -228 +228 @@
     /* We need to adjust guest-screen size if necessary: */
     machineView()->adjustGuestScreenSize();
-
-    /* And to adjust machine-view size according scale-factors: */
-    machineView()->adjustAccordingScaleFactor();
+}
+
+void UIMachineWindow::applyMachineWindowScaleFactor()
+{
+    /* We need to apply machine-view scale-factor if necessary: */
+    machineView()->applyMachineViewScaleFactor();
 }
 

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

@@ -83 +83 @@
     /** Adjusts machine-view size to correspond current machine-window size. */
     virtual void adjustMachineViewSize();
+
+    /** Applies machine-window scale-factor. */
+    void applyMachineWindowScaleFactor();
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS

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

@@ -281 +281 @@
     else
         msgCenter().showModalProgressDialog(progress, machineName(), ":/progress_start_90px.png");
+
+    /* Machine-window(s) scale-factor should be applied: */
+    machineLogic()->applyMachineWindowsScaleFactor();
 
     /* Check for progress failure: */