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

add alwaysShowTitleTextInFullscreen flag

Browse source
This commit is contained in:
Shubham 2017-06-17 20:45:29 -04:00
parent 493cfd38d6
commit 25c651c40a
5 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window_mac.h
View file

@ -133,6 +133,9 @@ class NativeWindowMac : public NativeWindow,
bool zoom_to_page_width() const { return zoom_to_page_width_; }
bool always_show_title_text_in_full_screen() const
{ return always_show_title_text_in_full_screen_; }
protected:
// Return a vector of non-draggable regions that fill a window of size
// |width| by |height|, but leave gaps where the window should be draggable.
@ -177,6 +180,8 @@ class NativeWindowMac : public NativeWindow,
bool zoom_to_page_width_;
bool always_show_title_text_in_full_screen_;
NSInteger attention_request_id_; // identifier from requestUserAttention
// The presentation options before entering kiosk mode.

11
atom/browser/native_window_mac.mm
View file

@ -340,11 +340,14 @@ bool ScopedDisableResize::disable_resize_ = false;
// titlebar is expected to be empty, but after entering fullscreen mode we
// have to set one, because title bar is visible here.
NSWindow* window = shell_->GetNativeWindow();
if ((shell_->transparent() || !shell_->has_frame()) &&
base::mac::IsAtLeastOS10_10() &&
// FIXME(zcbenz): Showing titlebar for hiddenInset window is weird under
// fullscreen mode.
shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET) {
// Show title if always_show_title_text_in_full_screen flag is set
(shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET ||
shell_->always_show_title_text_in_full_screen())) {
[window setTitleVisibility:NSWindowTitleVisible];
}
@ -368,7 +371,8 @@ bool ScopedDisableResize::disable_resize_ = false;
NSWindow* window = shell_->GetNativeWindow();
if ((shell_->transparent() || !shell_->has_frame()) &&
base::mac::IsAtLeastOS10_10() &&
shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET) {
(shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET ||
shell_->always_show_title_text_in_full_screen())) {
[window setTitleVisibility:NSWindowTitleHidden];
}
@ -798,6 +802,7 @@ NativeWindowMac::NativeWindowMac(
is_kiosk_(false),
was_fullscreen_(false),
zoom_to_page_width_(false),
always_show_title_text_in_full_screen_(false),
attention_request_id_(0),
title_bar_style_(NORMAL) {
int width = 800, height = 600;
@ -945,6 +950,8 @@ NativeWindowMac::NativeWindowMac(
options.Get(options::kZoomToPageWidth, &zoom_to_page_width_);
options.Get(options::kAlwaysShowTitleTextInFullscreen, &always_show_title_text_in_full_screen_);
// Enable the NSView to accept first mouse event.
bool acceptsFirstMouse = false;
options.Get(options::kAcceptFirstMouse, &acceptsFirstMouse);