Fixes for #17 (incomplete)

stefanceriu · stefanceriu · commit c09dfd7687d2 · 2013-09-30T09:00:47.000+01:00
diff --git a/SCXcodeMinimap/SCMiniMapView.m b/SCXcodeMinimap/SCMiniMapView.m
@@ -22,16 +22,15 @@ @implementation SCMiniMapView
 
 - (id)initWithFrame:(NSRect)frame
 {
-    self = [super initWithFrame:frame];
-    if (self)
+    if (self = [super initWithFrame:frame])
     {
         /* Configure ScrollView */
         [self setWantsLayer:YES];
         [self setAutoresizingMask: NSViewMinXMargin | NSViewHeightSizable];
         [self setDrawsBackground:NO];
         [self setHorizontalScrollElasticity:NSScrollElasticityNone];
         [self setVerticalScrollElasticity:NSScrollElasticityNone];
-
+        
         /* Subscribe to show/hide notifications */
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(show)
@@ -65,7 +64,7 @@ - (NSTextView *)textView
         [_textView setBackgroundColor:[NSColor clearColor]];
         
         [_textView.textContainer setLineFragmentPadding:0.0f];
-
+        
         [_textView.layoutManager setDelegate:self];
         
         [_textView setAllowsUndo:NO];
@@ -78,7 +77,7 @@ - (NSTextView *)textView
         [_textView setAutomaticTextReplacementEnabled:NO];
         [_textView setContinuousSpellCheckingEnabled:NO];
         [_textView setDisplaysLinkToolTips:NO];
-        [_textView setEditable:NO];        
+        [_textView setEditable:NO];
         [_textView setRichText:YES];
         [_textView setSelectable:NO];
         
@@ -103,7 +102,7 @@ - (SCSelectionView *)selectionView
 
 - (NSFont *)font
 {
-    if(_font == nil) {    
+    if(_font == nil) {
         _font = [NSFont fontWithName:@"Menlo" size:11 * kDefaultZoomLevel];
         
         Class DVTFontAndColorThemeClass = NSClassFromString(@"DVTFontAndColorTheme");
@@ -135,7 +134,7 @@ - (NSColor *)backgroundColor
             }
         }
     }
-
+    
     return _backgroundColor;
 }
 
@@ -144,7 +143,7 @@ - (NSColor *)backgroundColor
 - (void)show
 {
     self.hidden = NO;
-
+    
     NSRect editorTextViewFrame = self.editorScrollView.frame;
     editorTextViewFrame.size.width = self.editorScrollView.superview.frame.size.width - self.bounds.size.width;
     self.editorScrollView.frame = editorTextViewFrame;
@@ -156,7 +155,7 @@ - (void)show
 - (void)hide
 {
     self.hidden = YES;
-
+    
     NSRect editorTextViewFrame = self.editorScrollView.frame;
     editorTextViewFrame.size.width = self.editorScrollView.superview.frame.size.width;
     self.editorScrollView.frame = editorTextViewFrame;
@@ -178,24 +177,26 @@ - (void)updateTextView
     if ([self isHidden]) {
         return;
     }
-     
+    
     NSMutableAttributedString *mutableAttributedString = [self.editorTextView.textStorage mutableCopy];
-
+    
     if(mutableAttributedString == nil) {
         return;
     }
 	
-	__block NSMutableParagraphStyle *style;
 	[mutableAttributedString enumerateAttribute:NSParagraphStyleAttributeName
 										inRange:NSMakeRange(0, mutableAttributedString.length)
 										options:0
 									 usingBlock:^(id value, NSRange range, BOOL *stop) {
-										 style = [value mutableCopy];
+                                         
+										 NSMutableParagraphStyle *style = [value mutableCopy];
+                                         [style setTabStops:@[]];
+                                         [style setDefaultTabInterval:style.defaultTabInterval * kDefaultZoomLevel];
+                                         [mutableAttributedString addAttributes:@{NSParagraphStyleAttributeName:style} range:range];
 									 }];
-	[style setTabStops:@[]];
-	[style setDefaultTabInterval:style.defaultTabInterval * kDefaultZoomLevel];
-
-    [mutableAttributedString setAttributes:@{NSFontAttributeName: self.font, NSParagraphStyleAttributeName : style} range:NSMakeRange(0, mutableAttributedString.length)];
+    
+    [mutableAttributedString setAttributes:@{NSFontAttributeName: self.font} range:NSMakeRange(0, mutableAttributedString.length)];
+    
     [self.textView.textStorage setAttributedString:mutableAttributedString];
 }
 
@@ -210,22 +211,22 @@ - (void)updateSelectionView
     if ([self isHidden]) {
         return;
     }
-
+    
     NSRect selectionViewFrame = NSMakeRect(0,
                                            0,
                                            self.bounds.size.width,
                                            self.editorScrollView.visibleRect.size.height * kDefaultZoomLevel);
-
-
+    
+    
     CGFloat editorContentHeight = [self.editorScrollView.documentView frame].size.height - self.editorScrollView.bounds.size.height;
-
+    
     if(editorContentHeight == 0) {
         selectionViewFrame.origin.y = 0;
     }
     else {
         CGFloat ratio = ([self.documentView frame].size.height - self.bounds.size.height) / editorContentHeight;
         [self.contentView scrollToPoint:NSMakePoint(0, floorf(self.editorScrollView.contentView.bounds.origin.y * ratio))];
-
+        
         CGFloat textHeight = [self.textView.layoutManager usedRectForTextContainer:self.textView.textContainer].size.height;
         ratio = (textHeight - self.selectionView.bounds.size.height) / editorContentHeight;
         selectionViewFrame.origin.y = self.editorScrollView.contentView.bounds.origin.y * ratio;
@@ -300,11 +301,11 @@ - (void)goAtRelativePosition:(NSPoint)position
     CGFloat documentHeight = [self.editorScrollView.documentView frame].size.height;
     CGSize boundsSize = self.editorScrollView.bounds.size;
     CGFloat maxOffset = documentHeight - boundsSize.height;
-
+    
     CGFloat offset =  floor(documentHeight * position.y - boundsSize.height/2);
-
+    
     offset = MIN(MAX(0, offset), maxOffset);
-
+    
     [self.editorTextView scrollRectToVisible:NSMakeRect(0, offset, boundsSize.width, boundsSize.height)];
 }
 
diff --git a/SCXcodeMinimap/SCSelectionView.m b/SCXcodeMinimap/SCSelectionView.m
@@ -32,7 +32,7 @@ - (NSColor *)selectionColor
                 NSColor *backgroundColor = [[theme performSelector:@selector(sourceTextBackgroundColor)] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
                 
                 if(self.shouldInverseColors) {
-
+                    
                     _selectionColor = [NSColor colorWithCalibratedRed:(1.0f - [backgroundColor redComponent])
                                                                 green:(1.0f - [backgroundColor greenComponent])
                                                                  blue:(1.0f - [backgroundColor blueComponent])
diff --git a/SCXcodeMinimap/SCXcodeMinimap.m b/SCXcodeMinimap/SCXcodeMinimap.m
@@ -53,17 +53,17 @@ - (void)createMenuItem
     }
     
     NSMenuItem *miniMapItem = [[NSMenuItem alloc] initWithTitle:@""
-                                                               action:NULL
-                                                        keyEquivalent:@"M"];
+                                                         action:NULL
+                                                  keyEquivalent:@"M"];
     [miniMapItem setKeyEquivalentModifierMask:NSControlKeyMask | NSShiftKeyMask];
     
     miniMapItem.target = self;
     
     [editMenuItem.submenu insertItem:[NSMenuItem separatorItem]
-                               atIndex:[editMenuItem.submenu numberOfItems]];
+                             atIndex:[editMenuItem.submenu numberOfItems]];
     [editMenuItem.submenu insertItem:miniMapItem
-                               atIndex:[editMenuItem.submenu numberOfItems]];
-
+                             atIndex:[editMenuItem.submenu numberOfItems]];
+    
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SCXodeMinimapIsInitiallyHidden]) {
         [self hideMiniMap:miniMapItem];
     }
