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

Timestamp:

Apr 20, 2016 5:57:15 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​bugref:6577: Runtime UI: Forgot something in r106749, since machine-window size-hint already includes scroll-bars hints we should take them into account during machine-window normalization.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

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

@@ -25 +25 @@
 # include <QContextMenuEvent>
 # include <QResizeEvent>
+# include <QScrollBar>
 
 /* GUI includes: */
@@ -520 +521 @@
     /* Get the best size w/o scroll-bars: */
     QSize s = sizeHint();
+    if (machineView()->verticalScrollBar()->isVisible())
+        s -= QSize(machineView()->verticalScrollBar()->sizeHint().width(), 0);
+    if (machineView()->horizontalScrollBar()->isVisible())
+        s -= QSize(0, machineView()->horizontalScrollBar()->sizeHint().height());
 
     /* Resize the frame to fit the contents: */