Changeset 7756

Timestamp:

Jan 19, 2009, 10:16:19 PM (12 years ago)

Author:

livings124

Message:

(1.5x) streamline the filter button resize code a bit

File:

• branches/1.5x/macosx/Controller.m (modified) (2 diffs)

branches/1.5x/macosx/Controller.m

@@ -4058 +4058 @@
     
     NSRect allRect = [fNoFilterButton frame];
-    
     NSRect activeRect = [fActiveFilterButton frame];
-    activeRect.origin.x = NSMaxX(allRect) + 1.0;
-    
     NSRect downloadRect = [fDownloadFilterButton frame];
-    downloadRect.origin.x = NSMaxX(activeRect) + 1.0;
-    
     NSRect seedRect = [fSeedFilterButton frame];
-    seedRect.origin.x = NSMaxX(downloadRect) + 1.0;
-    
     NSRect pauseRect = [fPauseFilterButton frame];
-    pauseRect.origin.x = NSMaxX(seedRect) + 1.0;
     
     //size search filter to not overlap buttons
@@ -4094 +4086 @@
         
         //decrease button widths proportionally
-        const NSInteger all = NSWidth(allRect) * (allowedWidth / currentTotal);
-        const NSInteger active = NSWidth(activeRect) * (allowedWidth / currentTotal);
-        const NSInteger download = NSWidth(downloadRect) * (allowedWidth / currentTotal);
-        const NSInteger seed = NSWidth(seedRect) * (allowedWidth / currentTotal);
-        const NSInteger paused = NSWidth(pauseRect) * (allowedWidth / currentTotal);
-        
-        allRect.size.width = all;
-        
-        activeRect.size.width = active;
-        activeRect.origin.x = NSMaxX(allRect) + 1.0;
-        
-        downloadRect.size.width = download;
-        downloadRect.origin.x = NSMaxX(activeRect) + 1.0;
-        
-        seedRect.size.width = seed;
-        seedRect.origin.x = NSMaxX(downloadRect) + 1.0;
-        
-        pauseRect.size.width = paused;
-        pauseRect.origin.x = NSMaxX(seedRect) + 1.0;
+        allRect.size.width  = NSWidth(allRect) * (allowedWidth / currentTotal);
+        activeRect.size.width = NSWidth(activeRect) * (allowedWidth / currentTotal);
+        downloadRect.size.width = NSWidth(downloadRect) * (allowedWidth / currentTotal);
+        seedRect.size.width = NSWidth(seedRect) * (allowedWidth / currentTotal);
+        pauseRect.size.width = NSWidth(pauseRect) * (allowedWidth / currentTotal);
     }
     else;
+    
+    activeRect.origin.x = NSMaxX(allRect) + 1.0;
+    downloadRect.origin.x = NSMaxX(activeRect) + 1.0;
+    seedRect.origin.x = NSMaxX(downloadRect) + 1.0;
+    pauseRect.origin.x = NSMaxX(seedRect) + 1.0;
     
     [fNoFilterButton setFrame: allRect];