colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-30 15:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

add lastmarker to linefrag

Browse Source
This commit is contained in:
daboe01
2015-06-27 16:01:42 +02:00
parent 9478206202
commit 0a49e31b30
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/CPLayoutManager.j
+1
View File
@@ -1020,6 +1020,7 @@ var _objectsInRange = function(aList, aRange)
CPArray _glyphsFrames @accessors(getter=glyphFrames);
BOOL _isInvalid;
BOOL _isLast;
CGRect _fragmentRect;
CGRect _usedRect;
CGPoint _location;
AppKit/CPTextView/CPTextView.j
-2
View File
@@ -518,7 +518,6 @@ var kDelegateRespondsTo_textShouldBeginEditing
if (!isAttributed)
aString = [[CPAttributedString alloc] initWithString:aString attributes:_typingAttributes];
var undoManager = [[self window] undoManager];
[undoManager setActionName:@"Replace/insert text"];
@@ -2151,7 +2150,6 @@ var _CPCopyPlaceholder = '-';
return false; // prevent the default behaviour
}
var currentFirstResponder = [[CPApp mainWindow] firstResponder];
if (![currentFirstResponder respondsToSelector:@selector(_activateNativeInputElement:)])
AppKit/CPTextView/CPTypesetter.j
+5 -1
View File
@@ -173,7 +173,11 @@ var CPSystemTypesetterFactory;
containerSize = aContainer._size;
[_layoutManager setTextContainer:_currentTextContainer forGlyphRange:lineRange]; // creates a new lineFragment
_lineFragments.push([_layoutManager._lineFragments lastObject]);
var fragment = [_layoutManager._lineFragments lastObject];
fragment._isLast = !sameLine;
_lineFragments.push(fragment);
[_layoutManager setLineFragmentRect:rect forGlyphRange:lineRange usedRect:rect];
switch ([_currentParagraph alignment])