Changeset 62225 in vbox

Timestamp:

Jul 13, 2016 4:41:24 PM (9 years ago)

Author:

vboxsync

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

108736

Message:

FE/Qt: bugref:7625: Runtime UI: Normal mode: Normalization mechanism: Cleanup.

Location:

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

Files:

• UIMachineWindowNormal.cpp (modified) (3 diffs)
• UIMachineWindowNormal.h (modified) (1 diff)

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

@@ -513 +513 @@
 }
 
-/**
- * Adjusts machine-window size to correspond current guest screen size.
- * @param fAdjustPosition determines whether is it necessary to adjust position too.
- */
 void UIMachineWindowNormal::normalizeGeometry(bool fAdjustPosition)
 {
@@ -525 +521 @@
 
     /* Calculate client window offsets: */
-    QRect frameGeo = frameGeometry();
+    QRect frGeo = frameGeometry();
     const QRect geo = geometry();
-    int dl = geo.left() - frameGeo.left();
-    int dt = geo.top() - frameGeo.top();
-    int dr = frameGeo.right() - geo.right();
-    int db = frameGeo.bottom() - geo.bottom();
+    const int dl = geo.left() - frGeo.left();
+    const int dt = geo.top() - frGeo.top();
+    const int dr = frGeo.right() - geo.right();
+    const int db = frGeo.bottom() - geo.bottom();
 
     /* Get the best size w/o scroll-bars: */
-    QSize s = sizeHint();
+    QSize sh = sizeHint();
 
     /* If guest-screen auto-resize is not enabled
@@ -541 +537 @@
     {
         if (machineView()->verticalScrollBar()->isVisible())
-            s -= QSize(machineView()->verticalScrollBar()->sizeHint().width(), 0);
+            sh -= QSize(machineView()->verticalScrollBar()->sizeHint().width(), 0);
         if (machineView()->horizontalScrollBar()->isVisible())
-            s -= QSize(0, machineView()->horizontalScrollBar()->sizeHint().height());
+            sh -= QSize(0, machineView()->horizontalScrollBar()->sizeHint().height());
     }
 
     /* Resize the frame to fit the contents: */
-    s -= size();
-    frameGeo.setRight(frameGeo.right() + s.width());
-    frameGeo.setBottom(frameGeo.bottom() + s.height());
+    sh -= size();
+    frGeo.setRight(frGeo.right() + sh.width());
+    frGeo.setBottom(frGeo.bottom() + sh.height());
 
     /* Adjust position if necessary: */
     if (fAdjustPosition)
-        frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, vboxGlobal().availableGeometry(pos()));
+        frGeo = VBoxGlobal::normalizeGeometry(frGeo, vboxGlobal().availableGeometry(pos()));
 
     /* Finally, set the frame geometry: */
-    setGeometry(frameGeo.left() + dl, frameGeo.top() + dt,
-                frameGeo.width() - dl - dr, frameGeo.height() - dt - db);
+    setGeometry(frGeo.left() + dl, frGeo.top() + dt,
+                frGeo.width() - dl - dr, frGeo.height() - dt - db);
 #else /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
     /* Customer request: There should no be

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

@@ -113 +113 @@
     void showInNecessaryMode();
 
-    /** Normalizes geometry according to guest-size. */
+    /** Performs window geometry normalization according to guest-size and host's available geometry.
+      * @param  fAdjustPosition  Determines whether is it necessary to adjust position as well. */
     void normalizeGeometry(bool fAdjustPosition);