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

scrolledwindow: fix scrollbar allocation

Browse Source
This commit is contained in:
Timm Bäder 2017-05-30 13:32:37 +02:00 committed by Matthias Clasen
parent fa97b270f1
commit e3bd1e10e8
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkscrolledwindow.c
View File

@ -1079,21 +1079,14 @@ event_close_to_indicator (GtkScrolledWindow *sw,
{
GtkScrolledWindowPrivate *priv;
GtkAllocation indicator_alloc;
GtkAllocation sw_alloc;
gdouble x, y;
gint distance;
priv = sw->priv;
gtk_widget_get_allocation (GTK_WIDGET (sw), &sw_alloc);
gtk_widget_get_allocation (indicator->scrollbar, &indicator_alloc);
gdk_event_get_coords (event, &x, &y);
/* Make indicator alloc relative to scrolledwindow alloc, which is also
* what the event coords are relative to */
indicator_alloc.x -= sw_alloc.x;
indicator_alloc.y -= sw_alloc.y;
if (indicator->over)
distance = INDICATOR_FAR_DISTANCE;
else
@ -3047,7 +3040,7 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window,
priv = scrolled_window->priv;
gtk_scrolled_window_inner_allocation (widget, &content_allocation, FALSE);
gtk_scrolled_window_inner_allocation (widget, &content_allocation, TRUE);
gtk_widget_measure (priv->vscrollbar, GTK_ORIENTATION_HORIZONTAL, -1,
&sb_width, NULL, NULL, NULL);
gtk_widget_measure (priv->hscrollbar, GTK_ORIENTATION_VERTICAL, -1,