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

Pass arguments instance through the chain in order to throw error

Browse source
This commit is contained in:
Samuel Attard 2018-02-27 16:11:54 +11:00
parent e84d7c0cda
commit 5336b4a89c
6 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/api/atom_api_browser_window.cc
View file

@ -1082,8 +1082,13 @@ void BrowserWindow::ToggleTabBar() {
window_->ToggleTabBar(); window_->ToggleTabBar();
} }
void BrowserWindow::AddTabbedWindow(NativeWindow* window) { void BrowserWindow::AddTabbedWindow(mate::Arguments* args) {
window_->AddTabbedWindow(window); NativeWindow* window;
if (!args->GetNext(&window)) {
args->ThrowError("Insert good error message here");
return;
}
window_->AddTabbedWindow(window, args);
} }
void BrowserWindow::SetVibrancy(mate::Arguments* args) { void BrowserWindow::SetVibrancy(mate::Arguments* args) {

2
atom/browser/api/atom_api_browser_window.h
View file

@ -243,7 +243,7 @@ class BrowserWindow : public mate::TrackableObject<BrowserWindow>,
void MergeAllWindows(); void MergeAllWindows();
void MoveTabToNewWindow(); void MoveTabToNewWindow();
void ToggleTabBar(); void ToggleTabBar();
void AddTabbedWindow(NativeWindow* window); void AddTabbedWindow(mate::Arguments* args);
void SetVibrancy(mate::Arguments* args); void SetVibrancy(mate::Arguments* args);
void SetTouchBar(const std::vector<mate::PersistentDictionary>& items); void SetTouchBar(const std::vector<mate::PersistentDictionary>& items);

2
atom/browser/native_window.cc
View file

@ -336,7 +336,7 @@ void NativeWindow::MoveTabToNewWindow() {
void NativeWindow::ToggleTabBar() { void NativeWindow::ToggleTabBar() {
} }
void NativeWindow::AddTabbedWindow(NativeWindow* window) { void NativeWindow::AddTabbedWindow(NativeWindow* window, mate::Arguments* args) {
} }
void NativeWindow::SetVibrancy(const std::string& filename) { void NativeWindow::SetVibrancy(const std::string& filename) {

2
atom/browser/native_window.h
View file

@ -192,7 +192,7 @@ class NativeWindow : public base::SupportsUserData,
virtual void MergeAllWindows(); virtual void MergeAllWindows();
virtual void MoveTabToNewWindow(); virtual void MoveTabToNewWindow();
virtual void ToggleTabBar(); virtual void ToggleTabBar();
virtual void AddTabbedWindow(NativeWindow* window); virtual void AddTabbedWindow(NativeWindow* window, mate::Arguments* args);
// Webview APIs. // Webview APIs.
virtual void FocusOnWebView(); virtual void FocusOnWebView();

2
atom/browser/native_window_mac.h
View file

@ -109,7 +109,7 @@ class NativeWindowMac : public NativeWindow {
void MergeAllWindows() override; void MergeAllWindows() override;
void MoveTabToNewWindow() override; void MoveTabToNewWindow() override;
void ToggleTabBar() override; void ToggleTabBar() override;
void AddTabbedWindow(NativeWindow* window) override; void AddTabbedWindow(NativeWindow* window, mate::Arguments* args) override;
void SetVibrancy(const std::string& type) override; void SetVibrancy(const std::string& type) override;
void SetTouchBar( void SetTouchBar(

5
atom/browser/native_window_mac.mm
View file

@ -918,6 +918,7 @@ NativeWindowMac::NativeWindowMac(
} }
if (transparent()) { if (transparent()) {
NSLog(@"Setting transparent");
// Setting the background color to clear will also hide the shadow. // Setting the background color to clear will also hide the shadow.
[window_ setBackgroundColor:[NSColor clearColor]]; [window_ setBackgroundColor:[NSColor clearColor]];
} }
@ -1671,9 +1672,9 @@ void NativeWindowMac::ToggleTabBar() {
} }
} }
void NativeWindowMac::AddTabbedWindow(NativeWindow* window) { void NativeWindowMac::AddTabbedWindow(NativeWindow* window, mate::Arguments* args) {
if (window_.get() == window->GetNativeWindow()) { if (window_.get() == window->GetNativeWindow()) {
NSLog(@"Error: AddTabbedWindow cannot be called by a window on itself."); args->ThrowError("AddTabbedWindow cannot be called by a window on itself");
} else { } else {
if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)]) { if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)]) {
[window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove]; [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];