mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 10:50:10 +00:00
revert accidentally committed !redraw_on_allocate change.
Wed Sep 17 02:38:53 2003 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally committed !redraw_on_allocate change.
This commit is contained in:
parent
79439c9c7b
commit
77d23072c2
@ -1,3 +1,8 @@
|
||||
Wed Sep 17 02:38:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
|
||||
committed redraw_on_allocate change.
|
||||
|
||||
Tue Sep 16 10:42:00 2003 Eric Warmenhoven <eric@warmenhoven.org>
|
||||
|
||||
* gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}
|
||||
|
@ -1,3 +1,8 @@
|
||||
Wed Sep 17 02:38:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
|
||||
committed redraw_on_allocate change.
|
||||
|
||||
Tue Sep 16 10:42:00 2003 Eric Warmenhoven <eric@warmenhoven.org>
|
||||
|
||||
* gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}
|
||||
|
@ -1,3 +1,8 @@
|
||||
Wed Sep 17 02:38:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
|
||||
committed redraw_on_allocate change.
|
||||
|
||||
Tue Sep 16 10:42:00 2003 Eric Warmenhoven <eric@warmenhoven.org>
|
||||
|
||||
* gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}
|
||||
|
@ -1,3 +1,8 @@
|
||||
Wed Sep 17 02:38:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
|
||||
committed redraw_on_allocate change.
|
||||
|
||||
Tue Sep 16 10:42:00 2003 Eric Warmenhoven <eric@warmenhoven.org>
|
||||
|
||||
* gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}
|
||||
|
@ -1,3 +1,8 @@
|
||||
Wed Sep 17 02:38:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
|
||||
committed redraw_on_allocate change.
|
||||
|
||||
Tue Sep 16 10:42:00 2003 Eric Warmenhoven <eric@warmenhoven.org>
|
||||
|
||||
* gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}
|
||||
|
@ -556,8 +556,6 @@ 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;
|
||||
@ -1028,36 +1026,6 @@ 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)
|
||||
@ -1079,14 +1047,8 @@ 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))
|
||||
|
Loading…
Reference in New Issue
Block a user