Various tweaks for #41

Author: stefanceriu

SCXcodeMinimap.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1819E4291AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1819E4281AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m */; };
 		184C11861A740F97002A7C65 /* SCXcodeMinimapSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 184C11821A740F97002A7C65 /* SCXcodeMinimapSelectionView.m */; };
 		184C11871A740F97002A7C65 /* SCXcodeMinimapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 184C11841A740F97002A7C65 /* SCXcodeMinimapView.m */; };
 		184C118F1A741136002A7C65 /* DVTFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184C118E1A741136002A7C65 /* DVTFoundation.framework */; };
@@ -25,6 +26,8 @@
 /* Begin PBXFileReference section */
 		180F0C651A98AE1500E97254 /* DVTAnnotationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTAnnotationManager.h; sourceTree = "<group>"; };
 		1812C3911A77A7CF00E2CFB3 /* IDESourceCodeDocument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = IDESourceCodeDocument.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		1819E4271AA1FB5900C344F2 /* SCXcodeMinimapScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCXcodeMinimapScrollView.h; sourceTree = "<group>"; };
+		1819E4281AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SCXcodeMinimapScrollView.m; sourceTree = "<group>"; };
 		18269AD51A8F2F4300953B3D /* DVTFoldingManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTFoldingManager.h; sourceTree = "<group>"; };
 		184407641A8F7B1900C530CF /* DVTTextDocumentLocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTTextDocumentLocation.h; sourceTree = "<group>"; };
 		184407651A8F7B3E00C530CF /* DVTDocumentLocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTDocumentLocation.h; sourceTree = "<group>"; };
@@ -183,6 +186,8 @@
 				18FE09C8170764E400118FEB /* SCXcodeMinimap.m */,
 				184C11831A740F97002A7C65 /* SCXcodeMinimapView.h */,
 				184C11841A740F97002A7C65 /* SCXcodeMinimapView.m */,
+				1819E4271AA1FB5900C344F2 /* SCXcodeMinimapScrollView.h */,
+				1819E4281AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m */,
 				184C11811A740F97002A7C65 /* SCXcodeMinimapSelectionView.h */,
 				184C11821A740F97002A7C65 /* SCXcodeMinimapSelectionView.m */,
 				18C2EA5A1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.h */,
@@ -270,6 +275,7 @@
 				184C11861A740F97002A7C65 /* SCXcodeMinimapSelectionView.m in Sources */,
 				184C11871A740F97002A7C65 /* SCXcodeMinimapView.m in Sources */,
 				18C2EA5C1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.m in Sources */,
+				1819E4291AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

SCXcodeMinimap/SCXcodeMinimapScrollView.h

@@ -0,0 +1,13 @@
+//
+//  SCXcodeMinimapScrollView.h
+//  SCXcodeMinimap
+//
+//  Created by Stefan Ceriu on 28/02/2015.
+//  Copyright (c) 2015 Stefan Ceriu. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface SCXcodeMinimapScrollView : NSScrollView
+
+@end

SCXcodeMinimap/SCXcodeMinimapScrollView.m

@@ -0,0 +1,18 @@
+//
+//  SCXcodeMinimapScrollView.m
+//  SCXcodeMinimap
+//
+//  Created by Stefan Ceriu on 28/02/2015.
+//  Copyright (c) 2015 Stefan Ceriu. All rights reserved.
+//
+
+#import "SCXcodeMinimapScrollView.h"
+
+@implementation SCXcodeMinimapScrollView
+
+- (void)scrollWheel:(NSEvent *)theEvent
+{
+	// Disable the scroll wheel on top of the minimap
+}
+
+@end

SCXcodeMinimap/SCXcodeMinimapView.m

@@ -8,6 +8,7 @@
 
 #import "SCXcodeMinimapView.h"
 #import "SCXcodeMinimap.h"
+#import "SCXcodeMinimapScrollView.h"
 #import "SCXcodeMinimapSelectionView.h"
 
 #import "IDESourceCodeEditor.h"
@@ -72,7 +73,7 @@ @interface SCXcodeMinimapView () <NSLayoutManagerDelegate, DVTFoldingManagerDele
 @property (nonatomic, weak) IDESourceCodeEditor *editor;
 @property (nonatomic, strong) DVTSourceTextView *editorTextView;
 
