AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-12 20:00:09 +00:00
Code Issues Projects Releases Wiki Activity

always update the bin_window position and size in size_allocate, even if

Browse Source 
Wed Sep 20 16:59:38 2006  Tim Janik  <timj@imendio.com>

        * gtk/gtkviewport.c: always update the bin_window position and size
        in size_allocate, even if we don't have a visible child. this fixes
        expose artefacts as described in #313508.

        * gtk/gtkscrolledwindow.c: make hiding of automatic scrollbars when we
        have no visible child explicit.
This commit is contained in:
Tim Janik 2006-09-20 15:02:01 +00:00 committed by Tim Janik
parent 6893f3ef08
commit 00bfb206ee
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Wed Sep 20 16:59:38 2006 Tim Janik <timj@imendio.com>
* gtk/gtkviewport.c: always update the bin_window position and size
in size_allocate, even if we don't have a visible child. this fixes
expose artefacts as described in #313508.
* gtk/gtkscrolledwindow.c: make hiding of automatic scrollbars when we
have no visible child explicit.
2006-09-19 Ryan Lortie <desrt@desrt.ca> 2006-09-19 Ryan Lortie <desrt@desrt.ca>
* docs/reference/gdk/gdk-sections.txt: * docs/reference/gdk/gdk-sections.txt:

4
gtk/gtkscrolledwindow.c
View File

@ -1348,7 +1348,11 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
previous_vvis != scrolled_window->vscrollbar_visible); previous_vvis != scrolled_window->vscrollbar_visible);
} }
else else
{
scrolled_window->hscrollbar_visible = scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS;
scrolled_window->vscrollbar_visible = scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS;
gtk_scrolled_window_relative_allocation (widget, &relative_allocation); gtk_scrolled_window_relative_allocation (widget, &relative_allocation);
}
if (scrolled_window->hscrollbar_visible) if (scrolled_window->hscrollbar_visible)
{ {

26
gtk/gtkviewport.c
View File

@ -734,9 +734,9 @@ gtk_viewport_size_allocate (GtkWidget *widget,
GtkBin *bin = GTK_BIN (widget); GtkBin *bin = GTK_BIN (widget);
gint border_width = GTK_CONTAINER (widget)->border_width; gint border_width = GTK_CONTAINER (widget)->border_width;
gboolean hadjustment_value_changed, vadjustment_value_changed; gboolean hadjustment_value_changed, vadjustment_value_changed;
GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport); GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport); GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
GtkAllocation child_allocation;
/* If our size changed, and we have a shadow, queue a redraw on widget->window to /* If our size changed, and we have a shadow, queue a redraw on widget->window to
* redraw the shadow correctly. * redraw the shadow correctly.
@ -752,43 +752,33 @@ gtk_viewport_size_allocate (GtkWidget *widget,
viewport_set_hadjustment_values (viewport, &hadjustment_value_changed); viewport_set_hadjustment_values (viewport, &hadjustment_value_changed);
viewport_set_vadjustment_values (viewport, &vadjustment_value_changed); viewport_set_vadjustment_values (viewport, &vadjustment_value_changed);
child_allocation.x = 0;
child_allocation.y = 0;
child_allocation.width = hadjustment->upper;
child_allocation.height = vadjustment->upper;
if (GTK_WIDGET_REALIZED (widget)) if (GTK_WIDGET_REALIZED (widget))
{ {
GtkAllocation view_allocation; GtkAllocation view_allocation;
viewport_get_view_allocation (viewport, &view_allocation);
gdk_window_move_resize (widget->window, gdk_window_move_resize (widget->window,
allocation->x + border_width, allocation->x + border_width,
allocation->y + border_width, allocation->y + border_width,
allocation->width - border_width * 2, allocation->width - border_width * 2,
allocation->height - border_width * 2); allocation->height - border_width * 2);
viewport_get_view_allocation (viewport, &view_allocation);
gdk_window_move_resize (viewport->view_window, gdk_window_move_resize (viewport->view_window,
view_allocation.x, view_allocation.x,
view_allocation.y, view_allocation.y,
view_allocation.width, view_allocation.width,
view_allocation.height); view_allocation.height);
}
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
GtkAllocation child_allocation;
child_allocation.x = 0;
child_allocation.y = 0;
child_allocation.width = hadjustment->upper;
child_allocation.height = vadjustment->upper;
if (GTK_WIDGET_REALIZED (widget))
gdk_window_move_resize (viewport->bin_window, gdk_window_move_resize (viewport->bin_window,
- hadjustment->value, - hadjustment->value,
- vadjustment->value, - vadjustment->value,
child_allocation.width, child_allocation.width,
child_allocation.height); child_allocation.height);
gtk_widget_size_allocate (bin->child, &child_allocation);
} }
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
gtk_widget_size_allocate (bin->child, &child_allocation);
gtk_adjustment_changed (hadjustment); gtk_adjustment_changed (hadjustment);
gtk_adjustment_changed (vadjustment); gtk_adjustment_changed (vadjustment);