callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name the arrow "gtk-toolbar-arrow" so themes can special-case it.

Browse Source 
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.
This commit is contained in:
Soeren Sandmann 2003-09-14 15:03:07 +00:00 committed by Søren Sandmann Pedersen
parent 51a67a92dd
commit 00029ae9ee
6 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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.
Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk> Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/Makefile.am (gtk_c_sources): sort the list of files. * gtk/Makefile.am (gtk_c_sources): sort the list of files.

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
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.
Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk> Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/Makefile.am (gtk_c_sources): sort the list of files. * gtk/Makefile.am (gtk_c_sources): sort the list of files.

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
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.
Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk> Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/Makefile.am (gtk_c_sources): sort the list of files. * gtk/Makefile.am (gtk_c_sources): sort the list of files.

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
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.
Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk> Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/Makefile.am (gtk_c_sources): sort the list of files. * gtk/Makefile.am (gtk_c_sources): sort the list of files.

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
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.
Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk> Sun Sep 14 16:07:49 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/Makefile.am (gtk_c_sources): sort the list of files. * gtk/Makefile.am (gtk_c_sources): sort the list of files.

39
gtk/gtktoolbar.c
View File

@ -557,6 +557,8 @@ gtk_toolbar_init (GtkToolbar *toolbar)
priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
gtk_widget_set_redraw_on_allocate (toolbar, FALSE);
toolbar->orientation = GTK_ORIENTATION_HORIZONTAL; toolbar->orientation = GTK_ORIENTATION_HORIZONTAL;
toolbar->style = DEFAULT_TOOLBAR_STYLE; toolbar->style = DEFAULT_TOOLBAR_STYLE;
toolbar->icon_size = DEFAULT_ICON_SIZE; toolbar->icon_size = DEFAULT_ICON_SIZE;
@ -577,6 +579,7 @@ gtk_toolbar_init (GtkToolbar *toolbar)
gtk_button_set_focus_on_click (GTK_BUTTON (priv->arrow_button), FALSE); gtk_button_set_focus_on_click (GTK_BUTTON (priv->arrow_button), FALSE);
priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); 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_widget_show (priv->arrow);
gtk_container_add (GTK_CONTAINER (priv->arrow_button), priv->arrow); gtk_container_add (GTK_CONTAINER (priv->arrow_button), priv->arrow);
@ -1025,6 +1028,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 static void
gtk_toolbar_size_allocate (GtkWidget *widget, gtk_toolbar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
@ -1046,8 +1079,14 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
GList *items; GList *items;
GtkRequisition arrow_requisition; GtkRequisition arrow_requisition;
if (GTK_WIDGET_REALIZED (toolbar))
invalidate_border (toolbar);
widget->allocation = *allocation; widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (toolbar))
invalidate_border (toolbar);
border_width = GTK_CONTAINER (toolbar)->border_width; border_width = GTK_CONTAINER (toolbar)->border_width;
if (GTK_WIDGET_REALIZED (widget)) if (GTK_WIDGET_REALIZED (widget))