mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

revert: add BrowserWindow.isOccluded()

Browse source 
This reverts commit 768ece6b54.
This commit is contained in:
Shelley Vohr 2024-02-12 09:35:34 +01:00 • committed by GitHub
parent 4ded4d16a8
commit 5f785f213e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 2 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/api/electron_api_base_window.cc
View file

@ -355,10 +355,6 @@ bool BaseWindow::IsVisible() const {
return window_->IsVisible();
}
bool BaseWindow::IsOccluded() const {
return window_->IsOccluded();
}
bool BaseWindow::IsEnabled() const {
return window_->IsEnabled();
}
@ -1090,7 +1086,6 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
.SetMethod("showInactive", &BaseWindow::ShowInactive)
.SetMethod("hide", &BaseWindow::Hide)
.SetMethod("isVisible", &BaseWindow::IsVisible)
.SetMethod("isOccluded", &BaseWindow::IsOccluded)
.SetMethod("isEnabled", &BaseWindow::IsEnabled)
.SetMethod("setEnabled", &BaseWindow::SetEnabled)
.SetMethod("maximize", &BaseWindow::Maximize)

1
shell/browser/api/electron_api_base_window.h
View file

@ -98,7 +98,6 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
void ShowInactive();
void Hide();
bool IsVisible() const;
bool IsOccluded() const;
bool IsEnabled() const;
void SetEnabled(bool enable);
void Maximize();

1
shell/browser/native_window.h
View file

@ -87,7 +87,6 @@ class NativeWindow : public base::SupportsUserData,
virtual void Show() = 0;
virtual void ShowInactive() = 0;
virtual void Hide() = 0;
virtual bool IsOccluded() const = 0;
virtual bool IsVisible() const = 0;
virtual bool IsEnabled() const = 0;
virtual void SetEnabled(bool enable) = 0;

1
shell/browser/native_window_mac.h
View file

@ -44,7 +44,6 @@ class NativeWindowMac : public NativeWindow,
void Show() override;
void ShowInactive() override;
void Hide() override;
bool IsOccluded() const override;
bool IsVisible() const override;
bool IsEnabled() const override;
void SetEnabled(bool enable) override;

7
shell/browser/native_window_mac.mm
View file

@ -564,12 +564,9 @@ void NativeWindowMac::Hide() {
[window_ orderOut:nil];
}
bool NativeWindowMac::IsOccluded() const {
return !([window_ occlusionState] & NSWindowOcclusionStateVisible);
}
bool NativeWindowMac::IsVisible() const {
return [window_ isVisible] && !IsMinimized();
bool occluded = [window_ occlusionState] == NSWindowOcclusionStateVisible;
return [window_ isVisible] && !occluded && !IsMinimized();
}
bool NativeWindowMac::IsEnabled() const {

8
shell/browser/native_window_views.cc
View file

@ -562,14 +562,6 @@ void NativeWindowViews::Hide() {
#endif
}
bool NativeWindowViews::IsOccluded() const {
if (!GetNativeWindow())
return false;
auto occlusion_state =
GetNativeWindow()->GetHost()->GetNativeWindowOcclusionState();
return occlusion_state == aura::Window::OcclusionState::OCCLUDED;
}
bool NativeWindowViews::IsVisible() const {
#if BUILDFLAG(IS_WIN)
// widget()->IsVisible() calls ::IsWindowVisible, which returns non-zero if a

1
shell/browser/native_window_views.h
View file

@ -56,7 +56,6 @@ class NativeWindowViews : public NativeWindow,
void Hide() override;
bool IsVisible() const override;
bool IsEnabled() const override;
bool IsOccluded() const override;
void SetEnabled(bool enable) override;
void Maximize() override;
void Unmaximize() override;