• fixed some layout issues

• increased layout speed • fixed width for German's Editor Preferences git-svn-id: https://svn.r-project.org/R-packages/trunk/Mac-GUI@6240 694ef91d-65df-0310-b7bb-92e67a308ead
R-macos · Aug 25, 2012 · dd77caa · dd77caa
1 parent de9817f
commit dd77caa
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 58 deletions.
diff --git a/English.lproj/EditorPrefPane.xib b/English.lproj/EditorPrefPane.xib
@@ -175,7 +175,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="467859425">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{18, 291}, {224, 18}}</string>
+                    <string key="NSFrame">{{18, 291}, {242.47265625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="112392175">
@@ -198,7 +198,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="857479191">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{18, 218}, {224, 18}}</string>
+                    <string key="NSFrame">{{18, 218}, {242.47265625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="607892952">
@@ -219,7 +219,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="598267823">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{18, 167}, {224, 18}}</string>
+                    <string key="NSFrame">{{18, 167}, {233.15625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="507616695">
@@ -240,7 +240,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="542486847">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{18, 147}, {224, 18}}</string>
+                    <string key="NSFrame">{{18, 147}, {233.15625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="375630071">
@@ -261,7 +261,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="522909206">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{18, 99}, {213, 18}}</string>
+                    <string key="NSFrame">{{18, 99}, {237.15625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="583581786">
@@ -286,7 +286,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="86182398">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{18, 238}, {224, 18}}</string>
+                    <string key="NSFrame">{{18, 238}, {242.47265625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="805682697">
@@ -307,7 +307,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="954429201">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">268</int>
-                    <string key="NSFrame">{{18, 271}, {224, 18}}</string>
+                    <string key="NSFrame">{{18, 271}, {242.47265625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="480889402">
@@ -329,7 +329,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="909633476">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">268</int>
-                    <string key="NSFrame">{{18, 127}, {213, 18}}</string>
+                    <string key="NSFrame">{{18, 127}, {242.47265625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="590715081">
@@ -455,7 +455,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   <object class="NSButton" id="601854215">
                     <reference key="NSNextResponder" ref="16355349"/>
                     <int key="NSvFlags">268</int>
-                    <string key="NSFrame">{{18, 70}, {213, 18}}</string>
+                    <string key="NSFrame">{{18, 70}, {242.47265625, 18}}</string>
                     <reference key="NSSuperview" ref="16355349"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="749916913">
@@ -1489,7 +1489,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{395, 340}, {583, 416}}</string>
+          <string>{{225, 170}, {583, 416}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>

diff --git a/RController.m b/RController.m
@@ -350,7 +350,7 @@ - (void) awakeFromNib {
 	[attr setDictionary:[consoleTextView selectedTextAttributes]];
 	[attr setObject:[Preferences unarchivedObjectForKey:selectionColorKey withDefault:[NSColor colorWithCalibratedRed:0.71f green:0.835f blue:1.0f alpha:1.0f]] forKey:NSBackgroundColorAttributeName];
 	[consoleTextView setSelectedTextAttributes:attr];
-	[consoleTextView setNeedsDisplayInRect:[consoleTextView bounds]];
+	[consoleTextView setNeedsDisplayInRect:[consoleTextView visibleRect]];
 
 	NSLayoutManager *lm = [[consoleTextView layoutManager] retain];
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5

diff --git a/RDocumentWinCtrl.m b/RDocumentWinCtrl.m
@@ -1143,7 +1143,7 @@ - (BOOL)textView:(NSTextView *)textViewSrc doCommandBySelector:(SEL)commandSelec
 				}
 			}
 
-			[textView setNeedsDisplayInRect:[textView frame]];
+			// [textView setNeedsDisplayInRect:[textView frame]];
 			return YES;
 		}
 	}
@@ -1327,7 +1327,7 @@ - (void)textViewDidChangeSelection:(NSNotification *)aNotification
 #endif
 
 	if([[NSUserDefaults standardUserDefaults] boolForKey:highlightCurrentLine])
-		[tv setNeedsDisplayInRect:[tv bounds] avoidAdditionalLayout:YES];
+		[tv setNeedsDisplayInRect:[tv visibleRect] avoidAdditionalLayout:NO];
 
 	// Adjust cursor position if cursor is inside of a folded text chunk;
 	// additional checks were made in [RScriptEditorTextView:setSelectedRanges:]

diff --git a/RScriptEditorLayoutManager.m b/RScriptEditorLayoutManager.m
@@ -57,7 +57,7 @@ - (id)init
 	[self setGlyphGenerator:glyphGenerator];
 	[glyphGenerator release];
 
-	[self setBackgroundLayoutEnabled:YES];
+	[self setBackgroundLayoutEnabled:NO];
 
 	return self;
 

diff --git a/RScriptEditorTextView.h b/RScriptEditorTextView.h
@@ -112,6 +112,8 @@
 - (BOOL)unfoldLinesContainingCharacterAtIndex:(NSUInteger)charIndex;
 - (NSInteger)foldStatusAtIndex:(NSInteger)index;
 
+- (id)scrollView;
+
 - (void)updatePreferences;
 
 @end
diff --git a/RScriptEditorTextView.m b/RScriptEditorTextView.m
@@ -357,13 +357,18 @@ - (void)dealloc {
 
 }
 
+- (id)scrollView
+{
+	return scrollView;
+}
+
 - (void)setNonSyntaxHighlighting
 {
 	[theTextStorage removeAttribute:NSForegroundColorAttributeName range:NSMakeRange(0, [[theTextStorage string] length])];
 	[theTextStorage removeAttribute:NSBackgroundColorAttributeName range:NSMakeRange(0, [[theTextStorage string] length])];
 	[self setTextColor:[NSColor blackColor]];
 	[self setInsertionPointColor:[NSColor blackColor]];
-	[self setNeedsDisplayInRect:[self bounds]];
+	[self setNeedsDisplayInRect:[self visibleRect]];
 }
 
 /**
@@ -426,7 +431,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 		if(shColorCursor) [shColorCursor release];
 		shColorCursor = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
 		[self setInsertionPointColor:shColorCursor];
-		[self setNeedsDisplayInRect:[self bounds]];
+		[self setNeedsDisplayInRect:[self visibleRect]];
 	} else if ([keyPath isEqualToString:identifierSyntaxColorKey]) {
 		if(shColorIdentifier) [shColorIdentifier release];
 		shColorIdentifier = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
@@ -435,18 +440,18 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 	} else if ([keyPath isEqualToString:editorBackgroundColorKey]) {
 		if(shColorBackground) [shColorBackground release];
 		shColorBackground = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
-		[self setNeedsDisplayInRect:[self bounds]];
+		[self setNeedsDisplayInRect:[self visibleRect]];
 	} else if ([keyPath isEqualToString:editorCurrentLineBackgroundColorKey]) {
 		if(shColorCurrentLine) [shColorCurrentLine release];
 		shColorCurrentLine = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
-		[self setNeedsDisplayInRect:[self bounds]];
+		[self setNeedsDisplayInRect:[self visibleRect]];
 	} else if ([keyPath isEqualToString:editorSelectionBackgroundColorKey]) {
 		NSColor *c = [[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]] retain];
 		NSMutableDictionary *attr = [NSMutableDictionary dictionary];
 		[attr setDictionary:[self selectedTextAttributes]];
 		[attr setObject:c forKey:NSBackgroundColorAttributeName];
 		[self setSelectedTextAttributes:attr];
-		[self setNeedsDisplayInRect:[self bounds]];
+		[self setNeedsDisplayInRect:[self visibleRect]];
 
 	} else if ([keyPath isEqualToString:showSyntaxColoringKey]) {
 		syntaxHighlightingEnabled = [[change objectForKey:NSKeyValueChangeNewKey] boolValue];
@@ -486,11 +491,11 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 		}
 
 	} else if ([keyPath isEqualToString:highlightCurrentLine]) {
-		[self setNeedsDisplayInRect:[self bounds]];
+		[self setNeedsDisplayInRect:[self visibleRect]];
 
 	} else if ([keyPath isEqualToString:RScriptEditorDefaultFont] && ![[[[self window] windowController] document] isRTF] && ![self selectedRange].length) {
 			[self setFont:[NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]]];
-			[self setNeedsDisplayInRect:[self bounds]];
+			[self setNeedsDisplayInRect:[self visibleRect]];
 
 		} else if ([keyPath isEqualToString:HighlightIntervalKey]) {
 		braceHighlightInterval = [Preferences floatForKey:HighlightIntervalKey withDefault:0.3f];
@@ -501,12 +506,12 @@ - (void)updateLineWrappingMode
 {
 
 	lineWrappingEnabled = [Preferences flagForKey:enableLineWrappingKey withDefault: YES];
-
+	
 	NSSize contentSize = [scrollView contentSize];
 	NSTextContainer *textContainer = [self textContainer];
-
+	
 	// [self setMinSize:contentSize];
-
+	
 	if (lineWrappingEnabled) {
 		[scrollView setHasHorizontalScroller:YES];
 		[textContainer setContainerSize:NSMakeSize(contentSize.width, CGFLOAT_MAX)];
@@ -520,7 +525,7 @@ - (void)updateLineWrappingMode
 		[self setHorizontallyResizable:YES];
 		[(NoodleLineNumberView*)[[self enclosingScrollView] verticalRulerView] setLineWrappingMode:NO];
 	}
-
+	
 	[[[self enclosingScrollView] verticalRulerView] performSelector:@selector(refresh) withObject:nil afterDelay:0.0f];
 
 	// NSSize layoutSize;
@@ -716,7 +721,7 @@ - (void)doSyntaxHighlighting
 	// by considering entire lines).
 
 	// Get the text range currently displayed in the view port
-	NSRect visibleRect = [scrollView documentVisibleRect];
+	NSRect visibleRect = [self visibleRect];
 	NSRange visibleRange = [[self layoutManager] glyphRangeForBoundingRectWithoutAdditionalLayout:visibleRect inTextContainer:[self textContainer]];
 
 	if(!visibleRange.length) {
@@ -864,11 +869,11 @@ - (void)doSyntaxHighlighting
 			if(breakSyntaxHighlighting) {
 
 				// Cancel calling doSyntaxHighlighting
-				[NSObject cancelPreviousPerformRequestsWithTarget:self 
-										selector:@selector(doSyntaxHighlighting) 
-										object:nil];
-
-				[self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.15f];
+				// [NSObject cancelPreviousPerformRequestsWithTarget:self 
+				// 						selector:@selector(doSyntaxHighlighting) 
+				// 						object:nil];
+				// 
+				// [self performSelector:@selector(doSyntaxHighlighting) withObject:nil afterDelay:0.15f];
 
 				breakSyntaxHighlighting = 0;
 				break;
@@ -892,8 +897,7 @@ - (void)doSyntaxHighlighting
 
 	[theTextStorage endEditing];
 	isSyntaxHighlighting = NO;
-
-	[self setNeedsDisplayInRect:[self bounds]];
+	[self setNeedsDisplayInRect:visibleRect];
 
 }
 

diff --git a/RTextView.m b/RTextView.m
@@ -1569,7 +1569,7 @@ - (void)endSnippetSession
 	snippetWasJustInserted = NO;
 
 	// remove all snippet frames
-	[self setNeedsDisplayInRect:[self bounds] avoidAdditionalLayout:NO];
+	[self setNeedsDisplayInRect:[self visibleRect] avoidAdditionalLayout:NO];
 
 }