Merge pull request #3 from JegnuX/master

Navigation Support

Author: stefanceriu

SCXcodeMinimap.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		18D2B13117244C0A0026D09F /* SCSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 18D2B13017244C0A0026D09F /* SCSelectionView.m */; };
 		18FE09B61707639E00118FEB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18FE09B51707639E00118FEB /* Cocoa.framework */; };
 		18FE09C9170764E400118FEB /* SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FE09C8170764E400118FEB /* SCXcodeMinimap.m */; };
+		B2A3E44A172E714F004A56C1 /* SCTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A3E449172E714F004A56C1 /* SCTextView.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -24,6 +25,8 @@
 		18FE09C11707639E00118FEB /* SCXcodeMinimap-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SCXcodeMinimap-Prefix.pch"; sourceTree = "<group>"; };
 		18FE09C7170764E400118FEB /* SCXcodeMinimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCXcodeMinimap.h; sourceTree = "<group>"; };
 		18FE09C8170764E400118FEB /* SCXcodeMinimap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SCXcodeMinimap.m; sourceTree = "<group>"; };
+		B2A3E448172E714F004A56C1 /* SCTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCTextView.h; sourceTree = "<group>"; };
+		B2A3E449172E714F004A56C1 /* SCTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SCTextView.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -81,6 +84,8 @@
 				18FE09C8170764E400118FEB /* SCXcodeMinimap.m */,
 				18D2B12F17244C0A0026D09F /* SCSelectionView.h */,
 				18D2B13017244C0A0026D09F /* SCSelectionView.m */,
+				B2A3E448172E714F004A56C1 /* SCTextView.h */,
+				B2A3E449172E714F004A56C1 /* SCTextView.m */,
 				18FE09BC1707639E00118FEB /* Supporting Files */,
 			);
 			path = SCXcodeMinimap;
