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

Use internal IsVisible method

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-14 13:14:35 -08:00 • committed by Kevin Sawicki
parent db79f4f450
commit 52801c4a41
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window_views.cc
View file

@ -205,7 +205,7 @@ NativeWindowViews::NativeWindowViews(
if (parent) if (parent)
params.parent = parent->GetNativeWindow(); params.parent = parent->GetNativeWindow();
params.native_widget = new AtomDesktopNativeWidgetAura(window_.get(), this); params.native_widget = new AtomDesktopNativeWidgetAura(window_.get());
atom_desktop_window_tree_host_win_ = new AtomDesktopWindowTreeHostWin( atom_desktop_window_tree_host_win_ = new AtomDesktopWindowTreeHostWin(
this, this,
window_.get(), window_.get(),

11
atom/browser/ui/win/atom_desktop_native_widget_aura.cc
View file

@ -7,14 +7,15 @@
namespace atom { namespace atom {
AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura( AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura(
views::internal::NativeWidgetDelegate* delegate, views::internal::NativeWidgetDelegate* delegate)
NativeWindowViews* window) : views::DesktopNativeWidgetAura(delegate) {
: views::DesktopNativeWidgetAura(delegate),
window_(window) {
} }
void AtomDesktopNativeWidgetAura::Activate() { void AtomDesktopNativeWidgetAura::Activate() {
if (window_->IsVisible()) // Activate can cause the focused window to be blurred so only
// call when the window being activated is visible. This prevents
// hidden windows from blurring the focused window when created.
if (IsVisible())
views::DesktopNativeWidgetAura::Activate(); views::DesktopNativeWidgetAura::Activate();
} }

5
atom/browser/ui/win/atom_desktop_native_widget_aura.h
View file

@ -12,15 +12,12 @@ namespace atom {
class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura { class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
public: public:
AtomDesktopNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate, AtomDesktopNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate);
NativeWindowViews* window);
// internal::NativeWidgetPrivate: // internal::NativeWidgetPrivate:
void Activate() override; void Activate() override;
private: private:
NativeWindowViews* window_;
DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura); DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura);
}; };