Moved the MiniMap show/hide menu item to the View menu and added a Ctrl+Shift+M shortcut

Author: stefanceriu

SCXcodeMinimap/SCMiniMapView.m

@@ -8,7 +8,6 @@
 
 #import "SCMiniMapView.h"
 #import "SCXcodeMinimap.h"
-#import <QuartzCore/QuartzCore.h>
 
 @implementation SCMiniMapView
 
@@ -91,7 +90,7 @@ - (SCSelectionView *)selectionView
 
 #pragma mark - Show/Hide
 
-- (void) show
+- (void)show
 {
     self.hidden = NO;
 
@@ -103,7 +102,7 @@ - (void) show
     [self updateSelectionView];
 }
 
-- (void) hide
+- (void)hide
 {
     self.hidden = YES;
 
@@ -204,19 +203,18 @@ - (void)mouseDragged:(NSEvent *)theEvent
 
 - (void) handleMouseEvent:(NSEvent *)theEvent
 {
-        NSPoint locationInSelf = [self convertPoint:theEvent.locationInWindow fromView:nil];
-        
-        NSSize textSize = [self.textView.layoutManager usedRectForTextContainer:self.textView.textContainer].size;
-        NSSize frameSize = self.frame.size;
+    NSPoint locationInSelf = [self convertPoint:theEvent.locationInWindow fromView:nil];
 
-    NSLog(@"text Height : %f ; frame Height : %f",textSize.height, frameSize.height);
-        NSPoint point;
-        if (textSize.height < frameSize.height) {
-            point = NSMakePoint(locationInSelf.x / textSize.width, locationInSelf.y / textSize.height);
-        }
-        else {
-            point = NSMakePoint(locationInSelf.x / textSize.width, locationInSelf.y / frameSize.height);
-        }
+    NSSize textSize = [self.textView.layoutManager usedRectForTextContainer:self.textView.textContainer].size;
+    NSSize frameSize = self.frame.size;
+    
+    NSPoint point;
+    if (textSize.height < frameSize.height) {
+        point = NSMakePoint(locationInSelf.x / textSize.width, locationInSelf.y / textSize.height);
+    }
+    else {
+        point = NSMakePoint(locationInSelf.x / textSize.width, locationInSelf.y / frameSize.height);
+    }
 
     [self goAtRelativePosition:point];
 }

SCXcodeMinimap/SCXcodeMinimap.m

@@ -8,7 +8,6 @@
 
 #import "SCMiniMapView.h"
 #import "SCXcodeMinimap.h"
-#import "SCSelectionView.h"
 #import <objc/runtime.h>
 
 static char kKeyMiniMapView;
@@ -45,10 +44,11 @@ - (id)init {
 
 - (void)createMenuItem
 {
-    NSMenuItem *editMenuItem = [[NSApp mainMenu] itemWithTitle:@"Edit"];
-    NSMenuItem *miniMapItem = [[NSMenuItem alloc] initWithTitle:@"Show Mini Map"
+    NSMenuItem *editMenuItem = [[NSApp mainMenu] itemWithTitle:@"View"];
+    NSMenuItem *miniMapItem = [[NSMenuItem alloc] initWithTitle:@""
                                                                action:NULL
-                                                        keyEquivalent:@""];
+                                                        keyEquivalent:@"M"];
+    [miniMapItem setKeyEquivalentModifierMask:NSControlKeyMask | NSShiftKeyMask];
 
     miniMapItem.target = self;
 
@@ -67,21 +67,21 @@ - (void)createMenuItem
     }
 }
 
-- (void) hideMiniMap:(NSMenuItem *)sender
+- (void)hideMiniMap:(NSMenuItem *)sender
 {
     [[NSUserDefaults standardUserDefaults] setBool:YES forKey:SCXodeMinimapIsInitiallyHidden];
 
-    [sender setState:NSOffState];
+    [sender setTitle:@"Show MiniMap"];
     [sender setAction:@selector(showMiniMap:)];
 
     [[NSNotificationCenter defaultCenter] postNotificationName:SCXodeMinimapWantsToBeHiddenNotification object:nil];
 }
 
-- (void) showMiniMap:(NSMenuItem *)sender
+- (void)showMiniMap:(NSMenuItem *)sender
 {
     [[NSUserDefaults standardUserDefaults] setBool:NO forKey:SCXodeMinimapIsInitiallyHidden];
 
-    [sender setState:NSOnState];
+    [sender setTitle:@"Hide MiniMap"];
     [sender setAction:@selector(hideMiniMap:)];
 
     [[NSNotificationCenter defaultCenter] postNotificationName:SCXodeMinimapWantsToBeShownNotification object:nil];