Changeset 75154 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 29, 2018 2:51:56 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Don't forget to take into account tool button margins (while performing size hint calculations); Fix drag object size (it can't be of minimum size, only of current one).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp (modified) (6 diffs)

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

@@ -430 +430 @@
     const int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt();
     const int iParentIndent = data(MachineItemData_ParentIndent).toInt();
+    const int iButtonMargin = data(MachineItemData_ButtonMargin).toInt();
 
     /* Calculating proposed width: */
@@ -449 +450 @@
                             iMiddleColumnWidth +
                             iMajorSpacing +
-                            m_toolsPixmapSize.width();
+                            m_toolsPixmapSize.width() + 2 * iButtonMargin;
     iProposedWidth += iMachineItemWidth;
 
@@ -459 +460 @@
 {
     /* Prepare variables: */
-    int iMargin = data(MachineItemData_Margin).toInt();
-    int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt();
+    const int iMargin = data(MachineItemData_Margin).toInt();
+    const int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt();
+    const int iButtonMargin = data(MachineItemData_ButtonMargin).toInt();
 
     /* Calculating proposed height: */
@@ -474 +476 @@
                               iBottomLineHeight;
     QList<int> heights;
-    heights << m_pixmapSize.height() << iMiddleColumnHeight << m_toolsPixmapSize.height();
+    heights << m_pixmapSize.height() << iMiddleColumnHeight << m_toolsPixmapSize.height() + 2 * iButtonMargin;
     int iMaxHeight = 0;
     foreach (int iHeight, heights)
@@ -496 +498 @@
 {
     /* Ask item to paint itself into pixmap: */
-    QSize minimumSize = minimumSizeHint().toSize();
-    QPixmap pixmap(minimumSize);
+    const QSize actualSize = size().toSize();
+    QPixmap pixmap(actualSize);
     QPainter painter(&pixmap);
     QStyleOptionGraphicsItem options;
-    options.rect = QRect(QPoint(0, 0), minimumSize);
+    options.rect = QRect(QPoint(0, 0), actualSize);
     paint(&painter, &options);
     return pixmap;
@@ -777 +779 @@
 {
     /* Prepare variables: */
-    int iMargin = data(MachineItemData_Margin).toInt();
-    int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
+    const int iMargin = data(MachineItemData_Margin).toInt();
+    const int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
+    const int iParentIndent = data(MachineItemData_ParentIndent).toInt();
+    const int iButtonMargin = data(MachineItemData_ButtonMargin).toInt();
 
     /* Calculate new maximum width for the first row: */
     int iFirstRowMaximumWidth = (int)geometry().width();
+    iFirstRowMaximumWidth -= iParentIndent * level();
     iFirstRowMaximumWidth -= iMargin; /* left margin */
-    iFirstRowMaximumWidth -= m_pixmapSize.width(); /* pixmap width */
-    iFirstRowMaximumWidth -= iMajorSpacing; /* spacing between pixmap and name(s) */
+    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 */
     iFirstRowMaximumWidth -= iMargin; /* right margin */