From 4605130a53c838a0d79ae3584146e0c06333914c Mon Sep 17 00:00:00 2001
From: Andrew Hankinson <andrew.hankinson@gmail.com>
Date: Sat, 2 Mar 2013 16:40:00 -0500
Subject: [PATCH] Fix #357: Fix resizeWithOldSuperviewSize to work more like
 Cocoa

Without this fix, CPView's resizeWithOldSuperviewSize: would simply resize subviews at the rate of 1 pixel for every 2 pixel change.

This change introduces a new method of resizing views to a ratio of the size of the superview.

Patch contributed by @davidkhess
---
 AppKit/CPView.j | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index 49e0e4aea..f66d7056d 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -1188,20 +1188,27 @@ var CPViewFlags                     = { },
 
     var frame = _superview._frame,
         newFrame = _CGRectMakeCopy(_frame),
-        dX = (_CGRectGetWidth(frame) - aSize.width) /
-            (((mask & CPViewMinXMargin) ? 1 : 0) + (mask & CPViewWidthSizable ? 1 : 0) + (mask & CPViewMaxXMargin ? 1 : 0)),
-        dY = (_CGRectGetHeight(frame) - aSize.height) /
-            ((mask & CPViewMinYMargin ? 1 : 0) + (mask & CPViewHeightSizable ? 1 : 0) + (mask & CPViewMaxYMargin ? 1 : 0));
+        dX = frame.size.width - aSize.width,
+        dY = frame.size.height - aSize.height,
+        evenFractionX = 1.0 / ((mask & CPViewMinXMargin ? 1 : 0) + (mask & CPViewWidthSizable ? 1 : 0) + (mask & CPViewMaxXMargin ? 1 : 0)),
+        evenFractionY = 1.0 / ((mask & CPViewMinYMargin ? 1 : 0) + (mask & CPViewHeightSizable ? 1 : 0) + (mask & CPViewMaxYMargin ? 1 : 0)),
+        baseX = (mask & CPViewMinXMargin    ? _frame.origin.x : 0) +
+                (mask & CPViewWidthSizable  ? _frame.size.width : 0) +
+                (mask & CPViewMaxXMargin    ? aSize.width - _frame.size.width - _frame.origin.x : 0),
+        baseY = (mask & CPViewMinYMargin    ? _frame.origin.y : 0) +
+                (mask & CPViewHeightSizable ? _frame.size.height : 0) +
+                (mask & CPViewMaxYMargin    ? aSize.height - _frame.size.height - _frame.origin.y : 0);
+
 
     if (mask & CPViewMinXMargin)
-        newFrame.origin.x += dX;
+        newFrame.origin.x += dX * (baseX > 0 ? _frame.origin.x / baseX : evenFractionX);
     if (mask & CPViewWidthSizable)
-        newFrame.size.width += dX;
+        newFrame.size.width += dX * (baseX > 0 ? _frame.size.width / baseX : evenFractionX);
 
     if (mask & CPViewMinYMargin)
-        newFrame.origin.y += dY;
+        newFrame.origin.y += dY * (baseY > 0 ? _frame.origin.y / baseY : evenFractionY);
     if (mask & CPViewHeightSizable)
-        newFrame.size.height += dY;
+        newFrame.size.height += dY * (baseY > 0 ? _frame.size.height / baseY : evenFractionY);
 
     [self setFrame:newFrame];
 }