Fixed size menu item layout and updated readme.

Author: stefanceriu

README.md

@@ -1,22 +1,27 @@
-# SCXcodeMinimap v2.0
+# SCXcodeMinimap v2.2
 SCXcodeMiniMap is a Xcode plugin that adds a source editor Minimap to Xcode.
 
-Version 2.0 has been rewritten from the ground up to address performance issues (delays on large source files - 1000+ lines) and for creating a better base to build upon. As such, the following new features are now supported:
+#### Features
 
-#### New Features
-- Faster syntax highlighting
-- Shows code foldings
-- Comment and preprocessor directive highlighting
-- Breakpoint highlighting
-- All highlighting options are also available for the main Xcode editor
+- Custom size
 - Custom themes
-- All options are accessible from the View/Minimap menu item
+- Can hide the main editor scroller
+- Show code foldings
+- Highlights comments and preprocessor directives
+- Highlights breakpoints
+- Highlights build errors and warnings
+- Hihglights Xcode's "instances of selected symbol" (Preferences/Text Editing)
+- All these highlighting options are also available for the main editor
+
+All options are configurable through the View/Minimap menu item
 
 #### Screenshots
 Without editor highlighting |  With editor highlighting
 :--------------------------:|:--------------------------:
-![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-01.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-03.png)  |
-![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-02.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-04.png)  |
+![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-01.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-03.png)  |
+![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-02.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-04.png)  |
+
+![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/selectedSymbolInstancesHighlighting.gif)
 
 #### Installation
 - Through [Alcatraz](https://github.com/supermarin/Alcatraz)

SCXcodeMinimap/DBGBreakpointAnnotationProvider+SCXcodeMinimap.m

@@ -21,7 +21,7 @@ + (void)load
 }
 
 - (id<DBGBreakpointAnnotationProviderDelegate>)minimapDelegate
-{	
+{
 	return objc_getAssociatedObject(self, @selector(minimapDelegate));
 }
 

SCXcodeMinimap/SCXcodeMinimap.m

@@ -129,10 +129,10 @@ - (void)createMenuItem
 
 		[minimapMenu addItem:[NSMenuItem separatorItem]];
 
-		NSView *sizeView = [[NSView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 200.0f, 20.0f)];
+		NSView *sizeView = [[NSView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 225.0f, 20.0f)];
 		[sizeView setAutoresizingMask:NSViewMinXMargin | NSViewMaxXMargin | NSViewMinYMargin | NSViewMaxYMargin];
 
-		NSTextField *sizeViewTitleLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(18.0f, 0.0f, 50.0f, 20.0f)];
+		NSTextField *sizeViewTitleLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(20.0f, 0.0f, 50.0f, 20.0f)];
 		[sizeViewTitleLabel setStringValue:kSizeMenuItemTitle];
 		[sizeViewTitleLabel setFont:[NSFont systemFontOfSize:14]];
 		[sizeViewTitleLabel setBezeled:NO];
@@ -141,7 +141,7 @@ - (void)createMenuItem
 		[sizeViewTitleLabel setSelectable:NO];
 		[sizeView addSubview:sizeViewTitleLabel];
 
-		NSSlider *sizeSlider = [[NSSlider alloc] initWithFrame:CGRectMake(60.0f, 0.0f, 136.0f, 20.0f)];
+		NSSlider *sizeSlider = [[NSSlider alloc] initWithFrame:CGRectMake(60.0f, 0.0f, 156.0f, 20.0f)];
 		[sizeSlider setMaxValue:0.35f];
 		[sizeSlider setMinValue:0.05f];
 		[sizeSlider setTarget:self];

SCXcodeMinimap/SCXcodeMinimapView.m

@@ -96,7 +96,7 @@ @interface SCXcodeMinimapView () < NSLayoutManagerDelegate,
 @implementation SCXcodeMinimapView
 
 - (void)dealloc
