Changeset 2171 for trunk/macosx/PiecesView.m

Timestamp:

Jun 20, 2007, 10:53:46 PM (15 years ago)

Author:

livings124

Message:

simplify the mess of code that is the pieces view

File:

• trunk/macosx/PiecesView.m (modified) (9 diffs)

trunk/macosx/PiecesView.m

@@ -30 +30 @@
 @implementation PiecesView
 
-- (id) init
-{
-    if ((self = [super init]))
+- (id) initWithCoder: (NSCoder *) decoder
+{
+    if ((self = [super initWithCoder: decoder]))
     {
         fTorrent = nil;
@@ -44 +44 @@
 - (void) awakeFromNib
 {
-        #warning NSRectFill
-        
-        NSSize size = [fImageView bounds].size;
-        NSBezierPath * bp = [NSBezierPath bezierPathWithRect: [fImageView bounds]];
+        NSSize size = [self bounds].size;
+        NSBezierPath * bp = [NSBezierPath bezierPathWithRect: [self bounds]];
         
         //back image
@@ -137 +135 @@
         [fBluePiece unlockFocus];
         
-        [fImageView setToolTip: [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]
+        [self setToolTip: [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]
                         ? NSLocalizedString(@"Piece Availability", "Inspector -> Activity -> detailed pieces view tooltip")
                         : NSLocalizedString(@"Piece Progress", "Inspector -> Activity -> detailed pieces view tooltip")];
@@ -190 +188 @@
             fAcross = MAX_ACROSS;
         
-        float width = [fImageView bounds].size.width;
+        float width = [self bounds].size.width;
         fWidth = (width - (fAcross + 1) * BETWEEN) / fAcross;
         fExtraBorder = (width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
@@ -197 +195 @@
     }
     
-    [fImageView setHidden: torrent == nil];
+    [self setHidden: torrent == nil];
 }
 
@@ -206 +204 @@
     
     if (first)
-        [fImageView setImage: [[fBack copy] autorelease]];
-    NSImage * image = [fImageView image];
+        [self setImage: [[fBack copy] autorelease]];
+    NSImage * image = [self image];
 
     int8_t * pieces;
@@ -370 +368 @@
     {
         [image unlockFocus];
-        [fImageView setNeedsDisplay];
+        [self setNeedsDisplay];
     }
     
@@ -379 +377 @@
 }
 
-- (void) toggleView
+- (BOOL) acceptsFirstMouse: (NSEvent *) event
+{
+    return YES;
+}
+
+- (void) mouseDown: (NSEvent *) event
 {
     NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
@@ -386 +389 @@
     [defaults setBool: showAvailability forKey: @"PiecesViewShowAvailability"];
     
-    [fImageView setToolTip: showAvailability
+    [self setToolTip: showAvailability
         ? NSLocalizedString(@"Piece Availability", "Inspector -> Activity -> detailed pieces view tooltip")
         : NSLocalizedString(@"Piece Progress", "Inspector -> Activity -> detailed pieces view tooltip")];
     
     [self updateView: YES];
+    
+    [super mouseDown: event];
 }