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

size should not be smaller than clipview

Browse Source
This commit is contained in:
daboe01
2014-08-06 13:31:31 +02:00
parent 2c110f7796
commit 6cf79a3c73
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/CPTextView.j
+14 -1
View File
@@ -1465,7 +1465,12 @@ var kDelegateRespondsTo_textShouldBeginEditing
var minSize = [self minSize],
maxSize = [self maxSize],
desiredSize = aSize,
rect = [_layoutManager boundingRectForGlyphRange:CPMakeRange(0, MAX(0, [_layoutManager numberOfCharacters] - 1)) inTextContainer:_textContainer];
rect = [_layoutManager boundingRectForGlyphRange:CPMakeRange(0, MAX(0, [_layoutManager numberOfCharacters] - 1)) inTextContainer:_textContainer],
myClipviewSize = nil;
if ([[self superview] isKindOfClass:[CPClipView class]])
myClipviewSize = [[self superview] frame].size;
if ([_layoutManager extraLineFragmentTextContainer] === _textContainer)
rect = CGRectUnion(rect, [_layoutManager extraLineFragmentRect]);
@@ -1490,6 +1495,14 @@ var kDelegateRespondsTo_textShouldBeginEditing
desiredSize.height = maxSize.height;
}
if (myClipviewSize)
{
if (desiredSize.width < myClipviewSize.width)
desiredSize.width = myClipviewSize.width;
if (desiredSize.height < myClipviewSize.height)
desiredSize.height = myClipviewSize.height;
}
[super setFrameSize:desiredSize];
}