diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2003-09-14 15:03:07 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2003-09-14 15:03:07 +0000 |
| commit | 00029ae9ee13e6a96b68657f360caec899f0154d (patch) | |
| tree | 6b9e8206a4d872185399dc7a245f2c38cda93fed /gtk/gtktoolbar.c | |
| parent | 51a67a92dd8cabeefa853d0c5736dd7db3edc3eb (diff) | |
| download | gdk-pixbuf-00029ae9ee13e6a96b68657f360caec899f0154d.tar.gz | |
Name the arrow "gtk-toolbar-arrow" so themes can special-case it.
Sun Sep 14 16:59:52 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_init): Name the arrow
"gtk-toolbar-arrow" so themes can special-case it.
Diffstat (limited to 'gtk/gtktoolbar.c')
| -rw-r--r-- | gtk/gtktoolbar.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index c2ce588c0..bfa022c8f 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -556,6 +556,8 @@ gtk_toolbar_init (GtkToolbar *toolbar) GTK_WIDGET_SET_FLAGS (toolbar, GTK_NO_WINDOW); priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); + + gtk_widget_set_redraw_on_allocate (toolbar, FALSE); toolbar->orientation = GTK_ORIENTATION_HORIZONTAL; toolbar->style = DEFAULT_TOOLBAR_STYLE; @@ -577,6 +579,7 @@ gtk_toolbar_init (GtkToolbar *toolbar) gtk_button_set_focus_on_click (GTK_BUTTON (priv->arrow_button), FALSE); priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); + gtk_widget_set_name (priv->arrow, "gtk-toolbar-arrow"); gtk_widget_show (priv->arrow); gtk_container_add (GTK_CONTAINER (priv->arrow_button), priv->arrow); @@ -1026,6 +1029,36 @@ get_item_size (GtkToolbar *toolbar, } static void +invalidate_border (GtkToolbar *toolbar) +{ + GtkWidget *widget = GTK_WIDGET (toolbar); + + if (get_shadow_type (toolbar) != GTK_SHADOW_NONE) + { + GdkRegion *invalid; + GdkRectangle inner_rect; + GdkRegion *inner_region; + gint xborder = widget->style->xthickness + GTK_CONTAINER (widget)->border_width; + gint yborder = widget->style->ythickness + GTK_CONTAINER (widget)->border_width; + + inner_rect.x = widget->allocation.x + xborder; + inner_rect.y = widget->allocation.y + yborder; + inner_rect.width = widget->allocation.width - 2 * xborder; + inner_rect.height = widget->allocation.height - 2 * yborder; + + inner_region = gdk_region_rectangle (&inner_rect); + + invalid = gdk_region_rectangle (&(widget->allocation)); + gdk_region_subtract (invalid, inner_region); + + gdk_window_invalidate_region (widget->window, invalid, FALSE); + + gdk_region_destroy (invalid); + gdk_region_destroy (inner_region); + } +} + +static void gtk_toolbar_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { @@ -1046,8 +1079,14 @@ gtk_toolbar_size_allocate (GtkWidget *widget, GList *items; GtkRequisition arrow_requisition; + if (GTK_WIDGET_REALIZED (toolbar)) + invalidate_border (toolbar); + widget->allocation = *allocation; + if (GTK_WIDGET_REALIZED (toolbar)) + invalidate_border (toolbar); + border_width = GTK_CONTAINER (toolbar)->border_width; if (GTK_WIDGET_REALIZED (widget)) |