Merge lp:~codygarver/audience/single-right-click-pause into lp:~audience-members/audience/trunk

Proposed by Cody Garver
Status: Merged
Approved by: Cody Garver
Approved revision: 503
Merged at revision: 508
Proposed branch: lp:~codygarver/audience/single-right-click-pause
Merge into: lp:~audience-members/audience/trunk
Diff against target: 18 lines (+5/-2)
1 file modified
src/Audience.vala (+5/-2)
To merge this branch: bzr merge lp:~codygarver/audience/single-right-click-pause
Reviewer Review Type Date Requested Status
Audience Members Pending
Review via email: mp+252985@code.launchpad.net

Commit message

Pause on single right click

Only fullscreen on double left click

To post a comment you must log in.
501. By Cody Garver

Comment

502. By Cody Garver

Clean up

503. By Cody Garver

Clean up

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Audience.vala'
2--- src/Audience.vala 2015-03-15 00:37:33 +0000
3+++ src/Audience.vala 2015-03-16 08:53:32 +0000
4@@ -301,9 +301,12 @@
5 });
6
7 mainwindow.button_press_event.connect ((event) => {
8- if (event.type == Gdk.EventType.2BUTTON_PRESS) {
9+ if (event.button == Gdk.BUTTON_PRIMARY
10+ && event.type == Gdk.EventType.2BUTTON_PRESS) // double left click
11 toggle_fullscreen ();
12- }
13+
14+ if (event.button == Gdk.BUTTON_SECONDARY) // right click
15+ bottom_bar.play_toggled ();
16
17 if (event.button == Gdk.BUTTON_PRIMARY)
18 mouse_primary_down = true;

Subscribers

People subscribed via source and target branches

to all changes: