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

migrate to virtual void and start mac impl

Browse source
This commit is contained in:
Shelley Vohr 2018-02-06 08:21:53 -05:00
parent 97589bbe33
commit ae632193c0
No known key found for this signature in database
GPG key ID: F13993A75599653C
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_window.cc
View file

@ -391,8 +391,7 @@ bool Window::IsEnabled() {
} }
void Window::SetEnabled(bool enable) { void Window::SetEnabled(bool enable) {
auto window = static_cast<NativeWindowViews*>(window_.get()); window_->SetEnabled(enable);
window->SetEnabled(enable);
} }
void Window::Maximize() { void Window::Maximize() {

1
atom/browser/native_window.h
View file

@ -80,6 +80,7 @@ class NativeWindow : public base::SupportsUserData,
virtual void Hide() = 0; virtual void Hide() = 0;
virtual bool IsVisible() = 0; virtual bool IsVisible() = 0;
virtual bool IsEnabled() = 0; virtual bool IsEnabled() = 0;
virtual void SetEnabled(bool enable) = 0;
virtual void Maximize() = 0; virtual void Maximize() = 0;
virtual void Unmaximize() = 0; virtual void Unmaximize() = 0;
virtual bool IsMaximized() = 0; virtual bool IsMaximized() = 0;

8
atom/browser/native_window_mac.mm
View file

@ -1135,6 +1135,14 @@ bool NativeWindowMac::IsEnabled() {
return [window_ attachedSheet] == nil; return [window_ attachedSheet] == nil;
} }
void NativeWindowMac::SetEnabled(bool enable) {
if (enable == false){
[window_ attachedSheet] = nil;
} else {
[window_ beginSheet:window_];
}
}
void NativeWindowMac::Maximize() { void NativeWindowMac::Maximize() {
if (IsMaximized()) if (IsMaximized())
return; return;

2
atom/browser/native_window_views.h
View file

@ -132,7 +132,7 @@ class NativeWindowViews : public NativeWindow,
void SetIcon(const gfx::ImageSkia& icon); void SetIcon(const gfx::ImageSkia& icon);
#endif #endif
void SetEnabled(bool enable); void SetEnabled(bool enable) override;
views::Widget* widget() const { return window_.get(); } views::Widget* widget() const { return window_.get(); }