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

changes requested for pull request #2250 into electron master

Browse source
This commit is contained in:
Michael S. Barthelemy 2015-07-22 10:23:31 -04:00
parent 6656afd57f
commit 6d25c81bd1
6 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/native_window.cc
View file

@ -195,18 +195,18 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
Show();
}
double NativeWindow::GetInteriorContentAspectRatio() {
return interiorContentAspectRatio;
double NativeWindow::GetAspectRatio() {
return aspectRatio_;
}
gfx::Size NativeWindow::GetInteriorContentExtraSize() {
return interiorContentExtraSize;
gfx::Size NativeWindow::GetAspectRatioExtraSize() {
return aspectRatioExtraSize_;
}
void NativeWindow::MaintainContentAspectRatio(double aspectRatio,
const gfx::Size& extraSize) {
interiorContentAspectRatio = aspectRatio;
interiorContentExtraSize = extraSize;
void NativeWindow::SetAspectRatio(double aspectRatio,
const gfx::Size& extraSize) {
aspectRatio_ = aspectRatio;
aspectRatioExtraSize_ = extraSize;
}
void NativeWindow::SetSize(const gfx::Size& size) {