diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index 0266d49a85d5..64847154bcc2 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -371,12 +371,10 @@ std::vector Window::GetMaximumSize() { return result; } -void Window::SetSheetOffset(double offsetY) { - window_->SetSheetOffset(offsetY); -} - -void Window::SetSheetOffsets(double offsetX, double offsetY) { - window_->SetSheetOffsets(offsetX, offsetY); +void Window::SetSheetOffset(double offsetY, mate::Arguments* args) { + double offsetX = 0.0; + args->GetNext(&offsetX); + window_->SetSheetOffset(offsetX, offsetY); } void Window::SetResizable(bool resizable) { @@ -686,7 +684,6 @@ void Window::BuildPrototype(v8::Isolate* isolate, .SetMethod("setMaximumSize", &Window::SetMaximumSize) .SetMethod("getMaximumSize", &Window::GetMaximumSize) .SetMethod("setSheetOffset", &Window::SetSheetOffset) - .SetMethod("setSheetOffsets", &Window::SetSheetOffsets) .SetMethod("setResizable", &Window::SetResizable) .SetMethod("isResizable", &Window::IsResizable) .SetMethod("setMovable", &Window::SetMovable) diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 2eef725eaca8..d44f706f7011 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -110,8 +110,7 @@ class Window : public mate::TrackableObject, std::vector GetMinimumSize(); void SetMaximumSize(int width, int height); std::vector GetMaximumSize(); - void SetSheetOffset(double offsetY); - void SetSheetOffsets(double offsetX, double offsetY); + void SetSheetOffset(double offsetY, mate::Arguments* args); void SetResizable(bool resizable); bool IsResizable(); void SetMovable(bool movable); diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index af874cae483d..39848d8dd094 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -255,11 +255,7 @@ gfx::Size NativeWindow::GetMaximumSize() { return GetSizeConstraints().GetMaximumSize(); } -void NativeWindow::SetSheetOffset(const double offsetY) { - sheet_offset_y_ = offsetY; -} - -void NativeWindow::SetSheetOffsets(const double offsetX, const double offsetY) { +void NativeWindow::SetSheetOffset(const double offsetX, const double offsetY) { sheet_offset_x_ = offsetX; sheet_offset_y_ = offsetY; } diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index 813eeb53126d..f4fae05f14b3 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -123,8 +123,7 @@ class NativeWindow : public base::SupportsUserData, virtual gfx::Size GetMinimumSize(); virtual void SetMaximumSize(const gfx::Size& size); virtual gfx::Size GetMaximumSize(); - virtual void SetSheetOffset(const double offsetY); - virtual void SetSheetOffsets(const double offsetX, const double offsetY); + virtual void SetSheetOffset(const double offsetX, const double offsetY); virtual double GetSheetOffsetX(); virtual double GetSheetOffsetY(); virtual void SetResizable(bool resizable) = 0;