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

Timestamp:

Sep 21, 2012 11:38:32 AM (12 years ago)

Author:

vboxsync

Message:

BUGZ:6387 Notify guest about host window geometry change when restoring from saved state.

Location:

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

Files:

• UISession.cpp (modified) (4 diffs)
• UISession.h (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.h (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)

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

@@ -29 +29 @@
 #include "UIActionPoolRuntime.h"
 #include "UIMachineLogic.h"
+#include "UIMachineView.h"
 #include "UIMachineWindow.h"
 #include "UIMachineMenuBar.h"
@@ -148 +149 @@
 }
 
+void UISession::adjustGuestView()
+{
+    foreach(UIMachineWindow *pMachineWindow, machineLogic()->machineWindows())
+    {
+        bool bAdjustPosition = True;
+        UIVisualStateType visualStateType = machineLogic()->visualStateType();
+
+        if (visualStateType == UIVisualStateType_Normal ||
+            visualStateType == UIVisualStateType_Scale)
+            bAdjustPosition = True;
+
+        /* Normalize view's geometry: */
+        pMachineWindow->machineView()->normalizeGeometry(bAdjustPosition);
+    }
+}
+
 void UISession::powerUp()
 {
@@ -198 +215 @@
     /* Show "Starting/Restoring" progress dialog: */
     if (isSaved())
+    {
         msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_restore_90px.png", mainMachineWindow(), true, 0);
+        /* If restoring from saved state, guest MachineView
+           should be notified about host MachineWindow geometry change */
+        adjustGuestView();
+
+    }
     else
         msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_start_90px.png", mainMachineWindow(), true);
@@ -1133 +1156 @@
     foreach (const CHostNetworkInterface &iface, vboxGlobal().host().GetNetworkInterfaces())
     {
-        availableInterfaceNames << iface.GetName(); 
+        availableInterfaceNames << iface.GetName();
     }
 

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

@@ -229 +229 @@
     void reinitMenuPool();
     bool preparePowerUp();
+    void adjustGuestView();
 
 #ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER

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

@@ -162 +162 @@
 }
 
+void UIMachineViewFullscreen::normalizeGeometry(bool /* fAdjustPosition */)
+{
+    sltPerformGuestResize(workingArea().size());
+}
+
 QRect UIMachineViewFullscreen::workingArea() const
 {

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

@@ -65 +65 @@
 
     /* Private helpers: */
-    void normalizeGeometry(bool /* fAdjustPosition */) {}
+    void normalizeGeometry(bool /* fAdjustPosition */);
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

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

@@ -227 +227 @@
     QWidget *pTopLevelWidget = window();
 
-    /* Make no normalizeGeometry in case we are in manual resize mode or main window is maximized: */
-    if (pTopLevelWidget->isMaximized())
-        return;
-
     /* Calculate client window offsets: */
     QRect frameGeo = pTopLevelWidget->frameGeometry();