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

Fixing GtkScrolledWindow inconsistent scrollbar visibility.

Browse Source 
Also removing the hack to prevent hangs which is properly fixed by
the preceeding commit.
This commit is contained in:
Tristan Van Berkom 2010-11-19 00:53:19 +09:00
parent f20ac5792f
commit c03a3ca601
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkscrolledwindow.c
View File

@ -134,7 +134,6 @@ struct _GtkScrolledWindowPrivate
guint vscrollbar_visible : 1; guint vscrollbar_visible : 1;
guint window_placement : 2; guint window_placement : 2;
guint focus_out : 1; /* Flag used by ::move-focus-out implementation */ guint focus_out : 1; /* Flag used by ::move-focus-out implementation */
guint inside_allocate : 1;
gint min_content_width; gint min_content_width;
gint min_content_height; gint min_content_height;
@ -1449,10 +1448,9 @@ static void
gtk_scrolled_window_allocate_child (GtkScrolledWindow *swindow, gtk_scrolled_window_allocate_child (GtkScrolledWindow *swindow,
GtkAllocation *relative_allocation) GtkAllocation *relative_allocation)
{ {
GtkScrolledWindowPrivate *priv = swindow->priv; GtkWidget *widget = GTK_WIDGET (swindow), *child;
GtkWidget *widget = GTK_WIDGET (swindow), *child; GtkAllocation allocation;
GtkAllocation allocation; GtkAllocation child_allocation;
GtkAllocation child_allocation;
child = gtk_bin_get_child (GTK_BIN (widget)); child = gtk_bin_get_child (GTK_BIN (widget));
@ -1464,9 +1462,7 @@ gtk_scrolled_window_allocate_child (GtkScrolledWindow *swindow,
child_allocation.width = relative_allocation->width; child_allocation.width = relative_allocation->width;
child_allocation.height = relative_allocation->height; child_allocation.height = relative_allocation->height;
priv->inside_allocate = TRUE;
gtk_widget_size_allocate (child, &child_allocation); gtk_widget_size_allocate (child, &child_allocation);
priv->inside_allocate = FALSE;
} }
static void static void
@ -1654,12 +1650,27 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
previous_vvis = priv->vscrollbar_visible; previous_vvis = priv->vscrollbar_visible;
gtk_scrolled_window_allocate_child (scrolled_window, &relative_allocation); gtk_scrolled_window_allocate_child (scrolled_window, &relative_allocation);
/* If, after the first iteration, the hscrollbar and the /* Explicitly force scrollbar visibility checks.
* vscrollbar flip visiblity, then we need both. *
* Since we make a guess above, the child might not decide to update the adjustments
* if they logically did not change since the last configuration
*/ */
if (count && if (priv->hscrollbar)
previous_hvis != priv->hscrollbar_visible && gtk_scrolled_window_adjustment_changed
previous_vvis != priv->vscrollbar_visible) (gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar)), scrolled_window);
if (priv->vscrollbar)
gtk_scrolled_window_adjustment_changed
(gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)), scrolled_window);
/* If, after the first iteration, the hscrollbar and the
* vscrollbar flip visiblity... or if one of the scrollbars flip
* on each itteration indefinitly/infinitely, then we just need both
* at this size.
*/
if ((count &&
previous_hvis != priv->hscrollbar_visible &&
previous_vvis != priv->vscrollbar_visible) || count > 3)
{ {
priv->hscrollbar_visible = TRUE; priv->hscrollbar_visible = TRUE;
priv->vscrollbar_visible = TRUE; priv->vscrollbar_visible = TRUE;
@ -1870,7 +1881,8 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
visible = priv->hscrollbar_visible; visible = priv->hscrollbar_visible;
priv->hscrollbar_visible = (adjustment->upper - adjustment->lower > priv->hscrollbar_visible = (adjustment->upper - adjustment->lower >
adjustment->page_size); adjustment->page_size);
if (!priv->inside_allocate && priv->hscrollbar_visible != visible)
if (priv->hscrollbar_visible != visible)
gtk_widget_queue_resize (GTK_WIDGET (scrolled_window)); gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
} }
} }
@ -1884,7 +1896,8 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
visible = priv->vscrollbar_visible; visible = priv->vscrollbar_visible;
priv->vscrollbar_visible = (adjustment->upper - adjustment->lower > priv->vscrollbar_visible = (adjustment->upper - adjustment->lower >
adjustment->page_size); adjustment->page_size);
if (!priv->inside_allocate && priv->vscrollbar_visible != visible)
if (priv->vscrollbar_visible != visible)
gtk_widget_queue_resize (GTK_WIDGET (scrolled_window)); gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
} }
} }