Xcode 5 fixes for issues #14 and #4 plus a strange crash on retina devices

Author: stefanceriu

SCXcodeMinimap.xcodeproj/project.pbxproj

@@ -132,7 +132,7 @@
 		18FE09AA1707639E00118FEB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = "Stefan Ceriu";
 			};
 			buildConfigurationList = 18FE09AD1707639E00118FEB /* Build configuration list for PBXProject "SCXcodeMinimap" */;
@@ -180,7 +180,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -212,7 +211,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;

SCXcodeMinimap/SCMiniMapView.m

@@ -27,7 +27,7 @@ - (id)initWithFrame:(NSRect)frame
     {
         /* Configure ScrollView */
         [self setWantsLayer:YES];
-        [self setAutoresizingMask: NSViewMinXMargin | NSViewWidthSizable | NSViewHeightSizable];
+        [self setAutoresizingMask: NSViewMinXMargin | NSViewHeightSizable];
         [self setDrawsBackground:NO];
         [self setHorizontalScrollElasticity:NSScrollElasticityNone];
         [self setVerticalScrollElasticity:NSScrollElasticityNone];
@@ -62,14 +62,11 @@ - (NSTextView *)textView
 {
     if (_textView == nil) {
         _textView = [[NSTextView alloc] initWithFrame:self.bounds];
-        [_textView setAutoresizingMask: NSViewMinXMargin | NSViewMaxXMargin | NSViewWidthSizable | NSViewHeightSizable];
         [_textView setBackgroundColor:[NSColor clearColor]];
 
         [_textView.textContainer setLineFragmentPadding:0.0f];
 
         [_textView.layoutManager setDelegate:self];
-//        [_textView.layoutManager setAllowsNonContiguousLayout:YES];
-//        [_textView.layoutManager setBackgroundLayoutEnabled:YES];
 
         [_textView setAllowsUndo:NO];
         [_textView setAllowsImageEditing:NO];
@@ -147,10 +144,10 @@ - (NSColor *)backgroundColor
 - (void)show
 {
     self.hidden = NO;
-
-    NSRect editorTextViewFrame = self.editorTextView.frame;
-    editorTextViewFrame.size.width = self.editorTextView.superview.frame.size.width - self.bounds.size.width - kRightSidePadding;
-    self.editorTextView.frame = editorTextViewFrame;
+	
+    NSRect editorTextViewFrame = self.editorScrollView.frame;
+    editorTextViewFrame.size.width = self.editorScrollView.superview.frame.size.width - self.bounds.size.width;
+    self.editorScrollView.frame = editorTextViewFrame;
 
     [self updateTextView];
     [self updateSelectionView];
@@ -160,20 +157,20 @@ - (void)hide
 {
     self.hidden = YES;
 
-    NSRect editorTextViewFrame = self.editorTextView.frame;
-    editorTextViewFrame.size.width = self.editorTextView.superview.frame.size.width;
-    self.editorTextView.frame = editorTextViewFrame;
+    NSRect editorTextViewFrame = self.editorScrollView.frame;
+    editorTextViewFrame.size.width = self.editorScrollView.superview.frame.size.width;
+    self.editorScrollView.frame = editorTextViewFrame;
 }
 
 #pragma mark - Updating
 
 - (void)updateTheme
 {
     [self setFont:nil];
-    [self updateTextView];
 
     [self setBackgroundColor:nil];
     [self.selectionView setSelectionColor:nil];
+    [self.textView setBackgroundColor:self.backgroundColor];
 }
 
 - (void)updateTextView
@@ -188,23 +185,17 @@ - (void)updateTextView
         return;
     }
 
-    [mutableAttributedString setAttributes:@{NSFontAttributeName: self.font, NSBackgroundColorAttributeName : self.backgroundColor} range:NSMakeRange(0, mutableAttributedString.length)];
-
+    [mutableAttributedString setAttributes:@{NSFontAttributeName: self.font} range:NSMakeRange(0, mutableAttributedString.length)];
     [self.textView.textStorage setAttributedString:mutableAttributedString];
 }
 
 - (void)resizeWithOldSuperviewSize:(NSSize)oldSize
 {
     [super resizeWithOldSuperviewSize:oldSize];
-    [self updateSelectionViewAnimated:YES];
+    [self updateSelectionView];
 }
 
 - (void)updateSelectionView
-{
-    [self updateSelectionViewAnimated:NO];
-}
-
-- (void)updateSelectionViewAnimated:(BOOL)animated
 {
     if ([self isHidden]) {
         return;
@@ -229,12 +220,8 @@ - (void)updateSelectionViewAnimated:(BOOL)animated
         ratio = (textHeight - self.selectionView.bounds.size.height) / editorContentHeight;
         selectionViewFrame.origin.y = self.editorScrollView.contentView.bounds.origin.y * ratio;
     }
-
-    if(animated) {
-        [self.selectionView.animator setFrame:selectionViewFrame];
-    } else {
-        [self.selectionView setFrame:selectionViewFrame];
-    }
+	
+    [self.selectionView setFrame:selectionViewFrame];
 }
 
 #pragma mark - NSLayoutManagerDelegate

SCXcodeMinimap/SCXcodeMinimap.m

@@ -139,7 +139,7 @@ - (void)onDidFinishSetup:(NSNotification*)sender
     /* Create Mini Map */
     CGFloat width = editorTextView.bounds.size.width * kDefaultZoomLevel;
 
-    NSRect miniMapScrollViewFrame = NSMakeRect(editorContainerView.bounds.size.width - width - kRightSidePadding,
+    NSRect miniMapScrollViewFrame = NSMakeRect(editorContainerView.bounds.size.width - width,
                                                0,
                                                width,
                                                editorScrollView.bounds.size.height);