|
@@ -1057,6 +1057,10 @@ NativeWindowMac::NativeWindowMac(
|
|
|
|
|
|
RegisterInputEventObserver(
|
|
|
web_contents->GetWebContents()->GetRenderViewHost());
|
|
|
+
|
|
|
+ original_frame_ = [window_ frame];
|
|
|
+ original_level_ = [window_ level];
|
|
|
+
|
|
|
}
|
|
|
|
|
|
NativeWindowMac::~NativeWindowMac() {
|
|
@@ -1423,8 +1427,9 @@ void NativeWindowMac::SetSimpleFullScreen(bool simple_fullscreen) {
|
|
|
if (simple_fullscreen && !is_simple_fullscreen_) {
|
|
|
is_simple_fullscreen_ = true;
|
|
|
|
|
|
- // Take note of the current window size
|
|
|
+ // Take note of the current window size and level
|
|
|
original_frame_ = [window frame];
|
|
|
+ original_level_ = [window level];
|
|
|
|
|
|
simple_fullscreen_options_ = [NSApp currentSystemPresentationOptions];
|
|
|
simple_fullscreen_mask_ = [window styleMask];
|
|
@@ -1440,6 +1445,13 @@ void NativeWindowMac::SetSimpleFullScreen(bool simple_fullscreen) {
|
|
|
|
|
|
NSRect fullscreenFrame = [window.screen frame];
|
|
|
|
|
|
+ // If our app has dock hidden, set the window level higher so another app's
|
|
|
+ // menu bar doesn't appear on top of our fullscreen app.
|
|
|
+ if ([[NSRunningApplication currentApplication] activationPolicy] !=
|
|
|
+ NSApplicationActivationPolicyRegular) {
|
|
|
+ window.level = NSPopUpMenuWindowLevel;
|
|
|
+ }
|
|
|
+
|
|
|
if ( !fullscreen_window_title() ) {
|
|
|
// Hide the titlebar
|
|
|
SetStyleMask(false, NSTitledWindowMask);
|
|
@@ -1474,6 +1486,7 @@ void NativeWindowMac::SetSimpleFullScreen(bool simple_fullscreen) {
|
|
|
}
|
|
|
|
|
|
[window setFrame:original_frame_ display: YES animate: YES];
|
|
|
+ window.level = original_level_;
|
|
|
|
|
|
[NSApp setPresentationOptions:simple_fullscreen_options_];
|
|
|
|