X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dd9fdf82749bb5f9e2bf9c2ad1bbd59e0eeb00e..a51e79e87db3512823258d487849bb7e7947b700:/src/osx/cocoa/stattext.mm diff --git a/src/osx/cocoa/stattext.mm b/src/osx/cocoa/stattext.mm index efb6e56343..591a97a476 100644 --- a/src/osx/cocoa/stattext.mm +++ b/src/osx/cocoa/stattext.mm @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: stattext.cpp 54845 2008-07-30 14:52:41Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,90 +25,139 @@ #include "wx/osx/private.h" +#if wxUSE_MARKUP + #include "wx/osx/cocoa/private/markuptoattr.h" +#endif // wxUSE_MARKUP + #include -wxSize wxStaticText::DoGetBestSize() const +@interface wxNSStaticTextView : NSTextField { -Point bounds; +} +@end -#if wxOSX_USE_ATSU_TEXT - OSStatus err = noErr; - wxCFStringRef str( m_label, GetFont().GetEncoding() ); +@implementation wxNSStaticTextView - SInt16 baseline; - if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) ++ (void)initialize +{ + static BOOL initialized = NO; + if (!initialized) { - err = GetThemeTextDimensions( - (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")), - m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline ); - verify_noerr( err ); + initialized = YES; + wxOSXCocoaClassAddWXMethods( self ); } - else -#endif +} + +- (void) setEnabled:(BOOL) flag +{ + [super setEnabled: flag]; + + if (![self drawsBackground]) { + // Static text is drawn incorrectly when disabled. + // For an explanation, see + // http://www.cocoabuilder.com/archive/message/cocoa/2006/7/21/168028 + if (flag) + { + [self setTextColor: [NSColor controlTextColor]]; + } + else + { + [self setTextColor: [NSColor secondarySelectedControlColor]]; + } + } +} + +@end + +class wxStaticTextCocoaImpl : public wxWidgetCocoaImpl +{ +public: + wxStaticTextCocoaImpl( wxWindowMac* peer , WXWidget w , NSLineBreakMode lineBreak) : wxWidgetCocoaImpl(peer, w) { - wxClientDC dc(const_cast(this)); - wxCoord width, height ; - dc.GetTextExtent( m_label , &width, &height); - // Some labels seem to have their last characters - // stripped out. Adding 4 pixels seems to be enough to fix this. - bounds.h = width+4; - bounds.v = height; + m_lineBreak = lineBreak; } - if ( m_label.empty() ) - bounds.h = 0; + virtual void SetLabel(const wxString& title, wxFontEncoding encoding) + { + wxCFStringRef text( title , encoding ); - bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize(); - bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize(); + NSMutableAttributedString * + attrstring = [[NSMutableAttributedString alloc] initWithString:text.AsNSString()]; + DoSetAttrString(attrstring); + [attrstring release]; + } - return wxSize( bounds.h, bounds.v ); -} +#if wxUSE_MARKUP + virtual void SetLabelMarkup( const wxString& markup) + { + wxMarkupToAttrString toAttr(GetWXPeer(), markup); -// for wxST_ELLIPSIZE_* support: + DoSetAttrString(toAttr.GetNSAttributedString()); + } +#endif // wxUSE_MARKUP + +private: + void DoSetAttrString(NSMutableAttributedString *attrstring) + { + NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; + [paragraphStyle setLineBreakMode:m_lineBreak]; + int style = GetWXPeer()->GetWindowStyleFlag(); + if (style & wxALIGN_CENTER_HORIZONTAL) + [paragraphStyle setAlignment: NSCenterTextAlignment]; + else if (style & wxALIGN_RIGHT) + [paragraphStyle setAlignment: NSRightTextAlignment]; + + [attrstring addAttribute:NSParagraphStyleAttributeName + value:paragraphStyle + range:NSMakeRange(0, [attrstring length])]; + NSCell* cell = [(wxNSStaticTextView *)GetWXWidget() cell]; + [cell setAttributedStringValue:attrstring]; + [paragraphStyle release]; + } -/* - FIXME: UpdateLabel() should be called on size events when wxST_ELLIPSIZE_START is set - to allow correct dynamic ellipsizing of the label -*/ + NSLineBreakMode m_lineBreak; +}; + +wxSize wxStaticText::DoGetBestSize() const +{ + return wxWindowMac::DoGetBestSize() ; +} wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, + wxWindowMac* WXUNUSED(parent), + wxWindowID WXUNUSED(id), + const wxString& WXUNUSED(label), const wxPoint& pos, const wxSize& size, long style, - long extraStyle) + long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; - wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r]; + wxNSStaticTextView* v = [[wxNSStaticTextView alloc] initWithFrame:r]; - [v setBezeled:NO]; [v setEditable:NO]; [v setDrawsBackground:NO]; + [v setSelectable: NO]; + [v setBezeled:NO]; + [v setBordered:NO]; - wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); - return c; -/* - Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size ); - - wxMacControl* peer = new wxMacControl( wxpeer ); - OSStatus err = CreateStaticTextControl( - MAC_WXHWND(parent->MacGetTopLevelWindowRef()), - &bounds, NULL, NULL, peer->GetControlRefAddr() ); - verify_noerr( err ); - - if ( ( style & wxST_ELLIPSIZE_END ) || ( style & wxST_ELLIPSIZE_MIDDLE ) ) + NSLineBreakMode linebreak = NSLineBreakByWordWrapping; + if ( ((wxStaticText*)wxpeer)->IsEllipsized() ) { - TruncCode tCode = truncEnd; if ( style & wxST_ELLIPSIZE_MIDDLE ) - tCode = truncMiddle; - - err = peer->SetData( kControlStaticTextTruncTag, tCode ); - err = peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 ); + linebreak = NSLineBreakByTruncatingMiddle; + else if (style & wxST_ELLIPSIZE_END ) + linebreak = NSLineBreakByTruncatingTail; + else if (style & wxST_ELLIPSIZE_START ) + linebreak = NSLineBreakByTruncatingHead; } - return peer; - */ + else + { + [[v cell] setWraps:YES]; + } + + wxWidgetCocoaImpl* c = new wxStaticTextCocoaImpl( wxpeer, v, linebreak ); + return c; } #endif //if wxUSE_STATTEXT