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

Keep function placement consistent

Browse source
This commit is contained in:
Ben Gotow 2016-04-18 22:45:38 -07:00
parent 8f89cd2d59
commit 414245f4d8
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -440,6 +440,10 @@ std::vector<int> Window::GetMaximumSize() {
return result; return result;
} }
void Window::SetSheetOffset(double offset) {
window_->SetSheetOffset(offset);
}
void Window::SetResizable(bool resizable) { void Window::SetResizable(bool resizable) {
window_->SetResizable(resizable); window_->SetResizable(resizable);
} }
@ -514,10 +518,6 @@ std::vector<int> Window::GetPosition() {
return result; return result;
} }
void Window::SetSheetOffset(double offset) {
window_->SetSheetOffset(offset);
}
void Window::SetTitle(const std::string& title) { void Window::SetTitle(const std::string& title) {
window_->SetTitle(title); window_->SetTitle(title);
} }
@ -750,6 +750,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("getMinimumSize", &Window::GetMinimumSize) .SetMethod("getMinimumSize", &Window::GetMinimumSize)
.SetMethod("setMaximumSize", &Window::SetMaximumSize) .SetMethod("setMaximumSize", &Window::SetMaximumSize)
.SetMethod("getMaximumSize", &Window::GetMaximumSize) .SetMethod("getMaximumSize", &Window::GetMaximumSize)
.SetMethod("setSheetOffset", &Window::SetSheetOffset)
.SetMethod("setResizable", &Window::SetResizable) .SetMethod("setResizable", &Window::SetResizable)
.SetMethod("isResizable", &Window::IsResizable) .SetMethod("isResizable", &Window::IsResizable)
.SetMethod("setMovable", &Window::SetMovable) .SetMethod("setMovable", &Window::SetMovable)
@ -767,7 +768,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("center", &Window::Center) .SetMethod("center", &Window::Center)
.SetMethod("setPosition", &Window::SetPosition) .SetMethod("setPosition", &Window::SetPosition)
.SetMethod("getPosition", &Window::GetPosition) .SetMethod("getPosition", &Window::GetPosition)
.SetMethod("setSheetOffset", &Window::SetSheetOffset)
.SetMethod("setTitle", &Window::SetTitle) .SetMethod("setTitle", &Window::SetTitle)
.SetMethod("getTitle", &Window::GetTitle) .SetMethod("getTitle", &Window::GetTitle)
.SetMethod("flashFrame", &Window::FlashFrame) .SetMethod("flashFrame", &Window::FlashFrame)

5
atom/browser/native_window.h
View file

@ -123,6 +123,8 @@ 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 offset);
virtual double GetSheetOffset();
virtual void SetResizable(bool resizable) = 0; virtual void SetResizable(bool resizable) = 0;
virtual bool IsResizable() = 0; virtual bool IsResizable() = 0;
virtual void SetMovable(bool movable) = 0; virtual void SetMovable(bool movable) = 0;
@ -190,9 +192,6 @@ class NativeWindow : public base::SupportsUserData,
gfx::Size GetAspectRatioExtraSize(); gfx::Size GetAspectRatioExtraSize();
void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size); void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size);
void SetSheetOffset(const double offset);
double GetSheetOffset();
base::WeakPtr<NativeWindow> GetWeakPtr() { base::WeakPtr<NativeWindow> GetWeakPtr() {
return weak_factory_.GetWeakPtr(); return weak_factory_.GetWeakPtr();
} }