Changeset 9812

Timestamp:

Dec 23, 2009, 2:02:11 AM (13 years ago)

Author:

livings124

Message:

small code nudges here and there

Location:

trunk/macosx

Files:

• AboutWindowController.m (modified) (2 diffs)
• BlocklistDownloaderViewController.m (modified) (1 diff)
• Controller.m (modified) (1 diff)
• DragOverlayWindow.m (modified) (1 diff)
• TorrentTableView.m (modified) (5 diffs)

trunk/macosx/AboutWindowController.m

@@ -48 +48 @@
     
     //size license button
-    CGFloat oldButtonWidth = [fLicenseButton frame].size.width;
+    const CGFloat oldButtonWidth = [fLicenseButton frame].size.width;
     
     [fLicenseButton setTitle: NSLocalizedString(@"License", "About window -> license button")];
@@ -54 +54 @@
     
     NSRect buttonFrame = [fLicenseButton frame];
-    buttonFrame.size.width += 10.0f;
-    buttonFrame.origin.x -= buttonFrame.size.width - oldButtonWidth;
+    buttonFrame.size.width += 10.0;
+    buttonFrame.origin.x -= NSWidth(buttonFrame) - oldButtonWidth;
     [fLicenseButton setFrame: buttonFrame];
 }

trunk/macosx/BlocklistDownloaderViewController.m

@@ -48 +48 @@
     [fButton setTitle: NSLocalizedString(@"Cancel", "Blocklist -> cancel button")];
     
-    const CGFloat oldWidth = [fButton frame].size.width;
+    const CGFloat oldWidth = NSWidth([fButton frame]);
     [fButton sizeToFit];
     NSRect buttonFrame = [fButton frame];
-    buttonFrame.size.width += 12.0f; //sizeToFit sizes a bit too small
-    buttonFrame.origin.x -= buttonFrame.size.width - oldWidth;
+    buttonFrame.size.width += 12.0; //sizeToFit sizes a bit too small
+    buttonFrame.origin.x -= NSWidth(buttonFrame) - oldWidth;
     [fButton setFrame: buttonFrame];
     

trunk/macosx/Controller.m

@@ -4091 +4091 @@
         
         //hack to ensure scrollbars don't disappear after resizing
-        [scrollView setAutohidesScrollers: NO];
-        [scrollView setAutohidesScrollers: YES];
+        if (![NSApp isOnSnowLeopardOrBetter])
+        {
+            [scrollView setAutohidesScrollers: NO];
+            [scrollView setAutohidesScrollers: YES];
+        }
     }
 }

trunk/macosx/DragOverlayWindow.m

@@ -146 +146 @@
 - (void) setURL: (NSString *) url
 {
-    #warning get magnet image/phrase
     [[self contentView] setOverlay: [NSImage imageNamed: @"Globe.png"]
         mainLine: NSLocalizedString(@"Web Address", "Drag overlay -> url") subLine: url];

trunk/macosx/TorrentTableView.m

@@ -241 +241 @@
             continue;
         
-        NSDictionary * userInfo = [NSDictionary dictionaryWithObject: [NSNumber numberWithUnsignedInteger: row] forKey: @"Row"];
+        NSDictionary * userInfo = [NSDictionary dictionaryWithObject: [NSNumber numberWithInteger: row] forKey: @"Row"];
         TorrentCell * cell = (TorrentCell *)[self preparedCellAtColumn: -1 row: row];
         [cell addTrackingAreasForView: self inRect: [self rectOfRow: row] withUserInfo: userInfo mouseLocation: mouseLocation];
@@ -288 +288 @@
     if ((row = [dict objectForKey: @"Row"]))
     {
-        NSInteger rowVal = [row intValue];
+        NSInteger rowVal = [row integerValue];
         NSString * type = [dict objectForKey: @"Type"];
         if ([type isEqualToString: @"Action"])
@@ -316 +316 @@
             fMouseRevealRow = -1;
         
-        [self setNeedsDisplayInRect: [self rectOfRow: [row intValue]]];
+        [self setNeedsDisplayInRect: [self rectOfRow: [row integerValue]]];
     }
 }
@@ -412 +412 @@
         if ([item isKindOfClass: [Torrent class]])
         {
-            NSInteger index = [self rowForItem: item];
+            const NSInteger index = [self rowForItem: item];
             if (index != -1)
                 [indexSet addIndex: index];
@@ -418 +418 @@
         else
         {
-            NSInteger group = [item groupIndex];
+            const NSInteger group = [item groupIndex];
             for (NSInteger i = 0; i < [self numberOfRows]; i++)
             {
-                if ([indexSet containsIndex: i])
-                    continue;
-                
                 id tableItem = [self itemAtRow: i];
-                if (![tableItem isKindOfClass: [Torrent class]] && group == [tableItem groupIndex])
+                if ([tableItem isKindOfClass: [TorrentGroup class]] && group == [tableItem groupIndex])
                 {
                     [indexSet addIndex: i];