Changeset 9744

Timestamp:

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

Author:

livings124

Message:

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

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (3 diffs)
• TorrentCell.m (modified) (6 diffs)

trunk/macosx/Controller.h

@@ -255 +255 @@
 - (NSRect) sizedWindowFrame;
 
+- (void) resizeFilterBar;
+
 - (void) updateForExpandCollape;
 

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
 {

trunk/macosx/TorrentCell.m

@@ -70 +70 @@
 
 - (NSRect) rectForMinimalStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
-- (NSRect) rectForTitleWithStringBasedOnMinimalStatusRect: (NSRect) statusRect
-            inBounds: (NSRect) bounds;
+- (NSRect) rectForTitleWithStringBasedOnMinimalStatusRect: (NSRect) statusRect inBounds: (NSRect) bounds;
 - (NSRect) rectForProgressWithStringInBounds: (NSRect) bounds;
 - (NSRect) rectForStatusWithStringInBounds: (NSRect) bounds;
@@ -623 +622 @@
 }
 
-- (NSRect) rectForTitleWithStringBasedOnMinimalStatusRect: (NSRect) statusRect
-            inBounds: (NSRect) bounds
+- (NSRect) rectForTitleWithStringBasedOnMinimalStatusRect: (NSRect) statusRect inBounds: (NSRect) bounds
 {
     const BOOL minimal = [fDefaults boolForKey: @"SmallView"];
@@ -634 +632 @@
     
     result.size.height = HEIGHT_TITLE;
-    result.size.width = NSMaxX(bounds) - result.origin.x - PADDING_HORIZONTAL
-                - (minimal ? PADDING_BETWEEN_TITLE_AND_MIN_STATUS + NSWidth(statusRect) : 0.0)
-                - ([[self representedObject] priority] != TR_PRI_NORMAL ? PRIORITY_ICON_WIDTH + PADDING_BETWEEN_TITLE_AND_PRIORITY: 0.0);
+    result.size.width = NSMaxX(bounds) - NSMinX(result) - PADDING_HORIZONTAL;
+    if (minimal)
+        result.size.width -= PADDING_BETWEEN_TITLE_AND_MIN_STATUS + NSWidth(statusRect);
+    if ([[self representedObject] priority] != TR_PRI_NORMAL)
+        result.size.width -= PRIORITY_ICON_WIDTH + PADDING_BETWEEN_TITLE_AND_PRIORITY;
     
     return result;
@@ -670 +670 @@
     const BOOL minimal = [fDefaults boolForKey: @"SmallView"];
     
-    NSRect result = bounds;
+    NSRect result;
     result.size.height = BAR_HEIGHT;
-    result.origin.x += (minimal ? IMAGE_SIZE_MIN : IMAGE_SIZE_REG) + PADDING_BETWEEN_IMAGE_AND_BAR;
-    
-    result.origin.y += PADDING_ABOVE_TITLE + HEIGHT_TITLE;
+    result.origin.x = NSMinX(bounds) + (minimal ? IMAGE_SIZE_MIN : IMAGE_SIZE_REG) + PADDING_BETWEEN_IMAGE_AND_BAR;
+    
+    result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE + HEIGHT_TITLE;
     if (minimal)
         result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN;
@@ -687 +687 @@
 - (NSRect) controlButtonRectForBounds: (NSRect) bounds
 {
-    NSRect result = bounds;
+    NSRect result;
     result.size.height = NORMAL_BUTTON_WIDTH;
     result.size.width = NORMAL_BUTTON_WIDTH;
     result.origin.x = NSMaxX(bounds) - 2.0f * (PADDING_HORIZONTAL + NORMAL_BUTTON_WIDTH);
     
-    result.origin.y += PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5f;
+    result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5f;
     if ([fDefaults boolForKey: @"SmallView"])
         result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN;
@@ -703 +703 @@
 - (NSRect) revealButtonRectForBounds: (NSRect) bounds
 {
-    NSRect result = bounds;
+    NSRect result;
     result.size.height = NORMAL_BUTTON_WIDTH;
     result.size.width = NORMAL_BUTTON_WIDTH;
     result.origin.x = NSMaxX(bounds) - (PADDING_HORIZONTAL + NORMAL_BUTTON_WIDTH);
     
-    result.origin.y += PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5f;
+    result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5f;
     if ([fDefaults boolForKey: @"SmallView"])
         result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN;