always_show_title_text_in_full_screen -> fullscreen_window_title

This commit is contained in:
Kevin Sawicki 2017-07-14 11:48:10 -07:00
Родитель a38f0f5f46
Коммит 9102c07ec7
3 изменённых файлов: 10 добавлений и 11 удалений

Просмотреть файл

@ -133,8 +133,7 @@ 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_; }
bool fullscreen_window_title() const { return fullscreen_window_title_; }
protected:
// Return a vector of non-draggable regions that fill a window of size
@ -180,7 +179,7 @@ class NativeWindowMac : public NativeWindow,
bool zoom_to_page_width_;
bool always_show_title_text_in_full_screen_;
bool fullscreen_window_title_;
NSInteger attention_request_id_; // identifier from requestUserAttention

Просмотреть файл

@ -345,9 +345,9 @@ bool ScopedDisableResize::disable_resize_ = false;
base::mac::IsAtLeastOS10_10() &&
// FIXME(zcbenz): Showing titlebar for hiddenInset window is weird under
// fullscreen mode.
// Show title if always_show_title_text_in_full_screen flag is set
// Show title if fullscreen_window_title flag is set
(shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET ||
shell_->always_show_title_text_in_full_screen())) {
shell_->fullscreen_window_title())) {
[window setTitleVisibility:NSWindowTitleVisible];
}
@ -372,7 +372,7 @@ bool ScopedDisableResize::disable_resize_ = false;
if ((shell_->transparent() || !shell_->has_frame()) &&
base::mac::IsAtLeastOS10_10() &&
(shell_->title_bar_style() != atom::NativeWindowMac::HIDDEN_INSET ||
shell_->always_show_title_text_in_full_screen())) {
shell_->fullscreen_window_title())) {
[window setTitleVisibility:NSWindowTitleHidden];
}
@ -802,7 +802,7 @@ NativeWindowMac::NativeWindowMac(
is_kiosk_(false),
was_fullscreen_(false),
zoom_to_page_width_(false),
always_show_title_text_in_full_screen_(false),
fullscreen_window_title_(false),
attention_request_id_(0),
title_bar_style_(NORMAL) {
int width = 800, height = 600;
@ -950,7 +950,7 @@ NativeWindowMac::NativeWindowMac(
options.Get(options::kZoomToPageWidth, &zoom_to_page_width_);
options.Get(options::kFullscreenWindowTitle, &always_show_title_text_in_full_screen_);
options.Get(options::kFullscreenWindowTitle, &fullscreen_window_title_);
// Enable the NSView to accept first mouse event.
bool acceptsFirstMouse = false;

Просмотреть файл

@ -225,9 +225,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
display unless hovered over in the top left of the window. These custom
buttons prevent issues with mouse events that occur with the standard
window toolbar buttons. **Note:** This option is currently experimental.
* `alwaysShowTitleTextInFullscreen` Boolean (optional) - Shows the title in
tile bar in full screen mode on macOS with all `titleBarStyle` options.
Default is `false`.
* `fullscreenWindowTitle` Boolean (optional) - Shows the title in the
tile bar in full screen mode on macOS for all `titleBarStyle` options.
Default is `false`.
* `thickFrame` Boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
Windows, which adds standard window frame. Setting it to `false` will remove
window shadow and window animations. Default is `true`.