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

Merge branch 'stattext-ellipsize-fix'

Browse Source 
Fix static text ellipsization fix in presence of borders.

See https://github.com/wxWidgets/wxWidgets/pull/1646
This commit is contained in:
Vadim Zeitlin
2019-11-13 15:45:02 +01:00
parent c26353f13f 73eabe2f12
commit c8cb8756f0
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/stattextcmn.cpp
View File

@@ -261,7 +261,7 @@ wxString wxStaticTextBase::GetEllipsizedLabel() const
wxString wxStaticTextBase::Ellipsize(const wxString& label) const wxString wxStaticTextBase::Ellipsize(const wxString& label) const
{ {
wxSize sz(GetSize()); wxSize sz(GetClientSize());
if (sz.GetWidth() < 2 || sz.GetHeight() < 2) if (sz.GetWidth() < 2 || sz.GetHeight() < 2)
{ {
// the size of this window is not valid (yet) // the size of this window is not valid (yet)
@@ -269,7 +269,6 @@ wxString wxStaticTextBase::Ellipsize(const wxString& label) const
} }
wxClientDC dc(const_cast<wxStaticTextBase*>(this)); wxClientDC dc(const_cast<wxStaticTextBase*>(this));
dc.SetFont(GetFont());
wxEllipsizeMode mode; wxEllipsizeMode mode;
if ( HasFlag(wxST_ELLIPSIZE_START) ) if ( HasFlag(wxST_ELLIPSIZE_START) )