Changeset 42639 in vbox for trunk

Timestamp:

Aug 6, 2012 9:28:33 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Addition to r79835: Do not wrap text in 1st column.

File:

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

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

@@ -230 +230 @@
 
             /* Calculate minimum text width: */
-            int iMinimumFirstLineWidth = qMin(iMaximumFirstLineWidth, iMinimumTextColumnWidth);
             int iMinimumSecondLineWidth = qMin(iMaximumSecondLineWidth, iMinimumTextColumnWidth);
-            int iMinimumTextWidth = iMinimumFirstLineWidth + iSpacing + iMinimumSecondLineWidth;
+            int iMinimumTextWidth = iMaximumFirstLineWidth + iSpacing + iMinimumSecondLineWidth;
 
             /* Return result: */
@@ -261 +260 @@
 
             /* Calculate column widths: */
-            int iFirstColumnWidth = 0;
-            int iSecondColumnWidth = 0;
-            if (iMaximumFirstLineWidth + iMaximumSecondLineWidth <= iMaximumTextWidth)
-            {
-                iFirstColumnWidth = iMaximumFirstLineWidth;
-                iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
-            }
-            else
-            {
-                qreal dFirstRatio = (qreal)iMaximumFirstLineWidth / (iMaximumFirstLineWidth + iMaximumSecondLineWidth);
-                iFirstColumnWidth = iMaximumTextWidth * dFirstRatio;
-                iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
-            }
+            int iFirstColumnWidth = iMaximumFirstLineWidth;
+            int iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
 
             /* For each the line: */
@@ -306 +294 @@
             return iSummaryTextHeight;
         }
-        case ElementData_MinimumTextColumnWidth: return 150;
+        case ElementData_MinimumTextColumnWidth: return 100;
         /* Default: */
         default: break;
@@ -572 +560 @@
 
         /* Calculate column widths: */
-        int iFirstColumnWidth = 0;
-        int iSecondColumnWidth = 0;
-        if (iMaximumFirstLineWidth + iMaximumSecondLineWidth <= iMaximumTextWidth)
-        {
-            iFirstColumnWidth = iMaximumFirstLineWidth;
-            iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
-        }
-        else
-        {
-            qreal dFirstRatio = (qreal)iMaximumFirstLineWidth / (iMaximumFirstLineWidth + iMaximumSecondLineWidth);
-            iFirstColumnWidth = iMaximumTextWidth * dFirstRatio;
-            iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
-        }
+        int iFirstColumnWidth = iMaximumFirstLineWidth;
+        int iSecondColumnWidth = iMaximumTextWidth - iFirstColumnWidth;
 
         /* Where to paint? */