Changeset 3364

Timestamp:

Oct 11, 2007, 3:52:35 AM (15 years ago)

Author:

livings124

Message:

improve the drawing of the background color in file selection

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• macosx/FileOutlineView.m (modified) (1 diff)

trunk/NEWS

@@ -13 +13 @@
    + Inspector can be resized vertically in Peers and Files tabs
    + Optimizations to decrease memory usage
+   + Sort and filter by tracker
    + Various smaller interface additions and improvements
  - GTK:

trunk/macosx/FileOutlineView.m

@@ -115 +115 @@
         NSIndexSet * indexes = [item objectForKey: @"Indexes"];
         
-        if ([torrent checkForFiles: indexes] == NSOffState)
-            [fNormalColor set];
-        else
+        if ([torrent checkForFiles: indexes] != NSOffState)
         {
             NSSet * priorities = [torrent filePrioritiesForIndexes: indexes];
             int count = [priorities count];
-            if (count == 0)
-                [fNormalColor set];
-            else if (count > 1)
-                [fMixedPriorityColor set];
-            else
+            if (count > 0)
             {
-                int priority = [[priorities anyObject] intValue];
-                if (priority == TR_PRI_LOW)
-                    [fLowPriorityColor set];
-                else if (priority == TR_PRI_HIGH)
-                    [fHighPriorityColor set];
+                BOOL custom = YES;
+                if (count > 1)
+                    [fMixedPriorityColor set];
                 else
-                    [fNormalColor set];
+                {
+                    switch ([[priorities anyObject] intValue])
+                    {
+                        case TR_PRI_LOW:
+                            [fLowPriorityColor set];
+                            break;
+                        case TR_PRI_HIGH:
+                            [fHighPriorityColor set];
+                            break;
+                        default:
+                            custom = NO;
+                    }
+                }
+                
+                if (custom)
+                {
+                    NSRect rect = [self rectOfRow: row];
+                    rect.size.height -= 1.0;
+            
+                    NSRectFill(rect);
+                }
             }
         }
-        
-        NSRect rect = [self rectOfRow: row];
-        rect.size.height -= 1.0;
-        
-        NSRectFill(rect);
     }