summaryrefslogtreecommitdiff
path: root/gtk/gtkpaned.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2013-05-01 23:26:27 +0200
committerBenjamin Otte <otte@redhat.com>2013-05-01 23:26:27 +0200
commit327a1647448201acbb3483062420aa0fdee84e7d (patch)
treef8327afbb3f164ba886c112dec8f96d9634cc049 /gtk/gtkpaned.c
parenta30b84f5223e1818411c489c46f71509a0391be8 (diff)
downloadgtk+-327a1647448201acbb3483062420aa0fdee84e7d.tar.gz
paned: Fixup recent commit
d90e3670cef44c688763f15d5695f84ebe985855 had a bunch of embarrassing bugs. Fixes paned-undersized reftest.
Diffstat (limited to 'gtk/gtkpaned.c')
-rw-r--r--gtk/gtkpaned.c8
1 files 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;
}