Changeset 76935 in vbox

Timestamp:

Jan 22, 2019 12:18:08 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Few layout fixes for Chooser pane: Take into account tool button width only when it's visible.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItemMachine.cpp (modified) (2 diffs)
• UIChooserItemMachine.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -620 +620 @@
     connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
             this, &UIChooserItemMachine::sltHandleWindowRemapped);
+    connect(model(), &UIChooserModel::sigSelectionChanged,
+            this, &UIChooserItemMachine::sltUpdateFirstRowMaximumWidth);
+    connect(this, &UIChooserItemMachine::sigHoverEnter,
+            this, &UIChooserItemMachine::sltUpdateFirstRowMaximumWidth);
+    connect(this, &UIChooserItemMachine::sigHoverLeave,
+            this, &UIChooserItemMachine::sltUpdateFirstRowMaximumWidth);
 
     /* Init: */
@@ -772 +778 @@
     iFirstRowMaximumWidth -= m_pixmapSize.width(); /* left pixmap width */
     iFirstRowMaximumWidth -= iMajorSpacing; /* spacing between left pixmap and name(s) */
-    iFirstRowMaximumWidth -= iMajorSpacing; /* spacing between name(s) and right pixmap */
-    iFirstRowMaximumWidth -= m_toolsPixmapSize.width() + 2 * iButtonMargin; /* right pixmap width */
+    if (   model()->currentItem() == this
+        || isHovered())
+    {
+        iFirstRowMaximumWidth -= iMajorSpacing; /* spacing between name(s) and right pixmap */
+        iFirstRowMaximumWidth -= m_toolsPixmapSize.width() + 2 * iButtonMargin; /* right pixmap width */
+    }
     iFirstRowMaximumWidth -= iMargin; /* right margin */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h

@@ -192 +192 @@
         /** Handles top-level window remaps. */
         void sltHandleWindowRemapped();
+
+        /** Updates first row maximum width. */
+        void sltUpdateFirstRowMaximumWidth() { updateFirstRowMaximumWidth(); }
     /** @} */