Merge pull request #1 from stefanceriu/master

Merge from stefanceriu/SCXcodeMiniMap master

Author: jegnux

SCXcodeMinimap/SCSelectionView.h

@@ -10,4 +10,6 @@
 
 @interface SCSelectionView : NSView
 
+@property (nonatomic, assign) BOOL shouldInverseColors;
+
 @end

SCXcodeMinimap/SCSelectionView.m

@@ -8,13 +8,68 @@
 
 #import "SCSelectionView.h"
 
+@interface SCSelectionView ()
+
+@property (nonatomic, retain) NSColor *selectionColor;
+
+@end
+
 @implementation SCSelectionView
 
+- (void)dealloc
+{
+    [self.selectionColor release];
+    [super dealloc];
+}
+
 - (void)drawRect:(NSRect)dirtyRect
 {
-    [[NSColor colorWithDeviceRed:0.0f green:0.0f blue:0.0f alpha:0.3f] setFill];
+    [[self selectionColor] setFill];
     NSRectFill(dirtyRect);
 }
 
+- (NSColor *)selectionColor
+{
+    if(_selectionColor == nil) {
+        
+        _selectionColor = [NSColor colorWithDeviceRed:0.0f green:0.0f blue:0.0f alpha:0.3f];
+        
+        Class DVTFontAndColorThemeClass = NSClassFromString(@"DVTFontAndColorTheme");
+        
+        if([DVTFontAndColorThemeClass respondsToSelector:@selector(currentTheme)]) {
+            NSObject *theme = [DVTFontAndColorThemeClass performSelector:@selector(currentTheme)];
+            
+            if([theme respondsToSelector:@selector(sourceTextBackgroundColor)]) {
+                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])
+                                                                alpha:0.3f];
+                } else {
+                    
+                    _selectionColor = [NSColor colorWithCalibratedHue:0.0f
+                                                           saturation:0.0f
+                                                           brightness:(1.0f - [backgroundColor brightnessComponent])
+                                                                alpha:0.3f];
+                }
+            }
+        }
+    }
+    
+    return _selectionColor;
+}
+
+- (void)setShouldInverseColors:(BOOL)shouldInverseColors
+{
+    if(_shouldInverseColors == shouldInverseColors) {
+        return;
+    }
+    
+    _shouldInverseColors = shouldInverseColors;
+    _selectionColor = nil;
+}
 
 @end

SCXcodeMinimap/SCXcodeMinimap.m

