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

extend setSheetOffset to accept an optional 2nd offset

Browse source
This commit is contained in:
leethomas 2016-05-19 20:19:08 -07:00
parent eaacbc86c7
commit 7d93642f42
4 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/api/atom_api_window.cc
View file

@ -371,12 +371,10 @@ std::vector<int> Window::GetMaximumSize() {
return result; return result;
} }
void Window::SetSheetOffset(double offsetY) { void Window::SetSheetOffset(double offsetY, mate::Arguments* args) {
window_->SetSheetOffset(offsetY); double offsetX = 0.0;
} args->GetNext(&offsetX);
window_->SetSheetOffset(offsetX, offsetY);
void Window::SetSheetOffsets(double offsetX, double offsetY) {
window_->SetSheetOffsets(offsetX, offsetY);
} }
void Window::SetResizable(bool resizable) { void Window::SetResizable(bool resizable) {
@ -686,7 +684,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("setMaximumSize", &Window::SetMaximumSize) .SetMethod("setMaximumSize", &Window::SetMaximumSize)
.SetMethod("getMaximumSize", &Window::GetMaximumSize) .SetMethod("getMaximumSize", &Window::GetMaximumSize)
.SetMethod("setSheetOffset", &Window::SetSheetOffset) .SetMethod("setSheetOffset", &Window::SetSheetOffset)
.SetMethod("setSheetOffsets", &Window::SetSheetOffsets)
.SetMethod("setResizable", &Window::SetResizable) .SetMethod("setResizable", &Window::SetResizable)
.SetMethod("isResizable", &Window::IsResizable) .SetMethod("isResizable", &Window::IsResizable)
.SetMethod("setMovable", &Window::SetMovable) .SetMethod("setMovable", &Window::SetMovable)

3
atom/browser/api/atom_api_window.h
View file

@ -110,8 +110,7 @@ class Window : public mate::TrackableObject<Window>,
std::vector<int> GetMinimumSize(); std::vector<int> GetMinimumSize();
void SetMaximumSize(int width, int height); void SetMaximumSize(int width, int height);
std::vector<int> GetMaximumSize(); std::vector<int> GetMaximumSize();
void SetSheetOffset(double offsetY); void SetSheetOffset(double offsetY, mate::Arguments* args);
void SetSheetOffsets(double offsetX, double offsetY);
void SetResizable(bool resizable); void SetResizable(bool resizable);
bool IsResizable(); bool IsResizable();
void SetMovable(bool movable); void SetMovable(bool movable);

6
atom/browser/native_window.cc
View file

@ -255,11 +255,7 @@ gfx::Size NativeWindow::GetMaximumSize() {
return GetSizeConstraints().GetMaximumSize(); return GetSizeConstraints().GetMaximumSize();
} }
void NativeWindow::SetSheetOffset(const double offsetY) { void NativeWindow::SetSheetOffset(const double offsetX, const double offsetY) {
sheet_offset_y_ = offsetY;
}
void NativeWindow::SetSheetOffsets(const double offsetX, const double offsetY) {
sheet_offset_x_ = offsetX; sheet_offset_x_ = offsetX;
sheet_offset_y_ = offsetY; sheet_offset_y_ = offsetY;
} }

3
atom/browser/native_window.h
View file

@ -123,8 +123,7 @@ class NativeWindow : public base::SupportsUserData,
virtual gfx::Size GetMinimumSize(); virtual gfx::Size GetMinimumSize();
virtual void SetMaximumSize(const gfx::Size& size); virtual void SetMaximumSize(const gfx::Size& size);
virtual gfx::Size GetMaximumSize(); virtual gfx::Size GetMaximumSize();
virtual void SetSheetOffset(const double offsetY); virtual void SetSheetOffset(const double offsetX, const double offsetY);
virtual void SetSheetOffsets(const double offsetX, const double offsetY);
virtual double GetSheetOffsetX(); virtual double GetSheetOffsetX();
virtual double GetSheetOffsetY(); virtual double GetSheetOffsetY();
virtual void SetResizable(bool resizable) = 0; virtual void SetResizable(bool resizable) = 0;