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

fix: ensure custom traffic lights float to top (#29595)

Browse source 
* fix: ensure custom traffic lights float to top

* chore: split into separate function
This commit is contained in:
Shelley Vohr 2021-06-10 14:52:23 +02:00 • committed by GitHub
parent 73266f8f3d
commit 63cc82d91d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/browser/native_window_mac.h
View file

@ -154,6 +154,9 @@ class NativeWindowMac : public NativeWindow,
void NotifyWindowWillEnterFullScreen(); void NotifyWindowWillEnterFullScreen();
void NotifyWindowWillLeaveFullScreen(); void NotifyWindowWillLeaveFullScreen();
// Ensure the buttons view are always floated on the top.
void ReorderButtonsView();
// Cleanup observers when window is getting closed. Note that the destructor // Cleanup observers when window is getting closed. Note that the destructor
// can be called much later after window gets closed, so we should not do // can be called much later after window gets closed, so we should not do
// cleanup in destructor. // cleanup in destructor.

18
shell/browser/native_window_mac.mm
View file

@ -460,11 +460,8 @@ void NativeWindowMac::SetContentView(views::View* view) {
set_content_view(view); set_content_view(view);
root_view->AddChildView(content_view()); root_view->AddChildView(content_view());
if (buttons_view_) { if (buttons_view_)
// Ensure the buttons view are always floated on the top. ReorderButtonsView();
[buttons_view_ removeFromSuperview];
[[window_ contentView] addSubview:buttons_view_];
}
root_view->Layout(); root_view->Layout();
} }
@ -1150,6 +1147,8 @@ void NativeWindowMac::AddBrowserView(NativeBrowserView* view) {
} }
[CATransaction commit]; [CATransaction commit];
ReorderButtonsView();
} }
void NativeWindowMac::RemoveBrowserView(NativeBrowserView* view) { void NativeWindowMac::RemoveBrowserView(NativeBrowserView* view) {
@ -1191,6 +1190,8 @@ void NativeWindowMac::SetTopBrowserView(NativeBrowserView* view) {
} }
[CATransaction commit]; [CATransaction commit];
ReorderButtonsView();
} }
void NativeWindowMac::SetParentWindow(NativeWindow* parent) { void NativeWindowMac::SetParentWindow(NativeWindow* parent) {
@ -1653,6 +1654,13 @@ bool NativeWindowMac::IsActive() const {
return is_active_; return is_active_;
} }
void NativeWindowMac::ReorderButtonsView() {
if (buttons_view_) {
[buttons_view_ removeFromSuperview];
[[window_ contentView] addSubview:buttons_view_];
}
}
void NativeWindowMac::Cleanup() { void NativeWindowMac::Cleanup() {
DCHECK(!IsClosed()); DCHECK(!IsClosed());
ui::NativeTheme::GetInstanceForNativeUi()->RemoveObserver(this); ui::NativeTheme::GetInstanceForNativeUi()->RemoveObserver(this);