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

shorten names

Browse source
This commit is contained in:
Michael S. Barthelemy 2015-07-16 14:31:01 -04:00
parent 10faf314d4
commit 7cdfa44438
4 changed files with 6 additions and 6 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,8 +249,8 @@ bool Window::IsFullscreen() {
return window_->IsFullscreen(); return window_->IsFullscreen();
} }
void Window::MaintainAspectRatioOfInteriorContent(double aspectRatio, double extraWidth, double extraHeight) { void Window::MaintainContentAspectRatio(double aspectRatio, double width, double height) {
window_->MaintainAspectRatioOfInteriorContent(aspectRatio, gfx::Size(extraWidth, extraHeight)); window_->MaintainContentAspectRatio(aspectRatio, gfx::Size(width, height));
} }
void Window::SetBounds(const gfx::Rect& bounds) { void Window::SetBounds(const gfx::Rect& bounds) {
@ -502,7 +502,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isMinimized", &Window::IsMinimized) .SetMethod("isMinimized", &Window::IsMinimized)
.SetMethod("setFullScreen", &Window::SetFullScreen) .SetMethod("setFullScreen", &Window::SetFullScreen)
.SetMethod("isFullScreen", &Window::IsFullscreen) .SetMethod("isFullScreen", &Window::IsFullscreen)
.SetMethod("maintainAspectRatioOfInteriorContent", &Window::MaintainAspectRatioOfInteriorContent) .SetMethod("maintainContentAspectRatio", &Window::MaintainContentAspectRatio)
.SetMethod("getBounds", &Window::GetBounds) .SetMethod("getBounds", &Window::GetBounds)
.SetMethod("setBounds", &Window::SetBounds) .SetMethod("setBounds", &Window::SetBounds)
.SetMethod("getSize", &Window::GetSize) .SetMethod("getSize", &Window::GetSize)

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

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

2
atom/browser/native_window.cc
View file

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

2
atom/browser/native_window.h
View file

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