label: Another tweak to wrapping handling

This fixes a few reftests that were failing after
the previous change because they ended up with x == -1.

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 9f1d993b0d1af2a98935ee87151042c10fedd868..8d59efe0c1abee5bd607d2625ebeda1d48e51e0e 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1333,10 +1333,9 @@ get_layout_location (GtkLabel  *self,
     xalign = 1.0 - xalign;
 
   pango_layout_get_pixel_extents (self->layout, NULL, &logical);
-  if (pango_layout_get_width (self->layout) > 0)
+  x = floor ((xalign * (widget_width - logical.width)) - logical.x);
+  if (x < 0)
     x = 0.f;
-  else
-    x = floor ((xalign * (widget_width - logical.width)) - logical.x);
 
   baseline = gtk_widget_get_baseline (widget);
   if (baseline != -1)