coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Improve CELineNumberView a bit

Browse Source
This commit is contained in:
1024jp 2016-06-18 23:48:30 +09:00
parent 0de544faec
commit 18ade581c1
2 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -39,6 +39,7 @@ develop
- Make window size setting window translucent.
- Avoid expanding status bar into side inspector.
- Improve line height calculation.
- Improve scrolling with line number view drag.
- Better syntax highlighting while editing.
- Enable activate “Show Invisibles” action even if all of invisible characters were set as not shown when the document was opened.

45
CotEditor/Sources/CELineNumberView.m
View File

@ -105,18 +105,6 @@ static CGFontRef BoldLineNumberFont;
}
// ------------------------------------------------------
/// setup initial size
- (void)viewDidMoveToSuperview
// ------------------------------------------------------
{
[super viewDidMoveToSuperview];
CGFloat thickness = [self orientation] == NSHorizontalRuler ? kMinHorizontalThickness : kMinVerticalThickness;
[self setRuleThickness:thickness];
}
// ------------------------------------------------------
/// draw background
- (void)drawRect:(NSRect)dirtyRect
@ -170,7 +158,7 @@ static CGFontRef BoldLineNumberFont;
// set graphics context
CGContextRef context = [[NSGraphicsContext currentContext] CGContext];
CGContextSaveGState(context);
// setup font
CGFloat masterFontSize = scale * [[[self textView] font] pointSize];
CGFloat fontSize = MIN(round(kFontSizeFactor * masterFontSize), masterFontSize);
@ -404,7 +392,7 @@ static CGFontRef BoldLineNumberFont;
if ([[self clientView] isKindOfClass:[NSTextView class]]) {
[[NSNotificationCenter defaultCenter] removeObserver:self
name:NSTextDidChangeNotification
object:(NSTextView *)[self clientView]];
object:[self clientView]];
}
// observe new textStorage change
@ -412,7 +400,7 @@ static CGFontRef BoldLineNumberFont;
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(textDidChange:)
name:NSTextDidChangeNotification
object:(NSTextView *)clientView];
object:clientView];
[self setNeedsRecountTotalNumberOfLines:YES];
}
@ -450,7 +438,9 @@ static CGFontRef BoldLineNumberFont;
- (nonnull NSColor *)backgroundColor
// ------------------------------------------------------
{
return [[(NSTextView<CEThemable> *)[self clientView] theme] isDarkTheme] ? [NSColor whiteColor] : [NSColor blackColor];
BOOL isDarkBackground = [[(NSTextView<CEThemable> *)[self clientView] theme] isDarkTheme];
return isDarkBackground ? [NSColor whiteColor] : [NSColor blackColor];
}
@ -511,7 +501,6 @@ unsigned int numberAt(int place, int number) { return (number % (int)pow(10, pla
// ------------------------------------------------------
{
[[self draggingTimer] invalidate];
[self setDraggingTimer:nil];
// settle selection
// -> in `selectLines:`, `stillSelecting` flag is always YES
@ -531,13 +520,9 @@ unsigned int numberAt(int place, int number) { return (number % (int)pow(10, pla
NSPoint point = [NSEvent mouseLocation]; // screen based point
// scroll text view if needed
CGFloat y = [self convertPoint:[[self window] convertRectFromScreen:NSMakeRect(point.x, point.y, 0, 0)].origin
fromView:nil].y;
if (y < 0) {
[textView scrollLineUp:nil];
} else if (y > NSHeight([self bounds])) {
[textView scrollLineDown:nil];
}
NSRect pointedRect = [[self window] convertRectFromScreen:NSMakeRect(point.x, point.y, 0, 0)];
NSRect targetRect = [textView convertRect:pointedRect toView:nil];
[textView scrollRectToVisible:targetRect];
// select lines
NSUInteger currentIndex = [textView characterIndexForPoint:point];
@ -556,7 +541,7 @@ unsigned int numberAt(int place, int number) { return (number % (int)pow(10, pla
for (NSValue *selectedRangeValue in originalSelectedRanges) {
NSRange selectedRange = [selectedRangeValue rangeValue];
if (selectedRange.location <= range.location && NSMaxRange(range) <= NSMaxRange(selectedRange)) { // exclude
NSRange range1 = NSMakeRange(selectedRange.location, range.location - selectedRange.location);
NSRange range2 = NSMakeRange(NSMaxRange(range), NSMaxRange(selectedRange) - NSMaxRange(range));
@ -580,10 +565,7 @@ unsigned int numberAt(int place, int number) { return (number % (int)pow(10, pla
[selectedRanges addObject:[NSValue valueWithRange:range]];
}
[textView setSelectedRanges:selectedRanges affinity:affinity stillSelecting:YES];
// redraw line number
[self setNeedsDisplay:YES];
[textView setSelectedRanges:selectedRanges affinity:affinity stillSelecting:NO];
return;
}
@ -606,10 +588,7 @@ unsigned int numberAt(int place, int number) { return (number % (int)pow(10, pla
}
}
[textView setSelectedRange:range affinity:affinity stillSelecting:YES];
// redraw line number
[self setNeedsDisplay:YES];
[textView setSelectedRange:range affinity:affinity stillSelecting:NO];
}
@end