Various tweaks.

Author: stefanceriu

SCXcodeMinimap/SCMiniMapView.h

@@ -19,7 +19,7 @@ extern const CGFloat kDefaultZoomLevel;
 @property (nonatomic, weak) NSScrollView *editorScrollView;
 @property (nonatomic, strong) NSTextView *editorTextView;
 
-@property (nonatomic, readonly) NSInteger lastCalculatedLines;
+@property (nonatomic, readonly) NSInteger numberOfLines;
 
 - (void)updateTextView;
 - (void)updateSelectionView;

SCXcodeMinimap/SCMiniMapView.m

@@ -18,7 +18,7 @@ @interface SCMiniMapView () <NSLayoutManagerDelegate>
 
 @property (nonatomic, strong) NSColor *backgroundColor;
 @property (nonatomic, strong) NSFont *font;
-@property (nonatomic, readwrite) NSInteger lastCalculatedLines;
+@property (nonatomic, assign) NSInteger numberOfLines;
 
 @end
 
@@ -187,15 +187,12 @@ - (void)updateTextView
     }
 
     typeof(self) __weak weakSelf = self;
-    NSOperationQueue *background = [[NSOperationQueue alloc] init];
-    
-    //Run the attributed strings operation on a background thread
-    [background addOperationWithBlock:^{
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
         NSMutableAttributedString *mutableAttributedString = [self.editorTextView.textStorage mutableCopy];
 
         if(mutableAttributedString.length == 0) {
             //Nothing to do here.
-            weakSelf.lastCalculatedLines = 0;
+            weakSelf.numberOfLines = 0;
             return;
         }
 
@@ -216,27 +213,25 @@ - (void)updateTextView
         [mutableAttributedString setAttributes:@{NSFontAttributeName: weakSelf.font, NSParagraphStyleAttributeName : style} range:NSMakeRange(0, mutableAttributedString.length)];
 
         //Send the text storage update off to the main thread
-        [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             [weakSelf.textView.textStorage setAttributedString:mutableAttributedString];
             [weakSelf updateSelectionView];
-        }];
+        });
 
-        //Now that we've sent that off, let's see how many lines we have while
-        //we're in here:
+        //Calculate the total number of lines
         [weakSelf calculateLinesFromString:[mutableAttributedString string]];
-    }];
+    });
 }
 
 - (void)calculateLinesFromString:(NSString *)string
 {
-    NSUInteger stringLength = [string length];
-    NSInteger numberOfLines = 0;
-    for (NSInteger index = 0;  index < stringLength; numberOfLines++) {
+    NSInteger count = 0;
+    for (NSInteger index = 0;  index < [string length]; count++) {
         index = NSMaxRange([string lineRangeForRange:NSMakeRange(index, 0)]);
     }
 
     //Cache the last calculated lines so we can figure out how long we should take to render this minimap.
-    self.lastCalculatedLines = numberOfLines;
+    self.numberOfLines = count;
 }
 
 - (void)resizeWithOldSuperviewSize:(NSSize)oldSize

SCXcodeMinimap/SCXcodeMinimap.m

@@ -98,7 +98,7 @@ - (void)onDocumentDidChange:(NSNotification*)sender
     SCMiniMapView *miniMapView = objc_getAssociatedObject([sender object], &kKeyMiniMapView);
 
     //150 lines per multiplier means a 1500 line file should have a delay of 2.5 seconds. 
-    CGFloat multiplier = ceilf((CGFloat)miniMapView.lastCalculatedLines / 150.0f);
+    CGFloat multiplier = ceilf((CGFloat)miniMapView.numberOfLines / 150.0f);
     NSTimeInterval updateInterval = (CGFloat)multiplier * kDefaultUpdateInterval;
 
     [NSObject cancelPreviousPerformRequestsWithTarget:miniMapView selector:@selector(updateTextView) object:nil];