-{	
+{
 	for(id observer in self.notificationObservers) {
 		[[NSNotificationCenter defaultCenter] removeObserver:observer];
 	}
@@ -113,7 +113,7 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
 		self.editor = editor;
 
 		self.editorTextView = editor.textView;
-
+		
 		[self setWantsLayer:YES];
 		[self setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin | NSViewWidthSizable | NSViewHeightSizable];
 
@@ -251,10 +251,10 @@ - (void)viewDidMoveToWindow
 	if(self.window == nil) {
 		return;
 	}
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self setVisible:[[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldDisplayKey] boolValue]];
-    });
+	
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[self setVisible:[[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldDisplayKey] boolValue]];
+	});
 }
 
 #pragma mark - Show/Hide
@@ -265,7 +265,7 @@ - (void)setVisible:(BOOL)visible
 
 	[self updateSize];
 
-	[self.textView.layoutManager setDelegate:(self.hidden ? nil : self)];	
+	[self.textView.layoutManager setDelegate:(self.hidden ? nil : self)];
 	[self.textView.layoutManager setBackgroundLayoutEnabled:YES];
 	[self.textView.layoutManager setAllowsNonContiguousLayout:YES];
 
@@ -301,7 +301,7 @@ - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager
 		[self delayedInvalidateDisplayForVisibleRange];
 		return @{NSForegroundColorAttributeName : theme.sourcePlainTextColor};
 	}
-
+	
 	if(self.shouldAllowFullSyntaxHighlight) {
 
 		if(self.highlightedSymbolDictionaries.count) {
@@ -455,8 +455,8 @@ - (void)updateBreakpointsAndIssuesWithCompletion:(void(^)())completion
 				for(DBGBreakpointAnnotation *breakpointAnnotation in weakSelf.breakpointAnnotationProvider.annotations) {
 					if(breakpointAnnotation.paragraphRange.location == lineNumber) {
 						[weakSelf.breakpointsDictionaries addObject:@{kAnnotationRangeKey : [NSValue valueWithRange:lineRange],
-																  kAnnotationEnabledKey : @(breakpointAnnotation.enabled),
-																  kAnnotationTypeKey : @(SCXcodeMinimapAnnotationTypeBreakpoint)}];
+																	  kAnnotationEnabledKey : @(breakpointAnnotation.enabled),
+																	  kAnnotationTypeKey : @(SCXcodeMinimapAnnotationTypeBreakpoint)}];
 					}
 				}
 			}
@@ -473,7 +473,7 @@ - (void)updateBreakpointsAndIssuesWithCompletion:(void(^)())completion
 						}
 
 						[weakSelf.issuesDictionaries addObject:@{kAnnotationRangeKey : [NSValue valueWithRange:lineRange],
-															 kAnnotationTypeKey : @(annotationType)}];
+																 kAnnotationTypeKey : @(annotationType)}];
 					}
 				}
 			}
@@ -588,7 +588,7 @@ - (void)handleMouseEvent:(NSEvent *)theEvent
 - (void)updateTheme
 {
 	self.editorTheme = [SCXcodeMinimapTheme minimapThemeWithTheme:[DVTFontAndColorTheme currentTheme]];
-
+	
 	DVTPreferenceSetManager *preferenceSetManager = [DVTFontAndColorTheme preferenceSetsManager];
 	NSArray *preferenceSet = [preferenceSetManager availablePreferenceSets];
 
@@ -614,9 +614,9 @@ - (void)updateTheme
 - (void)updateSize
 {
 	CGFloat zoomLevel = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapZoomLevelKey] doubleValue];
-
+	
 	CGFloat minimapWidth = (self.hidden ? 0.0f : self.editor.containerView.bounds.size.width * zoomLevel);
-
+	
 	NSRect editorScrollViewFrame = self.editor.scrollView.frame;
 	editorScrollViewFrame.size.width = self.editor.scrollView.superview.frame.size.width - minimapWidth;
 	self.editor.scrollView.frame = editorScrollViewFrame;
@@ -626,7 +626,7 @@ - (void)updateSize
 	CGRect frame = self.textView.bounds;
 	frame.size.width = CGRectGetWidth(self.editorTextView.bounds);
 	[self.textView setFrame:frame];
-
+	
 	CGFloat actualZoomLevel =  CGRectGetWidth(self.bounds) / CGRectGetWidth(self.editor.textView.bounds);
 	[self.scrollView setMagnification:actualZoomLevel];