interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed uiMultilineEntry to no longer use Auto Layout.

This commit is contained in:
Pietro Gagliardi 2016-06-22 23:07:59 -04:00
parent ddd0e82c90
commit cbb07113ca
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
darwin/multilineentry.m
View File

@ -184,12 +184,19 @@ static uiMultilineEntry *finishMultilineEntry(BOOL hscroll)
// now just to be safe; this will do some of the above but whatever // now just to be safe; this will do some of the above but whatever
disableAutocorrect(e->tv); disableAutocorrect(e->tv);
// see https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/TextUILayer/Tasks/TextInScrollView.html
// notice we don't use the Auto Layout code; see scrollview.m for more details
[e->tv setMaxSize:NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX)];
[e->tv setVerticallyResizable:YES];
[e->tv setHorizontallyResizable:hscroll];
if (hscroll) { if (hscroll) {
// see https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/TextUILayer/Tasks/TextInScrollView.html [e->tv setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
[e->tv setHorizontallyResizable:YES];
[[e->tv textContainer] setWidthTracksTextView:NO]; [[e->tv textContainer] setWidthTracksTextView:NO];
[[e->tv textContainer] setContainerSize:NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX)]; } else {
[e->tv setAutoresizingMask:NSViewWidthSizable];
[[e->tv textContainer] setWidthTracksTextView:YES];
} }
[[e->tv textContainer] setContainerSize:NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX)];
// don't use uiDarwinSetControlFont() directly; we have to do a little extra work to set the font // don't use uiDarwinSetControlFont() directly; we have to do a little extra work to set the font
font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]]; font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]];