From 064204da9b4d17c66760c2b57fd20b4ca510d89d Mon Sep 17 00:00:00 2001 From: Claudio Saavedra Date: Tue, 13 Dec 2011 19:25:15 +0200 Subject: [PATCH] GtkFrame: Fix a casting in the compute_child_allocation() method The casting used to calculate the child allocation is confusing MAX(). As a result, width and height end up with negative values, which makes no sense. https://bugzilla.gnome.org/show_bug.cgi?id=666109 --- gtk/gtkframe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index c2e1ad2f17..d4852fd063 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -835,10 +835,10 @@ gtk_frame_real_compute_child_allocation (GtkFrame *frame, child_allocation->x = border_width + padding.left; child_allocation->y = border_width + top_margin; - child_allocation->width = MAX (1, (gint) allocation.width - (border_width * 2) - - padding.left - padding.right); - child_allocation->height = MAX (1, ((gint) allocation.height - child_allocation->y - - border_width - padding.bottom)); + child_allocation->width = MAX (1, (gint) (allocation.width - (border_width * 2) - + padding.left - padding.right)); + child_allocation->height = MAX (1, (gint) (allocation.height - child_allocation->y - + border_width - padding.bottom)); child_allocation->x += allocation.x; child_allocation->y += allocation.y;