Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fold best size and ellipsis handling in AutoResizeIfNecessary()

Browse Source 
Refactor wxStaticText code to use AutoResizeIfNecessary() for all the
updates done after the label extent changes (whether it's due to the
change of the label itself or the font used for rendering it).

There should be no changes in behaviour after this commit except for a
small bug fix in wxGenericStaticText when setting label with markup:
this didn't invalidate the best size before, but does now.
This commit is contained in:
Vadim Zeitlin
2018-01-16 16:22:51 +01:00
parent 52e71680ea
commit 6651999719
5 changed files with 21 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/stattext.cpp
View File

@@ -138,14 +138,9 @@ void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
InvalidateBestSize();
(this->*setter)(GTK_LABEL(m_widget), label);
// adjust the label size to the new label unless disabled
if ( !HasFlag(wxST_NO_AUTORESIZE) &&
!IsEllipsized() ) // if ellipsization is ON, then we don't want to get resized!
SetSize( GetBestSize() );
AutoResizeIfNecessary();
}
void wxStaticText::SetLabel(const wxString& label)
@@ -222,11 +217,8 @@ bool wxStaticText::SetFont( const wxFont &font )
gtk_label_set_use_underline(GTK_LABEL(m_widget), !isUnderlined);
}
// adjust the label size to the new label unless disabled
if (!HasFlag(wxST_NO_AUTORESIZE))
{
SetSize( GetBestSize() );
}
AutoResizeIfNecessary();
return ret;
}