Considering text container insets in offset calculations, moved size menu item title to its own constant.

Author: stefanceriu

SCXcodeMinimap/SCXcodeMinimap.m

@@ -53,6 +53,8 @@
 NSString *const kShowMinimapMenuItemTitle = @"Show Minimap";
 NSString *const kHideMinimapMenuItemTitle = @"Hide Minimap";
 
+NSString *const kSizeMenuItemTitle = @"Size";
+
 NSString *const kHighlightBreakpointsMenuItemTitle = @"Highlight breakpoints";
 NSString *const kHighlightIssuesMenuItemTitle = @"Highlight issues";
 NSString *const kHighlightSelectedSymbolMenuItemTitle = @"Highlight selected symbol";
@@ -131,7 +133,7 @@ - (void)createMenuItem
 		[sizeView setAutoresizingMask:NSViewMinXMargin | NSViewMaxXMargin | NSViewMinYMargin | NSViewMaxYMargin];
 
 		NSTextField *sizeViewTitleLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(18.0f, 0.0f, 50.0f, 20.0f)];
-		[sizeViewTitleLabel setStringValue:@"Size"];
+		[sizeViewTitleLabel setStringValue:kSizeMenuItemTitle];
 		[sizeViewTitleLabel setFont:[NSFont systemFontOfSize:14]];
 		[sizeViewTitleLabel setBezeled:NO];
 		[sizeViewTitleLabel setDrawsBackground:NO];

SCXcodeMinimap/SCXcodeMinimapView.m

@@ -529,15 +529,14 @@ - (void)updateOffset
 		return;
 	}
 
-	CGFloat ratio = (adjustedMinimapContentHeight / adjustedEditorContentHeight) * (1 / 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];
+	CGFloat editorYOffset = CGRectGetMinY(self.editor.scrollView.contentView.bounds) + ABS(CGRectGetMinY(self.editorTextView.frame));
 
+	CGFloat ratio = (adjustedMinimapContentHeight / adjustedEditorContentHeight) * (1 / self.scrollView.magnification);
+	[self.scrollView.documentView scrollPoint:NSMakePoint(self.editor.scrollView.contentView.bounds.origin.x,
+														  MAX(0, floorf(editorYOffset * ratio * self.scrollView.magnification)))];
 
 	ratio = (editorTextHeight - self.selectionView.bounds.size.height) / adjustedEditorContentHeight;
-	selectionViewFrame.origin.y = self.editor.scrollView.contentView.bounds.origin.y * ratio;
+	selectionViewFrame.origin.y = editorYOffset * ratio;
 
 	[self.selectionView setFrame:selectionViewFrame];
 }
@@ -569,6 +568,7 @@ - (void)handleMouseEvent:(NSEvent *)theEvent
 
 	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);
+	neededRect.origin.y += CGRectGetMinY(self.editorTextView.frame);
 
 	BOOL shouldAnimateContentOffset = (theEvent.type != NSLeftMouseDragged);