From cbcd3bbbb67c3a72af7caf8372378a5b8d6f128e Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Fri, 3 Oct 2008 13:15:14 -0700
Subject: [PATCH] Fix for toolbar item minsize/maxsize mismatch.

[#85 state:resolved]

Reviewed by ross.
---
 AppKit/CPToolbarItem.j | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/AppKit/CPToolbarItem.j b/AppKit/CPToolbarItem.j
index 94dbd9f35..95eee5626 100644
--- a/AppKit/CPToolbarItem.j
+++ b/AppKit/CPToolbarItem.j
@@ -313,7 +313,10 @@ var _CPToolbarSeparatorItemView         = nil;
 */
 - (void)setMinSize:(CGSize)aMinSize
 {
-    _minSize = CGSizeCreateCopy(aMinSize);
+    _minSize = CGSizeMakeCopy(aMinSize);
+    
+    // Try to provide some sanity: Make maxSize >= minSize
+    _maxSize = CGSizeMake(MAX(_minSize.width, _maxSize.width), MAX(_minSize.height, _maxSize.height));
 }
 
 /*
@@ -330,7 +333,10 @@ var _CPToolbarSeparatorItemView         = nil;
 */
 - (void)setMaxSize:(CGSize)aMaxSize
 {
-    _maxSize = CGSizeCreateCopy(aMaxSize);
+    _maxSize = CGSizeMakeCopy(aMaxSize);
+    
+    // Try to provide some sanity: Make minSize <= maxSize
+    _minSize = CGSizeMake(MIN(_minSize.width, _maxSize.width), MIN(_minSize.height, _maxSize.height));
 }
 
 // Visibility Priority