X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e40298d54ecd5b109222a7c60aa2ef084a304d69..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/stattext.cpp?ds=sidebyside diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index fc0a5726f9..d2f9fd1cea 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.cpp +// Name: src/mac/carbon/stattext.cpp // Purpose: wxStaticText // Author: Stefan Csomor // Modified by: @@ -9,249 +9,189 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "stattext.h" -#endif +#include "wx/wxprec.h" + +#if wxUSE_STATTEXT -#include "wx/app.h" #include "wx/stattext.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/settings.h" +#endif // WX_PRECOMP + #include "wx/notebook.h" #include "wx/tabctrl.h" -#include "wx/dc.h" -#include "wx/dcclient.h" -#include "wx/utils.h" -#include "wx/settings.h" + +#include "wx/mac/uma.h" #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif -#include "wx/mac/uma.h" - -BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase) - EVT_PAINT(wxStaticText::OnPaint) -END_EVENT_TABLE() -bool wxStaticText::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +bool wxStaticText::Create( wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { - SetName(name); - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; + m_macIsUserPane = false; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) + return false; - m_windowStyle = style; - m_label = wxStripMenuCodes(label) ; + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); - bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name ); - SetBestSize( size ) ; + m_peer = new wxMacControl( this ); + OSStatus err = CreateStaticTextControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, NULL, NULL, m_peer->GetControlRefAddr() ); + verify_noerr( err ); - return ret; -} + if ( ( style & wxST_ELLIPSIZE_END ) || ( style & wxST_ELLIPSIZE_MIDDLE ) ) + { + TruncCode tCode = truncEnd; + if ( style & wxST_ELLIPSIZE_MIDDLE ) + tCode = truncMiddle; -const wxString punct = " ,.-;:!?"; + err = m_peer->SetData( kControlStaticTextTruncTag, tCode ); + err = m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 ); + } + + MacPostControlCreate( pos, size ); -void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y) + SetLabel(label); + + return true; +} + +wxSize wxStaticText::DoGetBestSize() const { - long width, height ; - - if (paragraph.Length() == 0) + Rect bestsize = { 0 , 0 , 0 , 0 } ; + Point bounds; + + // try the built-in best size if available + Boolean former = m_peer->GetData( kControlStaticTextIsMultilineTag); + m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 ); + m_peer->GetBestRect( &bestsize ) ; + m_peer->SetData( kControlStaticTextIsMultilineTag, former ); + if ( !EmptyRect( &bestsize ) ) { - // empty line - dc.GetTextExtent( "H", &width, &height ); - y += height; - - return; + bounds.h = bestsize.right - bestsize.left ; + bounds.v = bestsize.bottom - bestsize.top ; } + else + { + ControlFontStyleRec controlFont; + OSStatus err = m_peer->GetData( kControlEntireControl, kControlFontStyleTag, &controlFont ); + verify_noerr( err ); - int x = 0 ; + wxCFStringRef str( m_label, GetFont().GetEncoding() ); - bool linedrawn = true; - while( paragraph.Length() > 0 ) - { - dc.GetTextExtent( paragraph , &width , &height ) ; - - if ( width > m_width ) +#if wxMAC_USE_ATSU_TEXT + SInt16 baseline; + if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) { - for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p ) - { - if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn) - { - int blank = (paragraph[p] == ' ') ? 0 : 1; - - dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ; - - if ( width <= m_width ) - { - int pos = x ; - if ( HasFlag( wxALIGN_CENTER ) ) - { - pos += ( m_width - width ) / 2 ; - } - else if ( HasFlag( wxALIGN_RIGHT ) ) - { - pos += ( m_width - width ) ; - } - - dc.DrawText( paragraph.Left(p + blank), pos , y) ; - y += height ; - paragraph = paragraph.Mid(p+1) ; - linedrawn = true; - break ; - } - } - } - - linedrawn = false; + err = GetThemeTextDimensions( + (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")), + m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline ); + verify_noerr( err ); } else +#endif { - int pos = x ; - if ( HasFlag( wxALIGN_CENTER ) ) - { - pos += ( m_width - width ) / 2 ; - } - else if ( HasFlag( wxALIGN_RIGHT ) ) - { - pos += ( m_width - width ) ; - } - - dc.DrawText( paragraph, pos , y) ; - paragraph=""; - y += height ; + wxClientDC dc(const_cast(this)); + wxCoord width, height ; + dc.GetTextExtent( m_label , &width, &height); + bounds.h = width; + bounds.v = height; } + + if ( m_label.empty() ) + bounds.h = 0; } + bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize(); + bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize(); + + return wxSize( bounds.h, bounds.v ); } -void wxStaticText::OnDraw( wxDC &dc ) +void wxStaticText::SetLabel(const wxString& label) { - if (m_width <= 0 || m_height <= 0) - return; - /* - dc.Clear() ; - wxRect rect(0,0,m_width,m_height) ; - dc.SetFont(*wxSMALL_FONT) ; - - dc.DrawRectangle(rect) ; - */ - if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && - ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) - || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) ) + m_labelOrig = label; + + // middle/end ellipsization is handled by the OS: + if ( HasFlag(wxST_ELLIPSIZE_END) || HasFlag(wxST_ELLIPSIZE_MIDDLE) ) { - dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ; + // remove markup + wxString str(label); + if (HasFlag(wxST_MARKUP)) + str = RemoveMarkup(label); + + // and leave ellipsization to the OS + DoSetLabel(str); } - else + else // not supported natively { - dc.SetTextForeground( GetForegroundColour() ) ; + DoSetLabel(GetEllipsizedLabelWithoutMarkup()); } - - wxString paragraph; - size_t i = 0 ; - wxString text = m_label; - int y = 0 ; - while (i < text.Length()) + + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) && + !IsEllipsized() ) // don't resize if we adjust to current size { - - if (text[i] == 13 || text[i] == 10) - { - DrawParagraph(dc, paragraph,y); - paragraph = "" ; - } - else - { - paragraph += text[i]; - } - ++i; + InvalidateBestSize(); + SetSize( GetBestSize() ); } - if (paragraph.Length() > 0) - DrawParagraph(dc, paragraph,y); -} -void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) ) -{ - wxPaintDC dc(this); - OnDraw( dc ) ; + Refresh(); + + // we shouldn't need forced updates + // Update(); } -wxSize wxStaticText::DoGetBestSize() const +bool wxStaticText::SetFont(const wxFont& font) { - int widthTextMax = 0, widthLine, - heightTextTotal = 0, heightLineDefault = 0, heightLine = 0; + bool ret = wxControl::SetFont( font ); - wxString curLine; - for ( const wxChar *pc = m_label; ; pc++ ) + if ( ret ) { - if ( *pc == wxT('\n') || *pc == wxT('\0') ) + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) { - if ( !curLine ) - { - // we can't use GetTextExtent - it will return 0 for both width - // and height and an empty line should count in height - // calculation - if ( !heightLineDefault ) - heightLineDefault = heightLine; - if ( !heightLineDefault ) - GetTextExtent(_T("W"), NULL, &heightLineDefault); - - heightTextTotal += heightLineDefault; - - heightTextTotal++; // FIXME: why is this necessary? - } - else - { - GetTextExtent(curLine, &widthLine, &heightLine); - if ( widthLine > widthTextMax ) - widthTextMax = widthLine; - heightTextTotal += heightLine; - - heightTextTotal++; // FIXME: why is this necessary? - } - - if ( *pc == wxT('\n') ) { - curLine.Empty(); - } - else { - // the end of string - break; - } - } - else { - curLine += *pc; + InvalidateBestSize(); + SetSize( GetBestSize() ); } } - return wxSize(widthTextMax, heightTextTotal); + return ret; } -void wxStaticText::SetLabel(const wxString& st ) + +// for wxST_ELLIPSIZE_* support: + +void wxStaticText::DoSetLabel(const wxString& label) { - SetTitle( st ) ; - m_label = st ; - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - SetSize( GetBestSize() ) ; + m_labelOrig = label; + m_label = RemoveMnemonics(label); - Refresh() ; - Update() ; + wxCFStringRef str( m_label, GetFont().GetEncoding() ); + OSStatus err = m_peer->SetData(kControlEntireControl, kControlStaticTextCFStringTag, str); + verify_noerr( err ); } -bool wxStaticText::SetFont(const wxFont& font) +wxString wxStaticText::DoGetLabel() const { - bool ret = wxControl::SetFont(font); + return m_label; +} - // adjust the size of the window to fit to the label unless autoresizing is - // disabled - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - SetSize( GetBestSize() ); +/* + FIXME: UpdateLabel() should be called on size events when wxST_ELLIPSIZE_START is set + to allow correct dynamic ellipsizing of the label +*/ - return ret; -} +#endif //if wxUSE_STATTEXT