mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 08:15:31 +00:00
Bug 1615732 - Don't treat control-left-click on mac as a right-click; r=masayuki
Differential Revision: https://phabricator.services.mozilla.com/D62968 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
c7560c016c
commit
e8b067a7e7
@ -1562,6 +1562,14 @@
|
|||||||
value: @IS_NIGHTLY_BUILD@
|
value: @IS_NIGHTLY_BUILD@
|
||||||
mirror: always
|
mirror: always
|
||||||
|
|
||||||
|
#if defined(XP_MACOSX)
|
||||||
|
# Whether to disable treating ctrl click as right click
|
||||||
|
- name: dom.event.treat_ctrl_click_as_right_click.disabled
|
||||||
|
type: bool
|
||||||
|
value: @IS_NIGHTLY_BUILD@
|
||||||
|
mirror: always
|
||||||
|
#endif
|
||||||
|
|
||||||
# Enable clipboard readText() and writeText() by default
|
# Enable clipboard readText() and writeText() by default
|
||||||
- name: dom.events.asyncClipboard
|
- name: dom.events.asyncClipboard
|
||||||
type: bool
|
type: bool
|
||||||
|
@ -3159,8 +3159,6 @@ NSEvent* gLastDragMouseDownEvent = nil; // [strong]
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NSUInteger modifierFlags = [theEvent modifierFlags];
|
|
||||||
|
|
||||||
WidgetMouseEvent geckoEvent(true, eMouseDown, mGeckoChild, WidgetMouseEvent::eReal);
|
WidgetMouseEvent geckoEvent(true, eMouseDown, mGeckoChild, WidgetMouseEvent::eReal);
|
||||||
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
|
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
|
||||||
|
|
||||||
@ -3172,10 +3170,12 @@ NSEvent* gLastDragMouseDownEvent = nil; // [strong]
|
|||||||
}
|
}
|
||||||
geckoEvent.mClickCount = clickCount;
|
geckoEvent.mClickCount = clickCount;
|
||||||
|
|
||||||
if (modifierFlags & NSControlKeyMask)
|
if (!StaticPrefs::dom_event_treat_ctrl_click_as_right_click_disabled() &&
|
||||||
|
([theEvent modifierFlags] & NSControlKeyMask)) {
|
||||||
geckoEvent.mButton = MouseButton::eRight;
|
geckoEvent.mButton = MouseButton::eRight;
|
||||||
else
|
} else {
|
||||||
geckoEvent.mButton = MouseButton::eLeft;
|
geckoEvent.mButton = MouseButton::eLeft;
|
||||||
|
}
|
||||||
|
|
||||||
mGeckoChild->DispatchInputEvent(&geckoEvent);
|
mGeckoChild->DispatchInputEvent(&geckoEvent);
|
||||||
mBlockedLastMouseDown = NO;
|
mBlockedLastMouseDown = NO;
|
||||||
@ -3199,10 +3199,13 @@ NSEvent* gLastDragMouseDownEvent = nil; // [strong]
|
|||||||
|
|
||||||
WidgetMouseEvent geckoEvent(true, eMouseUp, mGeckoChild, WidgetMouseEvent::eReal);
|
WidgetMouseEvent geckoEvent(true, eMouseUp, mGeckoChild, WidgetMouseEvent::eReal);
|
||||||
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
|
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
|
||||||
if ([theEvent modifierFlags] & NSControlKeyMask)
|
|
||||||
|
if (!StaticPrefs::dom_event_treat_ctrl_click_as_right_click_disabled() &&
|
||||||
|
([theEvent modifierFlags] & NSControlKeyMask)) {
|
||||||
geckoEvent.mButton = MouseButton::eRight;
|
geckoEvent.mButton = MouseButton::eRight;
|
||||||
else
|
} else {
|
||||||
geckoEvent.mButton = MouseButton::eLeft;
|
geckoEvent.mButton = MouseButton::eLeft;
|
||||||
|
}
|
||||||
|
|
||||||
// Remember the event's position before calling DispatchInputEvent, because
|
// Remember the event's position before calling DispatchInputEvent, because
|
||||||
// that call can mutate it and convert it into a different coordinate space.
|
// that call can mutate it and convert it into a different coordinate space.
|
||||||
|
Loading…
Reference in New Issue
Block a user