github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-03 03:35:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
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) {
auto window = static_cast<NativeWindowViews*>(window_.get());
window->SetEnabled(enable);
window_->SetEnabled(enable);
}
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 bool IsVisible() = 0;
virtual bool IsEnabled() = 0;
virtual void SetEnabled(bool enable) = 0;
virtual void Maximize() = 0;
virtual void Unmaximize() = 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;
}
void NativeWindowMac::SetEnabled(bool enable) {
if (enable == false){
[window_ attachedSheet] = nil;
} else {
[window_ beginSheet:window_];
}
}
void NativeWindowMac::Maximize() {
if (IsMaximized())
return;

2
atom/browser/native_window_views.h
View File

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