From 66fe5e606f63fef64c531685d09530d6e9423fee Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 24 May 2008 20:42:09 +0000 Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20=20=20=20Bug=20387972=20?= =?UTF-8?q?=E2=80=93=20gtkassistant=20drawing=20problem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gtk/gtkassistant.c (gtk_assistant_size_allocate): Make GtkAssistant work better in glade. svn path=/trunk/; revision=20140 --- ChangeLog | 7 +++++++ gtk/gtkassistant.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e434dab7bf..9045f38530 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-05-24 Matthias Clasen + + Bug 387972 – gtkassistant drawing problem + + * gtk/gtkassistant.c (gtk_assistant_size_allocate): Make + GtkAssistant work better in glade. + 2008-05-24 Jan Arne Petersen * gtk/gtktoolbar.c: (gtk_toolbar_class_init): Change defaults of child diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index d9feba328a..365a457619 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -1113,16 +1113,16 @@ gtk_assistant_size_allocate (GtkWidget *widget, /* Header */ gtk_widget_get_child_requisition (priv->header_image, &header_requisition); - header_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width + header_padding; - header_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width + header_padding; + header_allocation.x = GTK_CONTAINER (widget)->border_width + header_padding; + header_allocation.y = GTK_CONTAINER (widget)->border_width + header_padding; header_allocation.width = allocation->width - 2 * GTK_CONTAINER (widget)->border_width - 2 * header_padding; header_allocation.height = header_requisition.height; gtk_widget_size_allocate (priv->header_image, &header_allocation); /* Action area */ - child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width; - child_allocation.y = allocation->y + allocation->height - + child_allocation.x = GTK_CONTAINER (widget)->border_width; + child_allocation.y = allocation->height - GTK_CONTAINER (widget)->border_width - priv->action_area->requisition.height; child_allocation.width = allocation->width - 2 * GTK_CONTAINER (widget)->border_width; child_allocation.height = priv->action_area->requisition.height; @@ -1131,12 +1131,12 @@ gtk_assistant_size_allocate (GtkWidget *widget, /* Sidebar */ if (rtl) - child_allocation.x = allocation->x + allocation->width - + child_allocation.x = allocation->width - GTK_CONTAINER (widget)->border_width - priv->sidebar_image->requisition.width; else - child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width; + child_allocation.x = GTK_CONTAINER (widget)->border_width; - child_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width + + child_allocation.y = GTK_CONTAINER (widget)->border_width + priv->header_image->allocation.height + 2 * header_padding; child_allocation.width = priv->sidebar_image->requisition.width; child_allocation.height = allocation->height - 2 * GTK_CONTAINER (widget)->border_width - @@ -1145,8 +1145,8 @@ gtk_assistant_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (priv->sidebar_image, &child_allocation); /* Pages */ - child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width + content_padding; - child_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width + + child_allocation.x = GTK_CONTAINER (widget)->border_width + content_padding; + child_allocation.y = GTK_CONTAINER (widget)->border_width + priv->header_image->allocation.height + 2 * header_padding + content_padding; child_allocation.width = allocation->width - 2 * GTK_CONTAINER (widget)->border_width - 2 * content_padding; child_allocation.height = allocation->height - 2 * GTK_CONTAINER (widget)->border_width -