feat: add BrowserWindow.isFocusable() (#28642)
This commit is contained in:
parent
69f3e330e7
commit
11199d8824
11 changed files with 52 additions and 0 deletions
|
@ -696,6 +696,10 @@ void BaseWindow::SetFocusable(bool focusable) {
|
|||
return window_->SetFocusable(focusable);
|
||||
}
|
||||
|
||||
bool BaseWindow::IsFocusable() {
|
||||
return window_->IsFocusable();
|
||||
}
|
||||
|
||||
void BaseWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
|
||||
auto context = isolate->GetCurrentContext();
|
||||
gin::Handle<Menu> menu;
|
||||
|
@ -1243,6 +1247,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
|
|||
.SetMethod("setIgnoreMouseEvents", &BaseWindow::SetIgnoreMouseEvents)
|
||||
.SetMethod("setContentProtection", &BaseWindow::SetContentProtection)
|
||||
.SetMethod("setFocusable", &BaseWindow::SetFocusable)
|
||||
.SetMethod("isFocusable", &BaseWindow::IsFocusable)
|
||||
.SetMethod("setMenu", &BaseWindow::SetMenu)
|
||||
.SetMethod("removeMenu", &BaseWindow::RemoveMenu)
|
||||
.SetMethod("setParentWindow", &BaseWindow::SetParentWindow)
|
||||
|
|
|
@ -171,6 +171,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
|
|||
void SetIgnoreMouseEvents(bool ignore, gin_helper::Arguments* args);
|
||||
void SetContentProtection(bool enable);
|
||||
void SetFocusable(bool focusable);
|
||||
bool IsFocusable();
|
||||
void SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> menu);
|
||||
void RemoveMenu();
|
||||
void SetParentWindow(v8::Local<v8::Value> value, gin_helper::Arguments* args);
|
||||
|
|
|
@ -328,6 +328,10 @@ bool NativeWindow::IsDocumentEdited() {
|
|||
|
||||
void NativeWindow::SetFocusable(bool focusable) {}
|
||||
|
||||
bool NativeWindow::IsFocusable() {
|
||||
return false;
|
||||
}
|
||||
|
||||
void NativeWindow::SetMenu(ElectronMenuModel* menu) {}
|
||||
|
||||
void NativeWindow::SetParentWindow(NativeWindow* parent) {
|
||||
|
|
|
@ -162,6 +162,7 @@ class NativeWindow : public base::SupportsUserData,
|
|||
virtual void SetIgnoreMouseEvents(bool ignore, bool forward) = 0;
|
||||
virtual void SetContentProtection(bool enable) = 0;
|
||||
virtual void SetFocusable(bool focusable);
|
||||
virtual bool IsFocusable();
|
||||
virtual void SetMenu(ElectronMenuModel* menu);
|
||||
virtual void SetParentWindow(NativeWindow* parent);
|
||||
virtual void AddBrowserView(NativeBrowserView* browser_view) = 0;
|
||||
|
|
|
@ -104,6 +104,7 @@ class NativeWindowMac : public NativeWindow,
|
|||
void SetIgnoreMouseEvents(bool ignore, bool forward) override;
|
||||
void SetContentProtection(bool enable) override;
|
||||
void SetFocusable(bool focusable) override;
|
||||
bool IsFocusable() override;
|
||||
void AddBrowserView(NativeBrowserView* browser_view) override;
|
||||
void RemoveBrowserView(NativeBrowserView* browser_view) override;
|
||||
void SetTopBrowserView(NativeBrowserView* browser_view) override;
|
||||
|
|
|
@ -1080,6 +1080,10 @@ void NativeWindowMac::SetFocusable(bool focusable) {
|
|||
[window_ setDisableKeyOrMainWindow:!focusable];
|
||||
}
|
||||
|
||||
bool NativeWindowMac::IsFocusable() {
|
||||
return ![window_ disableKeyOrMainWindow];
|
||||
}
|
||||
|
||||
void NativeWindowMac::AddBrowserView(NativeBrowserView* view) {
|
||||
[CATransaction begin];
|
||||
[CATransaction setDisableActions:YES];
|
||||
|
|
|
@ -1087,6 +1087,17 @@ void NativeWindowViews::SetFocusable(bool focusable) {
|
|||
#endif
|
||||
}
|
||||
|
||||
bool NativeWindowViews::IsFocusable() {
|
||||
bool can_activate = widget()->widget_delegate()->CanActivate();
|
||||
#if defined(OS_WIN)
|
||||
LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
|
||||
bool no_activate = ex_style & WS_EX_NOACTIVATE;
|
||||
return !no_activate && can_activate;
|
||||
#else
|
||||
return can_activate;
|
||||
#endif
|
||||
}
|
||||
|
||||
void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
|
||||
#if defined(USE_X11)
|
||||
if (!features::IsUsingOzonePlatform()) {
|
||||
|
|
|
@ -112,6 +112,7 @@ class NativeWindowViews : public NativeWindow,
|
|||
void SetIgnoreMouseEvents(bool ignore, bool forward) override;
|
||||
void SetContentProtection(bool enable) override;
|
||||
void SetFocusable(bool focusable) override;
|
||||
bool IsFocusable() override;
|
||||
void SetMenu(ElectronMenuModel* menu_model) override;
|
||||
void AddBrowserView(NativeBrowserView* browser_view) override;
|
||||
void RemoveBrowserView(NativeBrowserView* browser_view) override;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue