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

Don't change the behavior of transparent window

Browse source
This commit is contained in:
Cheng Zhao 2016-06-17 11:02:37 +09:00
parent 9eea973d31
commit 6b20d6c189
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window_mac.mm
View file

@ -197,7 +197,7 @@ bool ScopedDisableResize::disable_resize_ = false;
// titlebar is expected to be empty, but after entering fullscreen mode we // titlebar is expected to be empty, but after entering fullscreen mode we
// have to set one, because title bar is visible here. // have to set one, because title bar is visible here.
NSWindow* window = shell_->GetNativeWindow(); NSWindow* window = shell_->GetNativeWindow();
if (!shell_->has_frame() && if ((shell_->transparent() || !shell_->has_frame()) &&
// FIXME(zcbenz): Showing titlebar for hiddenInset window is weird under // FIXME(zcbenz): Showing titlebar for hiddenInset window is weird under
// fullscreen mode. // fullscreen mode.
shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET) { shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET) {
@ -221,7 +221,7 @@ bool ScopedDisableResize::disable_resize_ = false;
- (void)windowWillExitFullScreen:(NSNotification*)notification { - (void)windowWillExitFullScreen:(NSNotification*)notification {
// Restore the titlebar visibility. // Restore the titlebar visibility.
NSWindow* window = shell_->GetNativeWindow(); NSWindow* window = shell_->GetNativeWindow();
if (!shell_->has_frame() && if ((shell_->transparent() || !shell_->has_frame()) &&
shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET) { shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET) {
[window setTitleVisibility:NSWindowTitleHidden]; [window setTitleVisibility:NSWindowTitleHidden];
} }
@ -501,8 +501,6 @@ NativeWindowMac::NativeWindowMac(
[window_ setDelegate:window_delegate_]; [window_ setDelegate:window_delegate_];
if (transparent()) { if (transparent()) {
// Make window has transparent background.
[window_ setOpaque:NO];
// Setting the background color to clear will also hide the shadow. // Setting the background color to clear will also hide the shadow.
[window_ setBackgroundColor:[NSColor clearColor]]; [window_ setBackgroundColor:[NSColor clearColor]];
} }
@ -520,7 +518,7 @@ NativeWindowMac::NativeWindowMac(
if (options.Get(options::kFocusable, &focusable) && !focusable) if (options.Get(options::kFocusable, &focusable) && !focusable)
[window_ setDisableKeyOrMainWindow:YES]; [window_ setDisableKeyOrMainWindow:YES];
if (!has_frame()) { if (transparent() || !has_frame()) {
// Don't show title bar. // Don't show title bar.
[window_ setTitleVisibility:NSWindowTitleHidden]; [window_ setTitleVisibility:NSWindowTitleHidden];
// Remove non-transparent corners, see http://git.io/vfonD. // Remove non-transparent corners, see http://git.io/vfonD.