AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't assume any more that the gtkwidget.c code will queue a redraw on us

Browse Source 
1999-02-05  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
	Don't assume any more that the gtkwidget.c code
	will queue a redraw on us during a size_allocate -
	queue clear/draws as appropriate for our groove.
This commit is contained in:
Owen Taylor 1999-02-05 15:48:25 +00:00 committed by Owen Taylor
parent 674b23e434
commit 915f2c5e59
9 changed files with 91 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
1999-02-05 Owen Taylor <otaylor@gtk.org>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
Don't assume any more that the gtkwidget.c code
will queue a redraw on us during a size_allocate -
queue clear/draws as appropriate for our groove.
1999-02-04 Christopher Blizzard <blizzard@redhat.com>
* gtk+.spec (Packager): Change my email address.

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
1999-02-05 Owen Taylor <otaylor@gtk.org>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
Don't assume any more that the gtkwidget.c code
will queue a redraw on us during a size_allocate -
queue clear/draws as appropriate for our groove.
1999-02-04 Christopher Blizzard <blizzard@redhat.com>
* gtk+.spec (Packager): Change my email address.

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
1999-02-05 Owen Taylor <otaylor@gtk.org>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
Don't assume any more that the gtkwidget.c code
will queue a redraw on us during a size_allocate -
queue clear/draws as appropriate for our groove.
1999-02-04 Christopher Blizzard <blizzard@redhat.com>
* gtk+.spec (Packager): Change my email address.

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
1999-02-05 Owen Taylor <otaylor@gtk.org>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
Don't assume any more that the gtkwidget.c code
will queue a redraw on us during a size_allocate -
queue clear/draws as appropriate for our groove.
1999-02-04 Christopher Blizzard <blizzard@redhat.com>
* gtk+.spec (Packager): Change my email address.

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
1999-02-05 Owen Taylor <otaylor@gtk.org>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
Don't assume any more that the gtkwidget.c code
will queue a redraw on us during a size_allocate -
queue clear/draws as appropriate for our groove.
1999-02-04 Christopher Blizzard <blizzard@redhat.com>
* gtk+.spec (Packager): Change my email address.

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
1999-02-05 Owen Taylor <otaylor@gtk.org>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
Don't assume any more that the gtkwidget.c code
will queue a redraw on us during a size_allocate -
queue clear/draws as appropriate for our groove.
1999-02-04 Christopher Blizzard <blizzard@redhat.com>
* gtk+.spec (Packager): Change my email address.

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
1999-02-05 Owen Taylor <otaylor@gtk.org>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate):
Don't assume any more that the gtkwidget.c code
will queue a redraw on us during a size_allocate -
queue clear/draws as appropriate for our groove.
1999-02-04 Christopher Blizzard <blizzard@redhat.com>
* gtk+.spec (Packager): Change my email address.

30
gtk/gtkhpaned.c
View File

@ -133,6 +133,7 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
GtkPaned *paned;
GtkAllocation child1_allocation;
GtkAllocation child2_allocation;
GdkRectangle old_groove_rectangle;
guint16 border_width;
g_return_if_fail (widget != NULL);
@ -165,26 +166,37 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
gdk_window_move (paned->handle, paned->handle_xpos, paned->handle_ypos);
}
if (GTK_WIDGET_MAPPED (widget))
{
gdk_window_clear_area (widget->window,
paned->groove_rectangle.x,
paned->groove_rectangle.y,
paned->groove_rectangle.width,
paned->groove_rectangle.height);
}
child1_allocation.height = child2_allocation.height = MAX (1, (gint)allocation->height - border_width * 2);
child1_allocation.width = paned->child1_size;
child1_allocation.x = border_width;
child1_allocation.y = child2_allocation.y = border_width;
old_groove_rectangle = paned->groove_rectangle;
paned->groove_rectangle.x = child1_allocation.x
+ child1_allocation.width + paned->gutter_size / 2 - 1;
paned->groove_rectangle.y = 0;
paned->groove_rectangle.width = 2;
paned->groove_rectangle.height = allocation->height;
if (GTK_WIDGET_DRAWABLE (widget) &&
((paned->groove_rectangle.x != old_groove_rectangle.x) ||
(paned->groove_rectangle.y != old_groove_rectangle.y) ||
(paned->groove_rectangle.width != old_groove_rectangle.width) ||
(paned->groove_rectangle.height != old_groove_rectangle.height)))
{
gtk_widget_queue_clear_area (widget,
old_groove_rectangle.x,
old_groove_rectangle.y,
old_groove_rectangle.width,
old_groove_rectangle.height);
gtk_widget_queue_draw_area (widget,
paned->groove_rectangle.x,
paned->groove_rectangle.y,
paned->groove_rectangle.width,
paned->groove_rectangle.height);
}
child2_allocation.x = paned->groove_rectangle.x + paned->gutter_size / 2 + 1;
child2_allocation.width = MAX (1, (gint)allocation->width
- child2_allocation.x - border_width);

30
gtk/gtkvpaned.c
View File

@ -133,6 +133,7 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
GtkPaned *paned;
GtkAllocation child1_allocation;
GtkAllocation child2_allocation;
GdkRectangle old_groove_rectangle;
guint16 border_width;
g_return_if_fail (widget != NULL);
@ -165,26 +166,37 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
gdk_window_move (paned->handle, paned->handle_xpos, paned->handle_ypos);
}
if (GTK_WIDGET_MAPPED (widget))
{
gdk_window_clear_area (widget->window,
paned->groove_rectangle.x,
paned->groove_rectangle.y,
paned->groove_rectangle.width,
paned->groove_rectangle.height);
}
child1_allocation.width = child2_allocation.width = MAX (1, (gint)allocation->width - border_width * 2);
child1_allocation.height = paned->child1_size;
child1_allocation.x = child2_allocation.x = border_width;
child1_allocation.y = border_width;
old_groove_rectangle = paned->groove_rectangle;
paned->groove_rectangle.y = child1_allocation.y
+ child1_allocation.height + paned->gutter_size / 2 - 1;
paned->groove_rectangle.x = 0;
paned->groove_rectangle.height = 2;
paned->groove_rectangle.width = allocation->width;
if (GTK_WIDGET_DRAWABLE (widget) &&
((paned->groove_rectangle.x != old_groove_rectangle.x) ||
(paned->groove_rectangle.y != old_groove_rectangle.y) ||
(paned->groove_rectangle.width != old_groove_rectangle.width) ||
(paned->groove_rectangle.height != old_groove_rectangle.height)))
{
gtk_widget_queue_clear_area (widget,
old_groove_rectangle.x,
old_groove_rectangle.y,
old_groove_rectangle.width,
old_groove_rectangle.height);
gtk_widget_queue_draw_area (widget,
paned->groove_rectangle.x,
paned->groove_rectangle.y,
paned->groove_rectangle.width,
paned->groove_rectangle.height);
}
child2_allocation.y = paned->groove_rectangle.y + paned->gutter_size / 2 + 1;
child2_allocation.height = MAX (1, (gint)allocation->height
- child2_allocation.y - border_width);