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

updates to mac enable method

Browse source
This commit is contained in:
Shelley Vohr 2018-02-06 09:16:22 -05:00
parent 131aa38768
commit 80aa399f8a
No known key found for this signature in database
GPG key ID: F13993A75599653C
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window_mac.h
View file

@ -38,6 +38,7 @@ class NativeWindowMac : public NativeWindow,
void Hide() override; void Hide() override;
bool IsVisible() override; bool IsVisible() override;
bool IsEnabled() override; bool IsEnabled() override;
void SetEnabled(bool enable) override;
void Maximize() override; void Maximize() override;
void Unmaximize() override; void Unmaximize() override;
bool IsMaximized() override; bool IsMaximized() override;

9
atom/browser/native_window_mac.mm
View file

@ -1045,6 +1045,8 @@ NativeWindowMac::NativeWindowMac(
web_contents->GetWebContents()->GetRenderViewHost()); web_contents->GetWebContents()->GetRenderViewHost());
} }
NSWindow* currentSheet;
NativeWindowMac::~NativeWindowMac() { NativeWindowMac::~NativeWindowMac() {
[NSEvent removeMonitor:wheel_event_monitor_]; [NSEvent removeMonitor:wheel_event_monitor_];
Observe(nullptr); Observe(nullptr);
@ -1137,9 +1139,12 @@ bool NativeWindowMac::IsEnabled() {
void NativeWindowMac::SetEnabled(bool enable) { void NativeWindowMac::SetEnabled(bool enable) {
if (enable) { if (enable) {
// TODO(codebytere): figure out how to implement window enabling [window_ beginSheet: window_ completionHandler:^(NSModalResponse returnCode) {
NSLog(@"modal enabled");
return;
}];
} else { } else {
[window_ attachedSheet] = nil; [window_ endSheet: [window_ attachedSheet]];
} }
} }

2
docs/api/browser-window.md
View file

@ -847,7 +847,7 @@ the supplied bounds.
Returns [`Rectangle`](structures/rectangle.md) Returns [`Rectangle`](structures/rectangle.md)
### `win.setEnabled(enable)` #### `win.setEnabled(enable)`
* `enable` Boolean * `enable` Boolean