add warning when addTabbedWindow is called on self #12059
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atom/browser/native_window_mac.mm
Outdated
| if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)]) { | ||
| [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove]; | ||
| if (window_.get() == window->GetNativeWindow()) { | ||
| NSLog(@"Error: AddTabbedWindow cannot be called by a window on itself."); |
There was a problem hiding this comment.
This doesn't go over JS logs, can we do ThrowError instead (pass in mate::arguments or something)
deepak1556
reviewed
Feb 27, 2018
| window_->AddTabbedWindow(window); | ||
| void BrowserWindow::AddTabbedWindow(NativeWindow* window, | ||
| mate::Arguments* args) { | ||
| window_->AddTabbedWindow(window, args); |
There was a problem hiding this comment.
We shouldn't be processing/using native-mate outside the api layer, can you instead change the signature of NativeWindow::AddTabbedWindow to have a return value and throw error in api::BrowserWindow ? Thanks!
deepak1556
approved these changes
Feb 28, 2018
atom/browser/native_window_mac.mm
Outdated
| @@ -918,6 +918,7 @@ static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val, | |||
| } | |||
|
|
|||
| if (transparent()) { | |||
| NSLog(@"Setting transparent"); | |||
There was a problem hiding this comment.
I believe this is not related to the PR.
There was a problem hiding this comment.
Woops, had that in my staged env 🏃
| void BrowserWindow::AddTabbedWindow(NativeWindow* window) { | ||
| window_->AddTabbedWindow(window); | ||
| void BrowserWindow::AddTabbedWindow(NativeWindow* window, | ||
| mate::Arguments* args) { |
There was a problem hiding this comment.
Can you run clang-format to fix style issue.
alexeykuzmin
pushed a commit
that referenced
this pull request
Mar 8, 2018
add warning when addTabbedWindow is called on self (cherry picked from commit dfa1dc4)
alexeykuzmin
pushed a commit
that referenced
this pull request
Mar 8, 2018
add warning when addTabbedWindow is called on self (cherry picked from commit dfa1dc4)
alexeykuzmin
added a commit
that referenced
this pull request
Mar 8, 2018
Merge pull request #12059 from electron/add-tabbedwindow-warning
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #12046.
Per documentation, you can't add a tabbed window with the same window; you need to create a new one. When you add a new window, you need to pass in a value for
NSWindowOrderingMode, which can be onlyNSWindowAbove,NSWindowBelow, orNSWindowOut. As you can't set a window above or below itself, this will crash it.This PR catches attempts to do the above and instead outputs an error explaining that it must be called on a new window.
/cc @bpasero @MarshallOfSound