Merge lp:~cjcurran/indicator-sound/fix-collision-detection into lp:indicator-sound/fourth

Proposed by Conor Curran
Status: Merged
Merged at revision: 282
Proposed branch: lp:~cjcurran/indicator-sound/fix-collision-detection
Merge into: lp:indicator-sound/fourth
Diff against target: 22 lines (+3/-3)
1 file modified
src/transport-widget.c (+3/-3)
To merge this branch: bzr merge lp:~cjcurran/indicator-sound/fix-collision-detection
Reviewer Review Type Date Requested Status
Conor Curran Pending
Review via email: mp+82439@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/transport-widget.c'
2--- src/transport-widget.c 2011-09-09 12:57:51 +0000
3+++ src/transport-widget.c 2011-11-16 18:34:46 +0000
4@@ -561,15 +561,15 @@
5 {
6 TransportAction event = TRANSPORT_ACTION_NO_ACTION;
7
8- if (x > 67 && x < 112
9+ if (x > 57 && x < 102
10 && y > 12 && y < 40){
11 event = TRANSPORT_ACTION_PREVIOUS;
12 }
13- else if (x > 111 && x < 153
14+ else if (x > 101 && x < 143
15 && y > 5 && y < 47){
16 event = TRANSPORT_ACTION_PLAY_PAUSE;
17 }
18- else if (x > 152 && x < 197
19+ else if (x > 142 && x < 187
20 && y > 12 && y < 40){
21 event = TRANSPORT_ACTION_NEXT;
22 }

Subscribers

People subscribed via source and target branches