colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-11 11:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed: setFrameSize: was iterating every character

Browse Source
This commit is contained in:
daboe01 committed 2016-09-09 21:00:22 +02:00
1 parent 8cfd3aeda9
commit 315fc21eca
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/CPTextView.j
+5 -2
View File
@@ -1717,8 +1717,9 @@ var kDelegateRespondsTo_textShouldBeginEditing
{
var minSize = [self minSize],
maxSize = [self maxSize],
desiredSize = aSize,
rect = [_layoutManager boundingRectForGlyphRange:CPMakeRange(0, MAX(0, [_layoutManager numberOfCharacters] - 1)) inTextContainer:_textContainer],
desiredSize = CGSizeCreateCopy(aSize),
rect = CGRectUnion([_layoutManager boundingRectForGlyphRange:CPMakeRange(0, 1) inTextContainer:_textContainer],
[_layoutManager boundingRectForGlyphRange:CPMakeRange(MAX(0, [_layoutManager numberOfCharacters] - 2), 1) inTextContainer:_textContainer]),
myClipviewSize = nil;
if ([[self superview] isKindOfClass:[CPClipView class]])
@@ -1730,6 +1731,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
if (_isHorizontallyResizable)
{
rect = [_layoutManager boundingRectForGlyphRange:CPMakeRange(0, MAX(0, [_layoutManager numberOfCharacters] - 1)) inTextContainer:_textContainer]; // needs expensive "deep" recalculation
desiredSize.width = rect.size.width + 2 * _textContainerInset.width;
if (desiredSize.width < minSize.width)