@@ -78,26 +78,11 @@ - (void)updateMiniMapTextView:(NSTextView*)textView withAttributedString:(NSAttr
     [mutableAttributedString enumerateAttributesInRange:NSMakeRange(0, mutableAttributedString.length) options:NSAttributedStringEnumerationReverse usingBlock:
      ^(NSDictionary *attributes, NSRange range, BOOL *stop) {
 
-         NSMutableParagraphStyle *newParagraphStyle = [[attributes objectForKey:NSParagraphStyleAttributeName] mutableCopy];
-         newParagraphStyle.minimumLineHeight *= kDefaultZoomLevel;
-         newParagraphStyle.maximumLineHeight *= kDefaultZoomLevel;
-         newParagraphStyle.paragraphSpacing *= kDefaultZoomLevel;
-         newParagraphStyle.paragraphSpacingBefore *= kDefaultZoomLevel;
-         newParagraphStyle.firstLineHeadIndent *= kDefaultZoomLevel;
-         newParagraphStyle.headIndent *= kDefaultZoomLevel;
-         newParagraphStyle.tailIndent *= kDefaultZoomLevel;
-         newParagraphStyle.tighteningFactorForTruncation *= kDefaultZoomLevel;
-         
          NSFont *font = [attributes objectForKey:NSFontAttributeName];
          NSFont *newFont = [NSFont fontWithName:font.familyName size:font.pointSize * kDefaultZoomLevel];
 
-         NSObject *DVTFontAndColorTheme = [NSClassFromString(@"DVTFontAndColorTheme") performSelector:@selector(currentTheme)];
-         NSColor *textColor = [DVTFontAndColorTheme performSelector:@selector(sourcePlainTextColor)];
-         
          NSMutableDictionary *mutableAttributes = [NSMutableDictionary dictionaryWithDictionary:attributes];
-         [mutableAttributes setObject:newParagraphStyle forKey:NSParagraphStyleAttributeName];
          [mutableAttributes setObject:newFont forKey:NSFontAttributeName];
-         [mutableAttributes setObject:textColor forKey:NSForegroundColorAttributeName];
          [mutableAttributedString setAttributes:mutableAttributes range:range];
      }];
 
@@ -167,7 +152,7 @@ - (void)onDidFinishSetup:(NSNotification*)sender
     CGFloat width = editorTextView.bounds.size.width * kDefaultZoomLevel;
 
     NSRect frame = editorTextView.frame;
-    frame.size.width -= (width + kRightSidePadding);
+    frame.size.width -= width;
     [editorTextView setFrame:frame];
 
     NSRect miniMapScrollViewFrame = NSMakeRect(editorContainerView.bounds.size.width - width - kRightSidePadding, 0, width, editorScrollView.bounds.size.height);
@@ -194,9 +179,18 @@ - (void)onDidFinishSetup:(NSNotification*)sender
     [miniMapScrollView setDocumentView:miniMapTextView];
     [miniMapTextView release];
 
-    NSObject *DVTFontAndColorTheme = [NSClassFromString(@"DVTFontAndColorTheme") performSelector:@selector(currentTheme)];
-    NSColor *backgroundColor = [DVTFontAndColorTheme performSelector:@selector(sourceTextBackgroundColor)];
-    [miniMapTextView setBackgroundColor:[backgroundColor shadowWithLevel:kDefaultShadowLevel]];
+    NSColor *miniMapBackgroundColor = [NSColor clearColor];
+    Class DVTFontAndColorThemeClass = NSClassFromString(@"DVTFontAndColorTheme");
+    if([DVTFontAndColorThemeClass respondsToSelector:@selector(currentTheme)]) {
+        NSObject *theme = [DVTFontAndColorThemeClass performSelector:@selector(currentTheme)];
+        
+        if([theme respondsToSelector:@selector(sourceTextBackgroundColor)]) {
+            miniMapBackgroundColor = [theme performSelector:@selector(sourceTextBackgroundColor)];
+            
+        }
+    }
+    
+    [miniMapTextView setBackgroundColor:[miniMapBackgroundColor shadowWithLevel:kDefaultShadowLevel]];
 
     objc_setAssociatedObject(editorDocument, &kKeyMiniMapTextView, miniMapTextView, OBJC_ASSOCIATION_ASSIGN);
     objc_setAssociatedObject(editorScrollView, &kKeyMiniMapTextView, miniMapTextView, OBJC_ASSOCIATION_ASSIGN);
@@ -206,6 +200,7 @@ - (void)onDidFinishSetup:(NSNotification*)sender
     NSRect miniMapSelectionViewFrame = NSMakeRect(0, 0, miniMapScrollView.bounds.size.width, editorScrollView.visibleRect.size.height * kDefaultZoomLevel);
     SCSelectionView *miniMapSelectionView = [[SCSelectionView alloc] initWithFrame:miniMapSelectionViewFrame];
     [miniMapSelectionView setAutoresizingMask: NSViewMinXMargin | NSViewMaxXMargin | NSViewWidthSizable | NSViewHeightSizable | NSViewMinYMargin | NSViewMaxYMargin];
+    //[miniMapSelectionView setShouldInverseColors:YES];
     [miniMapScrollView.contentView addSubview:miniMapSelectionView];
     [miniMapSelectionView release];
 
@@ -217,10 +212,12 @@ - (void)onDidFinishSetup:(NSNotification*)sender
 
 #pragma mark - NSLayoutManagerDelegate
 
-- (void)layoutManager:(NSLayoutManager *)layoutManager didCompleteLayoutForTextContainer:(NSTextContainer *)textContainer atEnd:(BOOL)layoutFinishedFlag
+- (void)layoutManager:(NSLayoutManager *)layoutManager didCompleteLayoutForTextContainer:(NSTextContainer *)textContainer atEnd:(BOOL)layoutFinished
 {
-    NSScrollView *editorScrollView = objc_getAssociatedObject(textContainer, &kKeyEditorScrollView);
-    [self updateMiniMapForEditorScrollView:editorScrollView];
+    if(layoutFinished) {
+        NSScrollView *editorScrollView = objc_getAssociatedObject(textContainer, &kKeyEditorScrollView);
+        [self updateMiniMapForEditorScrollView:editorScrollView];
+    }
 }
 
 - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager shouldUseTemporaryAttributes:(NSDictionary *)attrs forDrawingToScreen:(BOOL)toScreen atCharacterIndex:(NSUInteger)charIndex effectiveRange:(NSRangePointer)effectiveCharRange