-@property (nonatomic, strong) NSScrollView *scrollView;
+@property (nonatomic, strong) SCXcodeMinimapScrollView *scrollView;
 @property (nonatomic, strong) DVTSourceTextView *textView;
 @property (nonatomic, strong) SCXcodeMinimapSelectionView *selectionView;
 @property (nonatomic, strong) IDESourceCodeDocument *document;
@@ -115,13 +116,15 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
 		[self setWantsLayer:YES];
 		[self setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin | NSViewWidthSizable | NSViewHeightSizable];
 
-		self.scrollView = [[NSScrollView alloc] initWithFrame:self.bounds];
+		self.scrollView = [[SCXcodeMinimapScrollView alloc] initWithFrame:self.bounds];
 		[self.scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 		[self.scrollView setDrawsBackground:NO];
 		[self.scrollView setMinMagnification:0.0f];
 		[self.scrollView setMaxMagnification:1.0f];
 		[self.scrollView setAllowsMagnification:NO];
 
+		[self.scrollView setHasHorizontalScroller:NO];
+		[self.scrollView setHasVerticalScroller:NO];
 		[self.scrollView setHorizontalScrollElasticity:NSScrollElasticityNone];
 		[self.scrollView setVerticalScrollElasticity:NSScrollElasticityNone];
 		[self addSubview:self.scrollView];
@@ -393,15 +396,16 @@ - (void)updateOffset
 	CGFloat adjustedEditorContentHeight = editorTextHeight - CGRectGetHeight(self.editor.scrollView.bounds);
 	CGFloat adjustedMinimapContentHeight = minimapTextHeight - (CGRectGetHeight(self.scrollView.bounds) * (1 / self.scrollView.magnification));
 
-	NSRect selectionViewFrame = NSMakeRect(0, 0, self.bounds.size.width * (1 / self.scrollView.magnification), self.editor.scrollView.visibleRect.size.height);
+	NSRect selectionViewFrame = NSMakeRect(0, 0, self.textView.bounds.size.width * (1 / self.scrollView.magnification), self.editor.scrollView.visibleRect.size.height);
 
 	if(adjustedEditorContentHeight == 0.0f) {
 		[self.selectionView setFrame:selectionViewFrame];
 		return;
 	}
 
 	CGFloat ratio = (adjustedMinimapContentHeight / adjustedEditorContentHeight) * (1 / self.scrollView.magnification);
-	CGPoint offset = NSMakePoint(0, MAX(0, floorf(self.editor.scrollView.contentView.bounds.origin.y * ratio * self.scrollView.magnification)));
+	CGPoint offset = NSMakePoint(self.editor.scrollView.contentView.bounds.origin.x,
+								 MAX(0, floorf(self.editor.scrollView.contentView.bounds.origin.y * ratio * self.scrollView.magnification)));
 
 	[self.scrollView.documentView scrollPoint:offset];
 
@@ -435,7 +439,16 @@ - (void)handleMouseEvent:(NSEvent *)theEvent
 	NSPoint point = [self.textView convertPoint:theEvent.locationInWindow fromView:nil];
 	NSUInteger characterIndex = [self.textView characterIndexForInsertionAtPoint:point];
 	NSRange lineRange = [self.textView.string lineRangeForRange:NSMakeRange(characterIndex, 0)];
-	[self.editorTextView scrollRangeToVisible:lineRange animate:YES];
+	NSRange activeRange = [self.textView.layoutManager glyphRangeForCharacterRange:lineRange actualCharacterRange:NULL];
+	
+	NSRect neededRect = [self.editorTextView.layoutManager boundingRectForGlyphRange:activeRange inTextContainer:self.editorTextView.textContainer];
+	neededRect.origin.y = MAX(0, neededRect.origin.y - CGRectGetHeight(self.editor.containerView.bounds) / 2);
+	
+	[NSAnimationContext beginGrouping];
+	[[NSAnimationContext currentContext] setDuration:0.25f];
+	[self.editor.scrollView.contentView.animator setBoundsOrigin:CGPointMake(0, neededRect.origin.y)];
+	[self.editor.scrollView reflectScrolledClipView:self.editor.scrollView.contentView];
+	[NSAnimationContext endGrouping];
 }
 
 #pragma mark - Theme