add function maintainAspectRatioOfInteriorContent to BrowserWindow in order to enforce an aspect ratio for an electron window

This commit is contained in:
Michael S. Barthelemy 2015-07-16 13:54:51 -04:00
Родитель ca2cb9c9ba
Коммит 666aca7803
5 изменённых файлов: 53 добавлений и 0 удалений

Просмотреть файл

@ -249,6 +249,10 @@ bool Window::IsFullscreen() {
return window_->IsFullscreen();
}
void Window::MaintainAspectRatioOfInteriorContent(double aspectRatio, double extraWidth, double extraHeight) {
window_->MaintainAspectRatioOfInteriorContent(aspectRatio, gfx::Size(extraWidth, extraHeight));
}
void Window::SetBounds(const gfx::Rect& bounds) {
window_->SetBounds(bounds);
}
@ -498,6 +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("getBounds", &Window::GetBounds)
.SetMethod("setBounds", &Window::SetBounds)
.SetMethod("getSize", &Window::GetSize)

Просмотреть файл

@ -95,6 +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 SetBounds(const gfx::Rect& bounds);
gfx::Rect GetBounds();
void SetSize(int width, int height);

Просмотреть файл

@ -195,6 +195,19 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
Show();
}
double NativeWindow::GetInteriorContentAspectRatio() {
return interiorContentAspectRatio;
}
gfx::Size NativeWindow::GetInteriorContentExtraSize() {
return interiorContentExtraSize;
}
void NativeWindow::MaintainAspectRatioOfInteriorContent(double aspectRatio, const gfx::Size& extraSize) {
interiorContentAspectRatio = aspectRatio;
interiorContentExtraSize = extraSize;
}
void NativeWindow::SetSize(const gfx::Size& size) {
SetBounds(gfx::Rect(GetPosition(), size));
}

Просмотреть файл

@ -107,6 +107,9 @@ class NativeWindow : public content::WebContentsObserver,
virtual bool IsMinimized() = 0;
virtual void SetFullScreen(bool fullscreen) = 0;
virtual bool IsFullscreen() const = 0;
double GetInteriorContentAspectRatio();
virtual gfx::Size GetInteriorContentExtraSize();
virtual void MaintainAspectRatioOfInteriorContent(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);
@ -285,6 +288,10 @@ class NativeWindow : public content::WebContentsObserver,
// Page's default zoom factor.
double zoom_factor_;
// Used to maintain the aspect ratio of a view which is inside of the content view.
double interiorContentAspectRatio = 0.0;
gfx::Size interiorContentExtraSize;
// The page this window is viewing.
brightray::InspectableWebContents* inspectable_web_contents_;

Просмотреть файл

@ -95,6 +95,33 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
shell_->NotifyWindowBlur();
}
- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize {
NSSize newSize = frameSize;
double interiorContentAspectRatio = shell_->GetInteriorContentAspectRatio();
if (interiorContentAspectRatio > 0.0) {
NSRect windowFrame = [sender frame];
NSRect contentViewBounds = [[sender contentView] bounds];
gfx::Size interiorContentExtraSize = shell_->GetInteriorContentExtraSize();
double extraWidthPlusFrame = windowFrame.size.width - contentViewBounds.size.width + interiorContentExtraSize.width();
double extraHeightPlusFrame = windowFrame.size.height - contentViewBounds.size.height + interiorContentExtraSize.height();
newSize.width = roundf(((frameSize.height - extraHeightPlusFrame) * interiorContentAspectRatio) + extraWidthPlusFrame);
// If the new width is less than the frame size use it as the primary constraint. This ensures that the value returned
// by this method will never be larger than the users requested window size.
if (newSize.width < frameSize.width) {
newSize.height = roundf(((newSize.width - extraWidthPlusFrame) / interiorContentAspectRatio) + extraHeightPlusFrame);
}
else {
newSize.width = roundf(((newSize.height - extraHeightPlusFrame) * interiorContentAspectRatio) + extraWidthPlusFrame);
newSize.height = roundf(((frameSize.width - extraWidthPlusFrame) / interiorContentAspectRatio) + extraHeightPlusFrame);
}
}
return newSize;
}
- (void)windowDidResize:(NSNotification*)notification {
if (!shell_->has_frame())
shell_->ClipWebView();