Merge lp:~victored/noise/lp-1180093 into lp:~elementary-apps/noise/trunk

Proposed by Victor Martinez
Status: Merged
Approved by: Cody Garver
Approved revision: 1564
Merged at revision: 1564
Proposed branch: lp:~victored/noise/lp-1180093
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 44 lines (+1/-28)
1 file modified
src/Views/GridView/GridLayout.vala (+1/-28)
To merge this branch: bzr merge lp:~victored/noise/lp-1180093
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+213398@code.launchpad.net

Commit message

Don't use hand cursor in album grid view. Fixes lp:1180093

Description of the change

Don't use hand cursor in album grid view. Fixes lp:1180093

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

Seems fine to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Views/GridView/GridLayout.vala'
2--- src/Views/GridView/GridLayout.vala 2013-08-17 04:38:12 +0000
3+++ src/Views/GridView/GridLayout.vala 2014-03-31 03:02:24 +0000
4@@ -78,10 +78,6 @@
5
6 scroll.add (icon_view);
7
8- icon_view.add_events (Gdk.EventMask.POINTER_MOTION_MASK);
9- icon_view.motion_notify_event.connect (on_motion_notify);
10- icon_view.scroll_event.connect (on_scroll_event);
11-
12 //icon_view.button_press_event.connect (on_button_press);
13 icon_view.button_release_event.connect (on_button_release);
14 icon_view.item_activated.connect (on_item_activated);
15@@ -116,27 +112,4 @@
16
17 return false;
18 }
19-
20- private inline void set_cursor (int x, int y) {
21- Gtk.TreePath path;
22- Gtk.CellRenderer cell;
23-
24- icon_view.get_item_at_pos (x, y, out path, out cell);
25-
26- if (path == null) // blank area
27- icon_view.get_window ().set_cursor (null);
28- else
29- icon_view.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.HAND1));
30-
31- }
32-
33- private bool on_motion_notify (Gdk.EventMotion ev) {
34- set_cursor ((int)ev.x, (int)ev.y);
35- return false;
36- }
37-
38- private bool on_scroll_event (Gdk.EventScroll ev) {
39- set_cursor ((int)ev.x, (int)ev.y);
40- return false;
41- }
42-}
43+}
44\ No newline at end of file

Subscribers

People subscribed via source and target branches