Changeset 9744 for trunk/macosx/Controller.m

Timestamp:

Dec 13, 2009, 9:42:45 PM (13 years ago)

Author:

livings124

Message:

on open, make sure the filter bar's layout is correct

File:

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

trunk/macosx/Controller.m

@@ -565 +565 @@
     [self applyFilter: nil];
     
-    [fWindow makeKeyAndOrderFront: nil]; 
+    [fWindow makeKeyAndOrderFront: nil];
+    
+    //can't be done earlier
+    if (![fFilterBar isHidden])
+        [self resizeFilterBar];
     
     if ([fDefaults boolForKey: @"InfoVisible"])
@@ -4091 +4095 @@
 }
 
-- (void) updateForExpandCollape
-{
-    [self setWindowSizeToFit];
-    [self setBottomCountText: YES];
-}
-
-- (void) showMainWindow: (id) sender
-{
-    [fWindow makeKeyAndOrderFront: nil];
-}
-
-- (void) windowDidBecomeMain: (NSNotification *) notification
-{
-    [fBadger clearCompleted];
-    [self updateUI];
-}
-
-- (NSSize) windowWillResize: (NSWindow *) sender toSize: (NSSize) proposedFrameSize
-{
-    //only resize horizontally if autosize is enabled
-    if ([fDefaults boolForKey: @"AutoSize"])
-        proposedFrameSize.height = [fWindow frame].size.height;
-    return proposedFrameSize;
-}
-
-- (void) windowDidResize: (NSNotification *) notification
-{
-    if (![fStatusBar isHidden])
-        [self resizeStatusButton];
-    
-    if ([fFilterBar isHidden])
-        return;
-    
+- (void) resizeFilterBar
+{
     //replace all buttons
     [fNoFilterButton sizeToFit];
@@ -4182 +4155 @@
 }
 
+- (void) updateForExpandCollape
+{
+    [self setWindowSizeToFit];
+    [self setBottomCountText: YES];
+}
+
+- (void) showMainWindow: (id) sender
+{
+    [fWindow makeKeyAndOrderFront: nil];
+}
+
+- (void) windowDidBecomeMain: (NSNotification *) notification
+{
+    [fBadger clearCompleted];
+    [self updateUI];
+}
+
+- (NSSize) windowWillResize: (NSWindow *) sender toSize: (NSSize) proposedFrameSize
+{
+    //only resize horizontally if autosize is enabled
+    if ([fDefaults boolForKey: @"AutoSize"])
+        proposedFrameSize.height = [fWindow frame].size.height;
+    return proposedFrameSize;
+}
+
+- (void) windowDidResize: (NSNotification *) notification
+{
+    if (![fStatusBar isHidden])
+        [self resizeStatusButton];
+    
+    if ([fFilterBar isHidden])
+        return;
+
+    [self resizeFilterBar];
+}
+
 - (void) applicationWillUnhide: (NSNotification *) notification
 {