Merge lp:~cimi/overlay-scrollbar/fix-951121-with-scroll-wheel into lp:overlay-scrollbar

[Andrea Cimitan]

A couple of fixes for gtk 3.3.18, and comment the workaround for 951121

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-03-13 14:23:10 +0000
+++ os/os-scrollbar.c	2012-03-21 13:16:26 +0000
@@ -2022,9 +2022,12 @@
 #ifdef USE_GTK3
   /* On touch devices with XI2 and Gtk+ >= 3.3.18,
    * the event enter-notify is not emitted.
-   * Deal with it in motion-notify. */ 
-  if (!(priv->event & OS_EVENT_ENTER_NOTIFY))
-    enter_event (scrollbar);
+   * Deal with it in motion-notify. */
+  
+  /* Should be fixed with:
+   * https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/949414 */
+  // if (!(priv->event & OS_EVENT_ENTER_NOTIFY))
+  //   enter_event (scrollbar);
 #endif
 
   if (priv->event & OS_EVENT_BUTTON_PRESS)
@@ -2368,6 +2371,14 @@
   OsScrollbarPrivate *priv;
   gdouble delta;
 
+#ifdef USE_GTK3
+  /* Gtk+ 3.3.18 adds a smooth scroll support,
+   * but at the moment is not ready to be used without various issues.
+   * Don't use it for thumb scrolling in overlay scrollbar. */
+  if (event->direction == GDK_SCROLL_SMOOTH)
+    return FALSE;
+#endif
+
   scrollbar = OS_SCROLLBAR (user_data);
   priv = scrollbar->priv;
 
 
=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2012-03-12 18:45:21 +0000
+++ os/os-thumb.c	2012-03-21 13:16:26 +0000
@@ -209,7 +209,8 @@
   gtk_widget_add_events (GTK_WIDGET (thumb), GDK_BUTTON_PRESS_MASK |
                                              GDK_BUTTON_RELEASE_MASK |
                                              GDK_POINTER_MOTION_MASK |
-                                             GDK_POINTER_MOTION_HINT_MASK);
+                                             GDK_POINTER_MOTION_HINT_MASK |
+                                             GDK_SCROLL_MASK);
 
   os_thumb_screen_changed (GTK_WIDGET (thumb), NULL);
   os_thumb_composited_changed (GTK_WIDGET (thumb));