Merge lp:~cimi/overlay-scrollbar/remove-workaround-951121 into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 341
Proposed branch: lp:~cimi/overlay-scrollbar/remove-workaround-951121
Merge into: lp:overlay-scrollbar
Diff against target: 19 lines (+6/-3)
1 file modified
os/os-scrollbar.c (+6/-3)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/remove-workaround-951121
Reviewer Review Type Date Requested Status
Lars Karlitski Needs Fixing
Ayatana Scrollbar Team Pending
Review via email: mp+98618@code.launchpad.net

Description of the change

Remove workaround since should be fixed by gtk upstream

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

No dead code please. If it works now, remove it.

review: Needs Fixing
Revision history for this message
Andrea Cimitan (cimi) wrote :

I'd rather keep the code with a reference, then remove it in a future release. You never know how gtk+ will change event handling

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c 2012-03-13 14:23:10 +0000
+++ os/os-scrollbar.c 2012-03-21 12:18:17 +0000
@@ -2022,9 +2022,12 @@
2022#ifdef USE_GTK32022#ifdef USE_GTK3
2023 /* On touch devices with XI2 and Gtk+ >= 3.3.18,2023 /* On touch devices with XI2 and Gtk+ >= 3.3.18,
2024 * the event enter-notify is not emitted.2024 * the event enter-notify is not emitted.
2025 * Deal with it in motion-notify. */ 2025 * Deal with it in motion-notify. */
2026 if (!(priv->event & OS_EVENT_ENTER_NOTIFY))2026
2027 enter_event (scrollbar);2027 /* Should be fixed with:
2028 * https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/949414 */
2029 // if (!(priv->event & OS_EVENT_ENTER_NOTIFY))
2030 // enter_event (scrollbar);
2028#endif2031#endif
20292032
2030 if (priv->event & OS_EVENT_BUTTON_PRESS)2033 if (priv->event & OS_EVENT_BUTTON_PRESS)

Subscribers

People subscribed via source and target branches