[gtk+] Better baseline adjustment

[Matthias Clasen <matthiasc src gnome org>]

commit 09b15710933d4727246079d2345b84c59e9defc3
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 25 16:36:13 2016 -0500

    Better baseline adjustment
    
    The way we were adjusting baselines if min-height forces
    a size increase was not quite working as intended. Redo
    it in a simpler way: just split up the excess and count
    half of it for above the baseline and half below.
    
    This fixes button labels in dialogs appearing too low.

 gtk/gtkcssgadget.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcssgadget.c b/gtk/gtkcssgadget.c
index b907839..f95db8a 100644
--- a/gtk/gtkcssgadget.c
+++ b/gtk/gtkcssgadget.c
@@ -577,14 +577,12 @@ gtk_css_gadget_get_preferred_size (GtkCssGadget   *gadget,
 
   if (minimum_baseline && *minimum_baseline > -1)
     {
-      if (*minimum > 0)
-        *minimum_baseline = *minimum_baseline * forced_minimum / *minimum;
+      *minimum_baseline += 0.5 * (forced_minimum - *minimum);
       *minimum_baseline = MAX (0, *minimum_baseline + extra_baseline);
     }
   if (natural_baseline && *natural_baseline > -1)
     {
-      if (*natural > 0)
-        *natural_baseline = *natural_baseline * forced_natural / *natural;
+      *natural_baseline += 0.5 * (forced_natural - *natural);
       *natural_baseline = MAX (0, *natural_baseline + extra_baseline);
     }