AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement support for wxHSCROLL in wxTextCtrl under OS X

Browse Source 
Make the associated NSTextContainer of infinite size and tell it not to track
the NSTextView width if wxHSCROLL is specified.

Closes #4022.

Closes https://github.com/wxWidgets/wxWidgets/pull/124
This commit is contained in:
Corey Daley 2015-11-08 12:23:39 -05:00 committed by Vadim Zeitlin
parent 79f62505bb
commit a118c4243a
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/osx/cocoa/textctrl.mm
View File

@ -568,19 +568,28 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w, long s
wxNSTextScrollView* sv = (wxNSTextScrollView*) w; wxNSTextScrollView* sv = (wxNSTextScrollView*) w;
m_scrollView = sv; m_scrollView = sv;
[m_scrollView setHasVerticalScroller:YES]; const bool hasHScroll = (style & wxHSCROLL) != 0;
[m_scrollView setHasHorizontalScroller:NO];
// TODO Remove if no regression, this was causing automatic resizes of multi-line textfields when the tlw changed
// [m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
NSSize contentSize = [m_scrollView contentSize];
wxNSTextView* tv = [[wxNSTextView alloc] initWithFrame: NSMakeRect(0, 0, [m_scrollView setHasVerticalScroller:YES];
contentSize.width, contentSize.height)]; [m_scrollView setHasHorizontalScroller:hasHScroll];
NSSize contentSize = [m_scrollView contentSize];
NSRect viewFrame = NSMakeRect(
0, 0,
hasHScroll ? FLT_MAX : contentSize.width, contentSize.height
);
wxNSTextView* const tv = [[wxNSTextView alloc] initWithFrame: viewFrame];
m_textView = tv; m_textView = tv;
[tv setVerticallyResizable:YES]; [tv setVerticallyResizable:YES];
[tv setHorizontallyResizable:NO]; [tv setHorizontallyResizable:hasHScroll];
[tv setAutoresizingMask:NSViewWidthSizable]; [tv setAutoresizingMask:NSViewWidthSizable];
if ( hasHScroll )
{
[[tv textContainer] setContainerSize:NSMakeSize(FLT_MAX, FLT_MAX)];
[[tv textContainer] setWidthTracksTextView:NO];
}
if ( style & wxTE_RIGHT) if ( style & wxTE_RIGHT)
{ {
[tv setAlignment:NSRightTextAlignment]; [tv setAlignment:NSRightTextAlignment];