From 92166f1f694a0af3c8474344f47f318c7c5153aa Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 26 Apr 2016 20:44:07 -0400
Subject: progressbar: Enforce invariants

When measuring gadgets, minimum must come out <= natural.
Make sure we don't fail this when measuring progressbar text.

https://bugzilla.gnome.org/show_bug.cgi?id=765644
---
 gtk/gtkprogressbar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 352d445084..74fc9b422b 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -805,7 +805,7 @@ gtk_progress_bar_measure_text (GtkCssGadget   *gadget,
       else
         *minimum = logical_rect.width;
 
-      *natural = logical_rect.width;
+      *natural = MAX (*minimum, logical_rect.width);
     }
   else
     *minimum = *natural = logical_rect.height;
-- 
cgit v1.2.1