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

move native-mate back into the api layer

Browse source
This commit is contained in:
Shelley Vohr 2018-02-27 13:00:42 -08:00
parent 837a2d4bbd
commit 2abc69780e
No known key found for this signature in database
GPG key ID: F13993A75599653C
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1084,7 +1084,9 @@ void BrowserWindow::ToggleTabBar() {
void BrowserWindow::AddTabbedWindow(NativeWindow* window, void BrowserWindow::AddTabbedWindow(NativeWindow* window,
mate::Arguments* args) { mate::Arguments* args) {
window_->AddTabbedWindow(window, args); const bool windowAdded = window_->AddTabbedWindow(window);
if (!windowAdded)
args->ThrowError("AddTabbedWindow cannot be called by a window on itself");
} }
void BrowserWindow::SetVibrancy(mate::Arguments* args) { void BrowserWindow::SetVibrancy(mate::Arguments* args) {

4
atom/browser/native_window.cc
View file

@ -336,8 +336,8 @@ void NativeWindow::MoveTabToNewWindow() {
void NativeWindow::ToggleTabBar() { void NativeWindow::ToggleTabBar() {
} }
void NativeWindow::AddTabbedWindow(NativeWindow* window, bool NativeWindow::AddTabbedWindow(NativeWindow* window) {
mate::Arguments* args) { return true; // for non-Mac platforms
} }
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, mate::Arguments* args); virtual bool AddTabbedWindow(NativeWindow* window);
// 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, mate::Arguments* args) override; bool AddTabbedWindow(NativeWindow* window) override;
void SetVibrancy(const std::string& type) override; void SetVibrancy(const std::string& type) override;
void SetTouchBar( void SetTouchBar(

8
atom/browser/native_window_mac.mm
View file

@ -1672,14 +1672,14 @@ void NativeWindowMac::ToggleTabBar() {
} }
} }
void NativeWindowMac::AddTabbedWindow(NativeWindow* window, mate::Arguments* args) { bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
if (window_.get() == window->GetNativeWindow()) { if (window_.get() == window->GetNativeWindow()) {
args->ThrowError("AddTabbedWindow cannot be called by a window on itself"); return false;
} 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];
}
} }
return true;
} }
void NativeWindowMac::SetRenderWidgetHostOpaque(bool opaque) { void NativeWindowMac::SetRenderWidgetHostOpaque(bool opaque) {