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

GtkScrolledWindow: Do not hover one scrollbar if grabbing on the other

Browse Source 
Makes no sense since we're not going to interact with it. It'll be
hovered eventually if the button is released.
This commit is contained in:
Carlos Garnacho
2016-03-14 18:47:37 +01:00
parent 2173b6d483
commit 0b840a04a2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkscrolledwindow.c
View File

@ -1167,7 +1167,8 @@ check_update_scrollbar_proximity (GtkScrolledWindow *sw,
Indicator *indicator,
GdkEvent *event)
{
gboolean indicator_close, on_scrollbar;
GtkScrolledWindowPrivate *priv = sw->priv;
gboolean indicator_close, on_scrollbar, on_other_scrollbar;
GtkWidget *event_widget;
event_widget = gtk_get_event_widget (event);
@ -1175,6 +1176,10 @@ check_update_scrollbar_proximity (GtkScrolledWindow *sw,
indicator_close = event_close_to_indicator (sw, indicator, event);
on_scrollbar = (event_widget == indicator->scrollbar &&
event->type != GDK_LEAVE_NOTIFY);
on_other_scrollbar = (!on_scrollbar &&
event->type != GDK_LEAVE_NOTIFY &&
(event_widget == priv->hindicator.scrollbar ||
event_widget == priv->vindicator.scrollbar));
if (indicator->over_timeout_id)
{
@ -1184,7 +1189,7 @@ check_update_scrollbar_proximity (GtkScrolledWindow *sw,
if (on_scrollbar)
indicator_set_over (indicator, TRUE);
else if (indicator_close)
else if (indicator_close && !on_other_scrollbar)
indicator->over_timeout_id = gdk_threads_add_timeout (30, enable_over_timeout_cb, indicator);
else
indicator_set_over (indicator, FALSE);