@@ -75,33 +75,29 @@ - (void)createMenuItem
 - (void)hideMiniMap:(NSMenuItem *)sender
 {
     [[NSUserDefaults standardUserDefaults] setBool:YES forKey:SCXodeMinimapIsInitiallyHidden];
-
+    
     [sender setTitle:@"Show MiniMap"];
     [sender setAction:@selector(showMiniMap:)];
-
+    
     [[NSNotificationCenter defaultCenter] postNotificationName:SCXodeMinimapWantsToBeHiddenNotification object:nil];
 }
 
 - (void)showMiniMap:(NSMenuItem *)sender
 {
     [[NSUserDefaults standardUserDefaults] setBool:NO forKey:SCXodeMinimapIsInitiallyHidden];
-
+    
     [sender setTitle:@"Hide MiniMap"];
     [sender setAction:@selector(hideMiniMap:)];
-
+    
     [[NSNotificationCenter defaultCenter] postNotificationName:SCXodeMinimapWantsToBeShownNotification object:nil];
 }
 
 - (void)onDocumentDidChange:(NSNotification*)sender
 {
-	if ([[[sender object] class] isSubclassOfClass:[NSDocument class]])
-	{
     SCMiniMapView *miniMapView = objc_getAssociatedObject([sender object], &kKeyMiniMapView);
     [miniMapView updateTextView];
 }
 
-}
-
 - (void)onCodeEditorBoundsChange:(NSNotification*)sender
 {
     if(![sender.object respondsToSelector:@selector(scrollView)]) {
@@ -131,32 +127,32 @@ - (void)onDidFinishSetup:(NSNotification*)sender
         NSLog(@"Could not fetch editor document");
         return;
     }
-
+    
     /* Get Editor Components */
     NSDocument *editorDocument      = [[sender object] performSelector:@selector(sourceCodeDocument)];
     NSView *editorContainerView     = [[sender object] performSelector:@selector(containerView)];
     NSScrollView *editorScrollView  = [[sender object] performSelector:@selector(scrollView)];
     NSTextView *editorTextView      = [[sender object] performSelector:@selector(textView)];
     
     [editorTextView setAutoresizingMask:NSViewMinXMargin | NSViewMaxXMargin | NSViewWidthSizable | NSViewHeightSizable];
-
+    
     /* Create Mini Map */
     CGFloat width = editorTextView.bounds.size.width * kDefaultZoomLevel;
     
     NSRect miniMapScrollViewFrame = NSMakeRect(editorContainerView.bounds.size.width - width,
                                                0,
                                                width,
                                                editorScrollView.bounds.size.height);
-
+    
     SCMiniMapView *miniMapView = [[SCMiniMapView alloc] initWithFrame:miniMapScrollViewFrame];
     miniMapView.editorScrollView = editorScrollView;
     miniMapView.editorTextView = editorTextView;
     [editorContainerView addSubview:miniMapView];
-
+    
     /* Setup Associated Objects */
     objc_setAssociatedObject(editorScrollView,  &kKeyMiniMapView, miniMapView, OBJC_ASSOCIATION_ASSIGN);
     objc_setAssociatedObject(editorDocument,    &kKeyMiniMapView, miniMapView, OBJC_ASSOCIATION_ASSIGN);
-
+    
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SCXodeMinimapIsInitiallyHidden]) {
         [miniMapView hide];
     }
