Changeset 678 for trunk/macosx/Controller.m

Timestamp:

Jul 23, 2006, 7:22:24 PM (16 years ago)

Author:

livings124

Message:

simplify rect width and height measurements

File:

• trunk/macosx/Controller.m (modified) (5 diffs)

trunk/macosx/Controller.m

@@ -48 +48 @@
 #define TORRENT_TABLE_VIEW_DATA_TYPE    @"TorrentTableViewDataType"
 
-#define ROW_HEIGHT_REGULAR 65.0
-#define ROW_HEIGHT_SMALL 40.0
+#define ROW_HEIGHT_REGULAR  65.0
+#define ROW_HEIGHT_SMALL    40.0
+#define WINDOW_REGULAR_WIDTH       468.0
 
 #define WEBSITE_URL @"http://transmission.m0k.org/"
@@ -151 +152 @@
     
     [contentView addSubview: fFilterBar];
-    [fFilterBar setFrameOrigin: NSMakePoint(0, [contentView frame].origin.y + [contentView frame].size.height)];
+    [fFilterBar setFrameOrigin: NSMakePoint(0, NSMaxY([contentView frame]))];
     
     [self showFilterBar: [fDefaults boolForKey: @"FilterBar"] animate: NO];
@@ -164 +165 @@
     
     [contentView addSubview: fStatusBar];
-    [fStatusBar setFrameOrigin: NSMakePoint(0, [contentView frame].origin.y + [contentView frame].size.height)];
+    [fStatusBar setFrameOrigin: NSMakePoint(0, NSMaxY([contentView frame]))];
     [self showStatusBar: [fDefaults boolForKey: @"StatusBar"] animate: NO];
     
@@ -2120 +2121 @@
                     : [self windowFrameForAmount: [fFilteredTorrents count]];
     
-    frame.size.width = [fDefaults boolForKey: @"SmallView"] ? [fWindow minSize].width : 468.0;
+    frame.size.width = [fDefaults boolForKey: @"SmallView"] ? [fWindow minSize].width : WINDOW_REGULAR_WIDTH;
     return frame;
 }
@@ -2187 +2188 @@
     //hide search filter if it overlaps filter buttons
     NSRect buttonFrame = [fPauseFilterButton frame];
-    if (buttonFrame.origin.x + buttonFrame.size.width + 2.0 > [fSearchFilterField frame].origin.x)
+    if (NSMaxX(buttonFrame) + 2.0 > [fSearchFilterField frame].origin.x)
     {
         if (![fSearchFilterField isHidden])