e03a40026a
Fixes #18808 Previously, the triggeredByAccelerator flag would be entirely coupled with whether or not the modifier keys were being used or not. This PR swaps out the ui::EventFlagsFromModifiers([event modifierFlags])) call in the macOS code to ui::EventFlagsFromNSEventWithModifiers(event, [event modifierFlags])). The latter outputs flags that take into account mouse click events on top of modifier flags (see Chromium documentation). The business logic to detect triggeredByAccelerator is then changed to exclude any mouse click flags.
96 lines
3.2 KiB
C++
96 lines
3.2 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/event_emitter.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "native_mate/arguments.h"
|
|
#include "native_mate/dictionary.h"
|
|
#include "native_mate/object_template_builder.h"
|
|
#include "shell/browser/api/event.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "ui/events/event_constants.h"
|
|
|
|
namespace mate {
|
|
|
|
namespace {
|
|
|
|
v8::Persistent<v8::ObjectTemplate> event_template;
|
|
|
|
void PreventDefault(mate::Arguments* args) {
|
|
mate::Dictionary self(args->isolate(), args->GetThis());
|
|
self.Set("defaultPrevented", true);
|
|
}
|
|
|
|
// Create a pure JavaScript Event object.
|
|
v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
|
|
if (event_template.IsEmpty()) {
|
|
event_template.Reset(
|
|
isolate,
|
|
ObjectTemplateBuilder(isolate, v8::ObjectTemplate::New(isolate))
|
|
.SetMethod("preventDefault", &PreventDefault)
|
|
.Build());
|
|
}
|
|
|
|
return v8::Local<v8::ObjectTemplate>::New(isolate, event_template)
|
|
->NewInstance(isolate->GetCurrentContext())
|
|
.ToLocalChecked();
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace internal {
|
|
|
|
v8::Local<v8::Object> CreateJSEvent(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Object> object,
|
|
content::RenderFrameHost* sender,
|
|
base::Optional<electron::mojom::ElectronBrowser::MessageSyncCallback>
|
|
callback) {
|
|
v8::Local<v8::Object> event;
|
|
bool use_native_event = sender && callback;
|
|
|
|
if (use_native_event) {
|
|
mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
|
|
native_event->SetSenderAndMessage(sender, std::move(callback));
|
|
event = v8::Local<v8::Object>::Cast(native_event.ToV8());
|
|
} else {
|
|
event = CreateEventObject(isolate);
|
|
}
|
|
mate::Dictionary dict(isolate, event);
|
|
dict.Set("sender", object);
|
|
if (sender)
|
|
dict.Set("frameId", sender->GetRoutingID());
|
|
return event;
|
|
}
|
|
|
|
v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
|
|
v8::Local<v8::Object> object,
|
|
v8::Local<v8::Object> custom_event) {
|
|
v8::Local<v8::Object> event = CreateEventObject(isolate);
|
|
(void)event->SetPrototype(custom_event->CreationContext(), custom_event);
|
|
mate::Dictionary(isolate, event).Set("sender", object);
|
|
return event;
|
|
}
|
|
|
|
v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags) {
|
|
const int mouse_button_flags =
|
|
(ui::EF_RIGHT_MOUSE_BUTTON | ui::EF_LEFT_MOUSE_BUTTON |
|
|
ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_BACK_MOUSE_BUTTON |
|
|
ui::EF_FORWARD_MOUSE_BUTTON);
|
|
const int is_mouse_click = static_cast<bool>(flags & mouse_button_flags);
|
|
mate::Dictionary obj = mate::Dictionary::CreateEmpty(isolate);
|
|
obj.Set("shiftKey", static_cast<bool>(flags & ui::EF_SHIFT_DOWN));
|
|
obj.Set("ctrlKey", static_cast<bool>(flags & ui::EF_CONTROL_DOWN));
|
|
obj.Set("altKey", static_cast<bool>(flags & ui::EF_ALT_DOWN));
|
|
obj.Set("metaKey", static_cast<bool>(flags & ui::EF_COMMAND_DOWN));
|
|
obj.Set("triggeredByAccelerator", !is_mouse_click);
|
|
return obj.GetHandle();
|
|
}
|
|
|
|
} // namespace internal
|
|
|
|
} // namespace mate
|