@@ -158,6 +163,7 @@
 			files = (
 				18FE09C9170764E400118FEB /* SCXcodeMinimap.m in Sources */,
 				18D2B13117244C0A0026D09F /* SCSelectionView.m in Sources */,
+				B2A3E44A172E714F004A56C1 /* SCTextView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

SCXcodeMinimap/SCTextView.h

@@ -0,0 +1,24 @@
+//
+//  SCTextView.h
+//  SCXcodeMinimap
+//
+//  Created by Jérôme ALVES on 29/04/13.
+//  Copyright (c) 2013 Stefan Ceriu. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@class SCTextView;
+
+@protocol SCTextViewDelegate <NSTextViewDelegate>
+
+- (void)textView:(SCTextView *)textView goAtRelativePosition:(NSPoint)position;
+
+@end
+
+@interface SCTextView : NSTextView
+
+- (void)setDelegate:(id<SCTextViewDelegate>)anObject;
+- (id<SCTextViewDelegate>)delegate;
+
+@end

SCXcodeMinimap/SCTextView.m

@@ -0,0 +1,47 @@
+//
+//  SCTextView.m
+//  SCXcodeMinimap
+//
+//  Created by Jérôme ALVES on 29/04/13.
+//  Copyright (c) 2013 Stefan Ceriu. All rights reserved.
+//
+
+#import "SCTextView.h"
+
+@implementation SCTextView
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    [super mouseDown:theEvent];
+    [self handleMouseEvent:theEvent];
+}
+
+- (void)mouseDragged:(NSEvent *)theEvent
+{
+    [super mouseDragged:theEvent];
+    [self handleMouseEvent:theEvent];
+}
+
+- (void) handleMouseEvent:(NSEvent *)theEvent
+{
+    if ([self.delegate respondsToSelector:@selector(textView:goAtRelativePosition:)])
+    {
+        NSPoint locationInSelf = [self convertPoint:theEvent.locationInWindow fromView:nil];
+        NSSize size = [self.layoutManager usedRectForTextContainer:self.textContainer].size;
+        NSPoint point = NSMakePoint(locationInSelf.x / size.width, locationInSelf.y / size.height);
+
+        [self.delegate textView:self goAtRelativePosition:point];
+    }
+}
+
+- (void)setDelegate:(id<SCTextViewDelegate>)anObject
+{
+    [super setDelegate:anObject];
+}
+
+- (id<SCTextViewDelegate>)delegate
+{
+    return (id<SCTextViewDelegate>)[super delegate];
+}
+
+@end

SCXcodeMinimap/SCXcodeMinimap.h

@@ -7,7 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "SCTextView.h"
 
-@interface SCXcodeMinimap : NSObject
+@interface SCXcodeMinimap : NSObject <SCTextViewDelegate>
 
 @end

SCXcodeMinimap/SCXcodeMinimap.m

@@ -23,7 +23,7 @@
 static NSString * const DVTFontAndColorSourceTextSettingsChangedNotification = @"DVTFontAndColorSourceTextSettingsChangedNotification";//Unused
 
 #define kDefaultZoomLevel 0.1f
-#define kRightSidePadding 15.0f
+#define kRightSidePadding 10.0f
 #define kDefaultShadowLevel 0.1f
 
 @implementation SCXcodeMinimap
@@ -167,24 +167,27 @@ - (void)onDidFinishSetup:(NSNotification*)sender
     CGFloat width = editorTextView.bounds.size.width * kDefaultZoomLevel;
 
     NSRect frame = editorTextView.frame;
-    frame.size.width -= width;
+    frame.size.width -= (width + kRightSidePadding);
     [editorTextView setFrame:frame];
 
     NSRect miniMapScrollViewFrame = NSMakeRect(editorContainerView.bounds.size.width - width - kRightSidePadding, 0, width, editorScrollView.bounds.size.height);
     NSScrollView *miniMapScrollView = [[NSScrollView alloc] initWithFrame:miniMapScrollViewFrame];
     [miniMapScrollView setWantsLayer:YES];
     [miniMapScrollView setAutoresizingMask: NSViewMinXMargin | NSViewWidthSizable | NSViewHeightSizable];
     [miniMapScrollView setDrawsBackground:NO];
+    [miniMapScrollView setHorizontalScrollElasticity:NSScrollElasticityNone];
+    [miniMapScrollView setVerticalScrollElasticity:NSScrollElasticityNone];
     [editorContainerView addSubview:miniMapScrollView];
     [miniMapScrollView release];
 
     objc_setAssociatedObject(editorScrollView, &kKeyMiniMapScrollView, miniMapScrollView, OBJC_ASSOCIATION_ASSIGN);
 
-    NSTextView *miniMapTextView = [[NSTextView alloc] initWithFrame:miniMapScrollView.bounds];
+    SCTextView *miniMapTextView = [[SCTextView alloc] initWithFrame:miniMapScrollView.bounds];
     [miniMapTextView setAutoresizingMask: NSViewMinXMargin | NSViewMaxXMargin | NSViewWidthSizable | NSViewHeightSizable];
     [miniMapTextView.textContainer setLineFragmentPadding:0.0f];
     [miniMapTextView setSelectable:NO];
     [miniMapTextView.layoutManager setDelegate:(id<NSLayoutManagerDelegate>)self];
+    [miniMapTextView setDelegate:self];
 
     objc_setAssociatedObject(miniMapTextView.layoutManager, &kKeyEditorTextView, editorTextView, OBJC_ASSOCIATION_ASSIGN);
 
@@ -226,4 +229,24 @@ - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager shouldUseTempor
     return [(id<NSLayoutManagerDelegate>)editorTextView layoutManager:layoutManager shouldUseTemporaryAttributes:attrs forDrawingToScreen:toScreen atCharacterIndex:charIndex effectiveRange:effectiveCharRange];
 }
 
+#pragma mark - SCTextViewDelegate
+
+- (void)textView:(SCTextView *)textView goAtRelativePosition:(NSPoint)position
+{
+    NSScrollView *editorScrollView = objc_getAssociatedObject(textView.textContainer, &kKeyEditorScrollView);
+
+    CGFloat documentHeight = [editorScrollView.documentView frame].size.height;
+    CGSize boundsSize = editorScrollView.bounds.size;
+    CGFloat maxOffset = documentHeight - boundsSize.height;
+    
+    CGFloat offset =  floor(documentHeight * position.y - boundsSize.height/2);
+
+    offset = MIN(MAX(0, offset), maxOffset);
+
+    NSTextView *editorTextView = objc_getAssociatedObject(textView.layoutManager, &kKeyEditorTextView);
+    
+    [editorTextView scrollRectToVisible:NSMakeRect(0, offset, boundsSize.width, boundsSize.height)];
+}
+
+
 @end