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

scrolled window: Use GdkEvent API

Browse Source
This commit is contained in:
Matthias Clasen 2017-08-26 10:58:08 -04:00 committed by Carlos Garnacho
parent 7793e8f071
commit c7225bc8c1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkscrolledwindow.c
View File

@ -1291,6 +1291,7 @@ captured_event_cb (GtkWidget *widget,
gboolean on_scrollbar; gboolean on_scrollbar;
GdkEventType event_type; GdkEventType event_type;
guint state; guint state;
GdkCrossingMode mode;
sw = GTK_SCROLLED_WINDOW (widget); sw = GTK_SCROLLED_WINDOW (widget);
priv = sw->priv; priv = sw->priv;
@ -1320,6 +1321,7 @@ captured_event_cb (GtkWidget *widget,
event_target_ancestor = gtk_widget_get_ancestor (event_target, GTK_TYPE_SCROLLBAR); event_target_ancestor = gtk_widget_get_ancestor (event_target, GTK_TYPE_SCROLLBAR);
on_scrollbar = (event_target_ancestor == priv->hindicator.scrollbar || on_scrollbar = (event_target_ancestor == priv->hindicator.scrollbar ||
event_target_ancestor == priv->vindicator.scrollbar); event_target_ancestor == priv->vindicator.scrollbar);
gdk_event_get_crossing_mode (event, &mode);
if (event_type == GDK_MOTION_NOTIFY) if (event_type == GDK_MOTION_NOTIFY)
{ {
@ -1353,7 +1355,7 @@ captured_event_cb (GtkWidget *widget,
} }
} }
else if (event_type == GDK_LEAVE_NOTIFY && on_scrollbar && else if (event_type == GDK_LEAVE_NOTIFY && on_scrollbar &&
event->crossing.mode == GDK_CROSSING_UNGRAB) mode == GDK_CROSSING_UNGRAB)
{ {
check_update_scrollbar_proximity (sw, &priv->vindicator, event); check_update_scrollbar_proximity (sw, &priv->vindicator, event);
check_update_scrollbar_proximity (sw, &priv->hindicator, event); check_update_scrollbar_proximity (sw, &priv->hindicator, event);