Changeset 537

Timestamp:

Jul 6, 2006, 12:33:24 AM (17 years ago)

Author:

livings124

Message:

tweak Minimal spacing a bit

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• TorrentCell.m (modified) (9 diffs)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -44 +44 @@
 
 #define ROW_HEIGHT_REGULAR 65.0
-#define ROW_HEIGHT_SMALL 38.0
+#define ROW_HEIGHT_SMALL 40.0
 
 #define WEBSITE_URL @"http://transmission.m0k.org/"

trunk/macosx/TorrentCell.m

@@ -284 +284 @@
 
     NSPoint pen = cellFrame.origin;
-    const float padding = 3.0, linePadding = 2.0, extraNameShift = 1.0;
+    const float PADDING = 3.0, LINE_PADDING = 2.0, EXTRA_NAME_SHIFT = 1.0;
 
     if (![fDefaults boolForKey: @"SmallView"]) //regular size
@@ -292 +292 @@
         NSSize iconSize = [icon size];
         
-        pen.x += padding;
+        pen.x += PADDING;
         pen.y += (cellFrame.size.height - iconSize.height) * 0.5;
         
@@ -298 +298 @@
                 operation: NSCompositeSourceOver fraction: 1.0];
 
-        const float mainWidth = cellFrame.size.width - iconSize.width - 3.0 * padding - extraNameShift;
+        float mainWidth = cellFrame.size.width - iconSize.width - 3.0 * PADDING - EXTRA_NAME_SHIFT;
 
         //name string
-        pen.x += iconSize.width + padding + extraNameShift;
-        pen.y = cellFrame.origin.y + padding;
+        pen.x += iconSize.width + PADDING + EXTRA_NAME_SHIFT;
+        pen.y = cellFrame.origin.y + PADDING;
         NSAttributedString * nameString = [[fTorrent name] attributedStringFittingInWidth: mainWidth
                                                 attributes: nameAttributes];
@@ -308 +308 @@
         
         //progress string
-        pen.y += [nameString size].height + linePadding - 1.0;
+        pen.y += [nameString size].height + LINE_PADDING - 1.0;
         
         NSAttributedString * progressString = [[fTorrent progressString]
@@ -315 +315 @@
 
         //progress bar
-        pen.x -= extraNameShift;
-        pen.y += [progressString size].height + linePadding + BAR_HEIGHT;
-        
-        const float barWidth = mainWidth + extraNameShift - BUTTONS_TOTAL_WIDTH + padding;
+        pen.x -= EXTRA_NAME_SHIFT;
+        pen.y += [progressString size].height + LINE_PADDING + BAR_HEIGHT;
+        
+        float barWidth = mainWidth + EXTRA_NAME_SHIFT - BUTTONS_TOTAL_WIDTH + PADDING;
         
         if ([fDefaults boolForKey: @"UseAdvancedBar"])
@@ -326 +326 @@
 
         //status string
-        pen.x += extraNameShift;
-        pen.y += linePadding;
+        pen.x += EXTRA_NAME_SHIFT;
+        pen.y += LINE_PADDING;
         NSAttributedString * statusString = [[fTorrent statusString]
             attributedStringFittingInWidth: mainWidth attributes: statusAttributes];
@@ -338 +338 @@
         NSSize iconSize = [icon size];
         
-        pen.x += padding;
+        pen.x += PADDING;
         pen.y += (cellFrame.size.height - iconSize.height) * 0.5;
         
@@ -345 +345 @@
 
         //name and status string
-        const float mainWidth = cellFrame.size.width - iconSize.width - 3.0 * padding - extraNameShift;
+        float mainWidth = cellFrame.size.width - iconSize.width - 3.0 * PADDING - EXTRA_NAME_SHIFT;
         
         NSAttributedString * statusString = [[[NSAttributedString alloc] initWithString: [fTorrent shortStatusString]
                                                     attributes: statusAttributes] autorelease];
         NSAttributedString * nameString = [[fTorrent name] attributedStringFittingInWidth:
-                                mainWidth - [statusString size].width - linePadding attributes: nameAttributes];
+                                mainWidth - [statusString size].width - LINE_PADDING attributes: nameAttributes];
                      
         //place name string
-        pen.x += iconSize.width + padding + extraNameShift;
-        pen.y = cellFrame.origin.y + linePadding;
+        pen.x += iconSize.width + PADDING + EXTRA_NAME_SHIFT;
+        pen.y = cellFrame.origin.y + LINE_PADDING;
 
         [nameString drawAtPoint: pen];
         
         //place status string
-        pen.x = cellFrame.origin.x + cellFrame.size.width - padding - [statusString size].width;
+        pen.x = cellFrame.origin.x + cellFrame.size.width - PADDING - [statusString size].width;
         pen.y += ([nameString size].height - [statusString size].height) * 0.5;
         
@@ -365 +365 @@
         
         //progress bar
-        pen.x = cellFrame.origin.x + iconSize.width + 2.0 * padding;
-        pen.y = cellFrame.origin.y + [nameString size].height + 2.0 * linePadding + BAR_HEIGHT;
-        
-        const float barWidth = mainWidth + extraNameShift - BUTTONS_TOTAL_WIDTH + padding;
+        pen.x = cellFrame.origin.x + iconSize.width + 2.0 * PADDING;
+        pen.y = cellFrame.origin.y + [nameString size].height + LINE_PADDING + PADDING + BAR_HEIGHT;
+        
+        float barWidth = mainWidth + EXTRA_NAME_SHIFT - BUTTONS_TOTAL_WIDTH + PADDING;
         
         if ([fDefaults boolForKey: @"UseAdvancedBar"])

trunk/macosx/TorrentTableView.m

@@ -28 +28 @@
 
 #define BUTTON_TO_TOP_REGULAR 33.5
-#define BUTTON_TO_TOP_SMALL 19.0
+#define BUTTON_TO_TOP_SMALL 20.0
 
 #define BUTTON_WIDTH 14.0