projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb41474
)
Only begin sheet when no sheet parent
author
Kevin Sawicki
<kevinsawicki@gmail.com>
Thu, 29 Sep 2016 18:49:24 +0000
(11:49 -0700)
committer
Kevin Sawicki
<kevinsawicki@gmail.com>
Fri, 30 Sep 2016 17:43:43 +0000
(10:43 -0700)
atom/browser/native_window_mac.mm
patch
|
blob
|
history
diff --git
a/atom/browser/native_window_mac.mm
b/atom/browser/native_window_mac.mm
index
931d635
..
98e8d4b
100644
(file)
--- a/
atom/browser/native_window_mac.mm
+++ b/
atom/browser/native_window_mac.mm
@@
-740,8
+740,9
@@
bool NativeWindowMac::IsFocused() {
void NativeWindowMac::Show() {
if (is_modal() && parent()) {
- [parent()->GetNativeWindow() beginSheet:window_
- completionHandler:^(NSModalResponse) {}];
+ if ([window_ sheetParent] == nil)
+ [parent()->GetNativeWindow() beginSheet:window_
+ completionHandler:^(NSModalResponse) {}];
return;
}