diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2021-07-16 16:09:34 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-07-16 16:09:34 +0000 |
| commit | a236494ea7f31848b4a459dad41330f225137832 (patch) | |
| tree | e0aa650b27401ce21bad0dc2789789df3f538cb2 /clutter/mir/clutter-event-mir.c | |
| parent | c577315acbb6917b1f28cfc8d09defd44e0d4d77 (diff) | |
| parent | 8f0fa2ec8697fa188cc8ccc6aca5c7076aea2eb6 (diff) | |
| download | clutter-a236494ea7f31848b4a459dad41330f225137832.tar.gz | |
Merge branch 'bugzilla-783791' into 'master'
wayland: Fix incorrect button mask in clutter_wayland_handle_button
See merge request GNOME/clutter!15
Diffstat (limited to 'clutter/mir/clutter-event-mir.c')
| -rw-r--r-- | clutter/mir/clutter-event-mir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clutter/mir/clutter-event-mir.c b/clutter/mir/clutter-event-mir.c index 296430bb9..779ed728c 100644 --- a/clutter/mir/clutter-event-mir.c +++ b/clutter/mir/clutter-event-mir.c @@ -265,17 +265,17 @@ _clutter_mir_handle_event (ClutterBackend *backend, CLUTTER_BUTTON_PRESS : CLUTTER_BUTTON_RELEASE); - event->button.button = 1; + event->button.button = CLUTTER_BUTTON_PRIMARY; event->button.click_count = 1; button_state ^= mir_event->motion.button_state; if (button_state == 0 || (button_state & mir_motion_button_primary)) - event->button.button = 1; + event->button.button = CLUTTER_BUTTON_PRIMARY; else if (button_state & mir_motion_button_secondary) - event->button.button = 3; + event->button.button = CLUTTER_BUTTON_SECONDARY; else if (button_state & mir_motion_button_tertiary) - event->button.button = 2; + event->button.button = CLUTTER_BUTTON_MIDDLE; else if (button_state & mir_motion_button_back) event->button.button = 8; else if (button_state & mir_motion_button_forward) |