[gtk+] progressbar: Enforce invariants



commit dfdc7c3e0dce66d19d9b0df6dfeeb7505a3356da
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Apr 26 20:44:07 2016 -0400

    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 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index a61fcb4..9ba2c86 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -808,7 +808,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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]