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

wrap lines to meet Travis CI build requirements

Browse source
This commit is contained in:
Michael S. Barthelemy 2015-07-16 14:45:27 -04:00
parent 7cdfa44438
commit d0c6176640
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,7 +249,8 @@ bool Window::IsFullscreen() {
return window_->IsFullscreen();
}
void Window::MaintainContentAspectRatio(double aspectRatio, double width, double height) {
void Window::MaintainContentAspectRatio(double aspectRatio,
double width, double height) {
window_->MaintainContentAspectRatio(aspectRatio, gfx::Size(width, height));
}
@ -502,7 +503,8 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isMinimized", &Window::IsMinimized)
.SetMethod("setFullScreen", &Window::SetFullScreen)
.SetMethod("isFullScreen", &Window::IsFullscreen)
.SetMethod("maintainContentAspectRatio", &Window::MaintainContentAspectRatio)
.SetMethod("maintainContentAspectRatio",
&Window::MaintainContentAspectRatio)
.SetMethod("getBounds", &Window::GetBounds)
.SetMethod("setBounds", &Window::SetBounds)
.SetMethod("getSize", &Window::GetSize)

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

@ -95,7 +95,8 @@ class Window : public mate::TrackableObject<Window>,
bool IsMinimized();
void SetFullScreen(bool fullscreen);
bool IsFullscreen();
void MaintainContentAspectRatio(double aspectRatio, double width, double height);
void MaintainContentAspectRatio(double aspectRatio,
double width, double height);
void SetBounds(const gfx::Rect& bounds);
gfx::Rect GetBounds();
void SetSize(int width, int height);

3
atom/browser/native_window.cc
View file

@ -203,7 +203,8 @@ gfx::Size NativeWindow::GetInteriorContentExtraSize() {
return interiorContentExtraSize;
}
void NativeWindow::MaintainContentAspectRatio(double aspectRatio, const gfx::Size& extraSize) {
void NativeWindow::MaintainContentAspectRatio(double aspectRatio,
const gfx::Size& extraSize) {
interiorContentAspectRatio = aspectRatio;
interiorContentExtraSize = extraSize;
}

3
atom/browser/native_window.h
View file

@ -109,7 +109,8 @@ class NativeWindow : public content::WebContentsObserver,
virtual bool IsFullscreen() const = 0;
double GetInteriorContentAspectRatio();
virtual gfx::Size GetInteriorContentExtraSize();
virtual void MaintainContentAspectRatio(double aspectRatio, const gfx::Size& extraSize);
virtual void MaintainContentAspectRatio(double aspectRatio,
const gfx::Size& extraSize);
virtual void SetBounds(const gfx::Rect& bounds) = 0;
virtual gfx::Rect GetBounds() = 0;
virtual void SetSize(const gfx::Size& size);