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

Just use visible state in CanFocus delegate

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-14 12:52:19 -08:00
parent 86007fe61d
commit bda8af8dd3
4 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/native_window_views.cc
View file

@ -149,8 +149,7 @@ NativeWindowViews::NativeWindowViews(
resizable_(true),
maximizable_(true),
minimizable_(true),
fullscreenable_(true),
focusable_(true) {
fullscreenable_(true) {
options.Get(options::kTitle, &title_);
options.Get(options::kAutoHideMenuBar, &menu_bar_autohide_);
@ -198,7 +197,8 @@ NativeWindowViews::NativeWindowViews(
if (transparent() && !has_frame())
params.shadow_type = views::Widget::InitParams::SHADOW_TYPE_NONE;
if (options.Get(options::kFocusable, &focusable_) && !focusable_)
bool focusable;
if (options.Get(options::kFocusable, &focusable) && !focusable)
params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
#if defined(OS_WIN)
@ -806,7 +806,6 @@ void NativeWindowViews::SetContentProtection(bool enable) {
}
void NativeWindowViews::SetFocusable(bool focusable) {
focusable_ = focusable;
#if defined(OS_WIN)
LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
if (focusable)