github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-23 14:28:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
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();
}
void Window::MaintainAspectRatioOfInteriorContent(double aspectRatio, double extraWidth, double extraHeight) {
window_->MaintainAspectRatioOfInteriorContent(aspectRatio, gfx::Size(extraWidth, extraHeight));
void Window::MaintainContentAspectRatio(double aspectRatio, double width, double height) {
window_->MaintainContentAspectRatio(aspectRatio, gfx::Size(width, height));
}
void Window::SetBounds(const gfx::Rect& bounds) {
@@ -502,7 +502,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isMinimized", &Window::IsMinimized)
.SetMethod("setFullScreen", &Window::SetFullScreen)
.SetMethod("isFullScreen", &Window::IsFullscreen)
.SetMethod("maintainAspectRatioOfInteriorContent", &Window::MaintainAspectRatioOfInteriorContent)
.SetMethod("maintainContentAspectRatio", &Window::MaintainContentAspectRatio)
.SetMethod("getBounds", &Window::GetBounds)
.SetMethod("setBounds", &Window::SetBounds)
.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();
void SetFullScreen(bool fullscreen);
bool IsFullscreen();
void MaintainAspectRatioOfInteriorContent(double aspectRatio, double extraWidth, double extraHeight);
void MaintainContentAspectRatio(double aspectRatio, double width, double height);
void SetBounds(const gfx::Rect& bounds);
gfx::Rect GetBounds();
void SetSize(int width, int height);

2
atom/browser/native_window.cc
View File

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

2
atom/browser/native_window.h
View File

@@ -109,7 +109,7 @@ class NativeWindow : public content::WebContentsObserver,
virtual bool IsFullscreen() const = 0;
double GetInteriorContentAspectRatio();
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 gfx::Rect GetBounds() = 0;
virtual void SetSize(const gfx::Size& size);