Changeset 1009

Timestamp:

Oct 15, 2006, 7:24:08 PM (16 years ago)

Author:

livings124

Message:

if there's not enough room to allow the window to expand to show the status/filter bars, first make the window smaller.

File:

• trunk/macosx/Controller.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -1766 +1766 @@
     if (!show)
         heightChange *= -1;
+    
+    //allow bar to show even if not enough room
+    if (show && ![fDefaults boolForKey: @"AutoSize"])
+    {
+        float maxHeight = [[fWindow screen] visibleFrame].size.height - heightChange;
+        if (frame.size.height > maxHeight)
+        {
+            float change = maxHeight - frame.size.height;
+            frame.size.height += change;
+            frame.origin.y -= change;
+            
+            [fWindow setFrame: frame display: NO animate: NO];
+        }
+    }
 
     frame.size.height += heightChange;
@@ -1821 +1835 @@
     if (!show)
         heightChange *= -1;
+    
+    //allow bar to show even if not enough room
+    if (show && ![fDefaults boolForKey: @"AutoSize"])
+    {
+        float maxHeight = [[fWindow screen] visibleFrame].size.height - heightChange;
+        if (frame.size.height > maxHeight)
+        {
+            float change = maxHeight - frame.size.height;
+            frame.size.height += change;
+            frame.origin.y -= change;
+            
+            [fWindow setFrame: frame display: NO animate: NO];
+        }
+    }
 
     frame.size.height += heightChange;
@@ -1831 +1859 @@
     [fScrollView setAutoresizingMask: 0];
     
-    [fWindow setFrame: frame display: YES animate: animate]; 
+    [fWindow setFrame: frame display: YES animate: animate];
     
     //re-enable autoresize