🎨 Rename ambiguous simple_fullscreen_ variable to always_simple_fullscreen_

This commit is contained in:
Zachary Flower 2017-09-13 12:16:37 -06:00
parent fa4d52f042
commit 432b912c6a
2 changed files with 4 additions and 4 deletions

View file

@ -137,7 +137,7 @@ class NativeWindowMac : public NativeWindow,
bool fullscreen_window_title() const { return fullscreen_window_title_; } bool fullscreen_window_title() const { return fullscreen_window_title_; }
bool simple_fullscreen() const { return simple_fullscreen_; } bool simple_fullscreen() const { return always_simple_fullscreen_; }
protected: protected:
// Return a vector of non-draggable regions that fill a window of size // Return a vector of non-draggable regions that fill a window of size
@ -194,7 +194,7 @@ class NativeWindowMac : public NativeWindow,
TitleBarStyle title_bar_style_; TitleBarStyle title_bar_style_;
// Simple (pre-Lion) Fullscreen Settings // Simple (pre-Lion) Fullscreen Settings
bool simple_fullscreen_; bool always_simple_fullscreen_;
bool is_simple_fullscreen_; bool is_simple_fullscreen_;
bool was_maximizable_; bool was_maximizable_;
bool was_movable_; bool was_movable_;

View file

@ -827,7 +827,7 @@ NativeWindowMac::NativeWindowMac(
fullscreen_window_title_(false), fullscreen_window_title_(false),
attention_request_id_(0), attention_request_id_(0),
title_bar_style_(NORMAL), title_bar_style_(NORMAL),
simple_fullscreen_(false), always_simple_fullscreen_(false),
is_simple_fullscreen_(false) { is_simple_fullscreen_(false) {
int width = 800, height = 600; int width = 800, height = 600;
options.Get(options::kWidth, &width); options.Get(options::kWidth, &width);
@ -974,7 +974,7 @@ NativeWindowMac::NativeWindowMac(
options.Get(options::kFullscreenWindowTitle, &fullscreen_window_title_); options.Get(options::kFullscreenWindowTitle, &fullscreen_window_title_);
options.Get(options::kSimpleFullScreen, &simple_fullscreen_); options.Get(options::kSimpleFullScreen, &always_simple_fullscreen_);
// Enable the NSView to accept first mouse event. // Enable the NSView to accept first mouse event.
bool acceptsFirstMouse = false; bool acceptsFirstMouse = false;