Fix for toolbar item minsize/maxsize mismatch.

[cappuccino#85 state:resolved] Reviewed by ross.
280north · Oct 3, 2008 · cbcd3bb · cbcd3bb
1 parent 7a69d6e
commit cbcd3bb
Showing 1 changed file with 8 additions and 2 deletions.
diff --git 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