label: Redo measure() code

The old code couldn't properly do height-for-width because it only
computed the widest and smallest layout instead of looking at the actual
passed in for-size.

The label-sizing reftest has been adapted as the label code is now smart
enough to always display the whole text and no longer requests a too
small width-for-single-row when wrapping.

1 files changed, 36 insertions, 72 deletions

diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui
index 1616ef4f2f..4235424e80 100644
--- a/testsuite/reftests/label-sizing.ref.ui
+++ b/testsuite/reftests/label-sizing.ref.ui
@@ -212,8 +212,7 @@
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
                     </attributes>
@@ -224,8 +223,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
                     </attributes>
@@ -646,8 +644,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -659,8 +656,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -1092,8 +1088,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -1105,8 +1100,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -1982,8 +1976,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -1995,8 +1988,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -2016,8 +2008,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -2029,8 +2020,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -2434,8 +2424,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -2448,8 +2437,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -2470,8 +2458,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -2484,8 +2471,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -2898,8 +2884,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -2912,8 +2897,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -2934,8 +2918,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -2948,8 +2931,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">4</property>
                     <attributes>
@@ -3818,8 +3800,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -3831,8 +3812,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -3852,8 +3832,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -3865,8 +3844,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -4270,8 +4248,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -4284,8 +4261,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -4306,8 +4282,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -4320,8 +4295,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -4734,8 +4708,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -4748,8 +4721,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -4770,8 +4742,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -4784,8 +4755,7 @@ ABCD</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">8</property>
                     <attributes>
@@ -5654,8 +5624,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">12</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -5667,8 +5636,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="max_width_chars">12</property>
                     <attributes>
                       <attribute name="font-desc" value="Monospace"></attribute>
@@ -6104,8 +6072,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">12</property>
                     <attributes>
@@ -6118,8 +6085,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">4</property>
                     <property name="max_width_chars">12</property>
                     <attributes>
@@ -6566,8 +6532,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">12</property>
                     <attributes>
@@ -6580,8 +6545,7 @@ ABCD</property>
                     <property name="halign">end</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ABCDE   
-ABCD</property>
+                    <property name="label" translatable="yes">ABCDE ABCD</property>
                     <property name="width_chars">8</property>
                     <property name="max_width_chars">12</property>
                     <attributes>