From 327a1647448201acbb3483062420aa0fdee84e7d Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 1 May 2013 23:26:27 +0200 Subject: [PATCH] paned: Fixup recent commit d90e3670cef44c688763f15d5695f84ebe985855 had a bunch of embarrassing bugs. Fixes paned-undersized reftest. --- gtk/gtkpaned.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index f18e2d84ec..7f976e64ce 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -911,17 +911,19 @@ gtk_paned_compute_position (GtkPaned *paned, pos = priv->child1_size + allocation - priv->last_allocation; else if (!(!priv->child1_resize && priv->child2_resize)) pos = allocation * ((gdouble) priv->child1_size / (priv->last_allocation)) + 0.5; + else + pos = priv->child1_size; } else - pos = min; + pos = priv->child1_size; } pos = CLAMP (pos, min, max); if (min_pos) - *min_pos = pos; + *min_pos = min; if (max_pos) - *max_pos = pos; + *max_pos = max; if (out_pos) *out_pos = pos; }