Changeset 42559 in vbox

Timestamp:

Aug 2, 2012 9:18:05 PM (13 years ago)

Author:

vboxsync

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

79736

Message:

FE/Qt: 6234: Support for VM groups: Update for r79735: Compress snapshot name before machine name.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -152 +152 @@
             /* Prepare variables: */
             int iMaximumWidth = data(MachineItemData_FirstRowMaximumWidth).toInt();
-            /* Calculate name width part: */
-            QFont nameFont = data(MachineItemData_NameFont).value<QFont>();
-            QFont snapshotNameFont = data(MachineItemData_SnapshotNameFont).value<QFont>();
-            QFontMetrics nameMetrics(nameFont);
-            QFontMetrics snapshotNameMetrics(snapshotNameFont);
-            qreal dNameWidth = nameMetrics.width(name());
-            qreal dSnapshotNameWidth = snapshotNameMetrics.width(snapshotName());
-            qreal dNameRatio = dNameWidth / (dNameWidth + dSnapshotNameWidth);
-            int iNamePart = iMaximumWidth * dNameRatio;
+            int iMinimumSnapshotNameWidth = data(MachineItemData_MinimumSnapshotNameSize).toSize().width();
             /* Compress name to part width: */
-            QString strCompressedName = compressText(nameFont, name(), iNamePart);
+            QString strCompressedName = compressText(data(MachineItemData_NameFont).value<QFont>(),
+                                                     name(), iMaximumWidth - iMinimumSnapshotNameWidth);
             return strCompressedName;
         }
@@ -169 +162 @@
             /* Prepare variables: */
             int iMaximumWidth = data(MachineItemData_FirstRowMaximumWidth).toInt();
-            /* Calculate name width part: */
-            QFont nameFont = data(MachineItemData_NameFont).value<QFont>();
-            QFont snapshotNameFont = data(MachineItemData_SnapshotNameFont).value<QFont>();
-            QFontMetrics nameMetrics(nameFont);
-            QFontMetrics snapshotNameMetrics(snapshotNameFont);
-            qreal dNameWidth = nameMetrics.width(name());
-            qreal dSnapshotNameWidth = snapshotNameMetrics.width(snapshotName());
-            qreal dSnapshotNameRatio = dSnapshotNameWidth / (dNameWidth + dSnapshotNameWidth);
-            int iSnapshotNamePart = iMaximumWidth * dSnapshotNameRatio;
+            int iNameWidth = data(MachineItemData_NameSize).toSize().width();
             /* Compress name to part width: */
-            QString strCompressedName = compressText(snapshotNameFont, snapshotName(), iSnapshotNamePart);
+            QString strCompressedName = compressText(data(MachineItemData_SnapshotNameFont).value<QFont>(),
+                                                     snapshotName(), iMaximumWidth - iNameWidth);
             return strCompressedName;
         }
@@ -203 +189 @@
             QFont font = data(MachineItemData_SnapshotNameFont).value<QFont>();
             QFontMetrics fm(font);
-            int iMaximumTextWidth = textWidth(font, 15);
+            int iMaximumTextWidth = textWidth(font, 10);
             QString strCompressedName = compressText(font, snapshotName(), iMaximumTextWidth);
             return QSize(fm.width(strCompressedName), fm.height());