diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-02 20:44:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-02 20:44:40 +0000 |
| commit | f2288088c5da072a03648db8ed8fd3a358b4e94e (patch) | |
| tree | 95e9f063700b9566c02e397bb51f64df22e188ec | |
| parent | 441c4ad48075d49451ef8340af76a68d730e7bcc (diff) | |
| download | gdk-pixbuf-f2288088c5da072a03648db8ed8fd3a358b4e94e.tar.gz | |
Bug 387972 – gtkassistant drawing problem
* gtk/gtkassistant.c (gtk_assistant_size_allocate): Make
GtkAssistant work better in glade.
svn path=/branches/gtk-2-12/; revision=20273
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkassistant.c | 18 |
2 files changed, 18 insertions, 9 deletions
@@ -2,6 +2,15 @@ Merge from trunk: + Bug 387972 – gtkassistant drawing problem + + * gtk/gtkassistant.c (gtk_assistant_size_allocate): Make + GtkAssistant work better in glade. + +2008-06-02 Matthias Clasen <mclasen@redhat.com> + + Merge from trunk: + Bug 529841 – incorrect position in directfb * gdk/directfb/gdkwindow-directfb.c: fix y = abs_x diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index ebf5970e9..e3d6af62b 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 - |