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

Timestamp:

Aug 6, 2012 9:16:32 PM (13 years ago)

Author:

vboxsync

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

79835

Message:

FE/Qt: 6234: Support for VM groups: Details-view word-wrapping support bug-fix.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -242 +242 @@
             int iMargin = data(ElementData_Margin).toInt();
             int iSpacing = data(ElementData_Spacing).toInt();
-            int iMinimumTextColumnWidth = data(ElementData_MinimumTextColumnWidth).toInt();
             int iMaximumTextWidth = (int)geometry().width() - 3 * iMargin - iSpacing;
             QFont textFont = data(ElementData_TextFont).value<QFont>();
@@ -262 +261 @@
 
             /* Calculate column widths: */
-            int iFirstColumnWidth = iMaximumTextWidth / 2;
-            int iSecondColumnWidth = iMaximumTextWidth / 2;
-            if (iMaximumFirstLineWidth < iMinimumTextColumnWidth)
+            int iFirstColumnWidth = 0;
+            int iSecondColumnWidth = 0;
+            if (iMaximumFirstLineWidth + iMaximumSecondLineWidth <= iMaximumTextWidth)
             {
                 iFirstColumnWidth = iMaximumFirstLineWidth;
                 iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
             }
-            else if (iMaximumSecondLineWidth < iMinimumTextColumnWidth)
+            else
             {
-                iSecondColumnWidth = iMaximumSecondLineWidth;
-                iFirstColumnWidth = iMaximumTextWidth - iSecondColumnWidth;
+                qreal dFirstRatio = (qreal)iMaximumFirstLineWidth / (iMaximumFirstLineWidth + iMaximumSecondLineWidth);
+                iFirstColumnWidth = iMaximumTextWidth * dFirstRatio;
+                iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
             }
 
@@ -306 +306 @@
             return iSummaryTextHeight;
         }
-        case ElementData_MinimumTextColumnWidth: return 100;
+        case ElementData_MinimumTextColumnWidth: return 150;
         /* Default: */
         default: break;
@@ -553 +553 @@
     {
         /* Prepare variables: */
-        int iMinimumTextColumnWidth = data(ElementData_MinimumTextColumnWidth).toInt();
         int iMaximumTextWidth = geometry().width() - 3 * iMargin - iSpacing;
         QFont textFont = data(ElementData_TextFont).value<QFont>();
@@ -573 +572 @@
 
         /* Calculate column widths: */
-        int iFirstColumnWidth = iMaximumTextWidth / 2;
-        int iSecondColumnWidth = iMaximumTextWidth / 2;
-        if (iMaximumFirstLineWidth < iMinimumTextColumnWidth)
+        int iFirstColumnWidth = 0;
+        int iSecondColumnWidth = 0;
+        if (iMaximumFirstLineWidth + iMaximumSecondLineWidth <= iMaximumTextWidth)
         {
             iFirstColumnWidth = iMaximumFirstLineWidth;
             iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
         }
-        else if (iMaximumSecondLineWidth < iMinimumTextColumnWidth)
-        {
-            iSecondColumnWidth = iMaximumSecondLineWidth;
-            iFirstColumnWidth = iMaximumTextWidth - iSecondColumnWidth;
+        else
+        {
+            qreal dFirstRatio = (qreal)iMaximumFirstLineWidth / (iMaximumFirstLineWidth + iMaximumSecondLineWidth);
+            iFirstColumnWidth = iMaximumTextWidth * dFirstRatio;
+            iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
         }
 
@@ -611 +611 @@
                 QTextLayout *pTextLayout = prepareTextLayout(textFont, line.second,
                                                              iSecondColumnWidth, iSecondColumnHeight);
-                pTextLayout->draw(pPainter, QPointF(iMachineTextX + iMaximumFirstLineWidth + iSpacing, iMachineTextY));
+                pTextLayout->draw(pPainter, QPointF(iMachineTextX + iFirstColumnWidth + iSpacing, iMachineTextY));
                 delete pTextLayout;
             }