Merge pull request #2250 from EyeSee360/master

Maintain an aspect ratio for content within a window

atom/browser/api/atom_api_window.cc

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

atom/browser/api/atom_api_window.h

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

atom/browser/native_window.cc

@@ -195,6 +195,20 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
     Show();
 }
 
+double NativeWindow::GetAspectRatio() {
+  return aspectRatio_;
+}
+
+gfx::Size NativeWindow::GetAspectRatioExtraSize() {
+  return aspectRatioExtraSize_;
+}
+
+void NativeWindow::SetAspectRatio(double aspectRatio,
+                                  const gfx::Size& extraSize) {
+  aspectRatio_ = aspectRatio;
+  aspectRatioExtraSize_ = extraSize;
+}
+
 void NativeWindow::SetSize(const gfx::Size& size) {
   SetBounds(gfx::Rect(GetPosition(), size));
 }

atom/browser/native_window.h

@@ -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 GetAspectRatio();
+  virtual gfx::Size GetAspectRatioExtraSize();
+  virtual void SetAspectRatio(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,11 @@ 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 aspectRatio_ = 0.0;
+  gfx::Size aspectRatioExtraSize_;
+
   // The page this window is viewing.
   brightray::InspectableWebContents* inspectable_web_contents_;
 

atom/browser/native_window_mac.mm

@@ -95,6 +95,33 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
   shell_->NotifyWindowBlur();
 }
 
+- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize {
+  NSSize newSize = frameSize;
+  double aspectRatio = shell_->GetAspectRatio();
+
+  if (aspectRatio > 0.0) {
+    gfx::Size windowFrameSize = shell_->GetSize();
+    gfx::Size contentViewSize = shell_->GetContentSize();
+    gfx::Size aspectRatioExtraSize = shell_->GetAspectRatioExtraSize();
+    double extraWidthPlusFrame = windowFrameSize.width() - contentViewSize.width() + aspectRatioExtraSize.width();
+    double extraHeightPlusFrame = windowFrameSize.height() - contentViewSize.height() + aspectRatioExtraSize.height();
+
+    newSize.width = roundf(((frameSize.height - extraHeightPlusFrame) * aspectRatio) + 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) / aspectRatio) + extraHeightPlusFrame);
+    }
+    else {
+        newSize.height = roundf(((frameSize.width - extraWidthPlusFrame) / aspectRatio) + extraHeightPlusFrame);
+        newSize.width = roundf(((newSize.height - extraHeightPlusFrame) * aspectRatio) + extraWidthPlusFrame);
+    }
+  }
+
+  return newSize;
+}
+
 - (void)windowDidResize:(NSNotification*)notification {
   if (!shell_->has_frame())
     shell_->ClipWebView();