callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GTK_OVERLAY_SCROLLING=0

Browse Source 
This was broken by the recent more dynamic approach.
This commit is contained in:
Matthias Clasen
2015-01-09 06:45:51 -05:00
parent d5afaa07d3
commit 885b3c704f
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkscrolledwindow.c
View File

@ -391,10 +391,16 @@ gtk_scrolled_window_leave_notify (GtkWidget *widget,
{ {
GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW (widget)->priv; GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW (widget)->priv;
indicator_set_over (&priv->hindicator, FALSE); if (priv->hindicator.enabled)
indicator_start_fade (&priv->hindicator, 0.0); {
indicator_set_over (&priv->vindicator, FALSE); indicator_set_over (&priv->hindicator, FALSE);
indicator_start_fade (&priv->vindicator, 0.0); indicator_start_fade (&priv->hindicator, 0.0);
}
if (priv->vindicator.enabled)
{
indicator_set_over (&priv->vindicator, FALSE);
indicator_start_fade (&priv->vindicator, 0.0);
}
return GDK_EVENT_PROPAGATE; return GDK_EVENT_PROPAGATE;
} }
@ -1040,12 +1046,17 @@ captured_event_cb (GtkWidget *widget,
GdkDevice *source_device; GdkDevice *source_device;
gboolean indicator_close; gboolean indicator_close;
sw = GTK_SCROLLED_WINDOW (widget);
priv = sw->priv;
if (!priv->hindicator.enabled &&
!priv->vindicator.enabled)
return GDK_EVENT_PROPAGATE;
if (event->type != GDK_MOTION_NOTIFY && if (event->type != GDK_MOTION_NOTIFY &&
event->type != GDK_LEAVE_NOTIFY) event->type != GDK_LEAVE_NOTIFY)
return GDK_EVENT_PROPAGATE; return GDK_EVENT_PROPAGATE;
sw = GTK_SCROLLED_WINDOW (widget);
priv = sw->priv;
source_device = gdk_event_get_source_device (event); source_device = gdk_event_get_source_device (event);
input_source = gdk_device_get_source (source_device); input_source = gdk_device_get_source (source_device);