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

Timestamp:

Apr 20, 2016 4:43:23 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​bugref:6577: Runtime UI: Make sure machine-view scroll-bars are shown independent of each other, i.e. if there is enough place in one of directions corresponding scroll-bar should not appear.

Location:

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

Files:

• UIMachineViewNormal.cpp (modified) (4 diffs)
• UIMachineViewNormal.h (modified) (1 diff)

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

@@ -81 +81 @@
     }
 
+    /* For scroll-bars of the machine-view: */
+    if (   pWatched == verticalScrollBar()
+        || pWatched == horizontalScrollBar())
+    {
+        switch (pEvent->type())
+        {
+            /* On show/hide event: */
+            case QEvent::Show:
+            case QEvent::Hide:
+            {
+                /* Set maximum-size to size-hint: */
+                setMaximumSize(sizeHint());
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
     return UIMachineView::eventFilter(pWatched, pEvent);
 }
@@ -91 +110 @@
     /* Setup size-policy: */
     setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
-    /* Maximum size to sizehint: */
+    /* Set maximum-size to size-hint: */
     setMaximumSize(sizeHint());
 }
@@ -99 +118 @@
     /* Base class filters: */
     UIMachineView::prepareFilters();
+
+    /* Install scroll-bars event-filters: */
+    verticalScrollBar()->installEventFilter(this);
+    horizontalScrollBar()->installEventFilter(this);
 
 #ifdef VBOX_WS_WIN
@@ -208 +231 @@
         sltPerformGuestResize(machineWindow()->centralWidget()->size());
     }
+}
+
+QSize UIMachineViewNormal::sizeHint() const
+{
+    /* Call to base-class: */
+    QSize size = UIMachineView::sizeHint();
+
+    /* If guest-screen auto-resize is not enabled
+     * or the guest-additions doesn't support graphics
+     * we should take scroll-bars size-hints into account: */
+    if (!m_bIsGuestAutoresizeEnabled || !uisession()->isGuestSupportsGraphics())
+    {
+        if (verticalScrollBar()->isVisible())
+            size += QSize(verticalScrollBar()->sizeHint().width(), 0);
+        if (horizontalScrollBar()->isVisible())
+            size += QSize(0, horizontalScrollBar()->sizeHint().height());
+    }
+
+    /* Return resulting size-hint finally: */
+    return size;
 }
 

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

@@ -68 +68 @@
 
     /* Private helpers: */
+    QSize sizeHint() const;
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;