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

Avoid flicker when size of wxStaticText doesn't change in wxMSW

Browse Source 
Don't do anything if wxStaticText::DoSetSize() is called with the same
size as the control already uses, this only results in flicker.

Closes #17075.
This commit is contained in:
sbrowne
2017-07-16 02:28:16 +02:00
committed by Vadim Zeitlin
parent 66c5762ab9
commit 4e2684c155
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/stattext.cpp
View File

@@ -120,9 +120,17 @@ wxSize wxStaticText::DoGetBestClientSize() const
void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags) void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)
{ {
// Keep track of the size before so we can see if it changed
const wxSize sizeBefore = GetSize();
// note: we first need to set the size and _then_ call UpdateLabel // note: we first need to set the size and _then_ call UpdateLabel
wxStaticTextBase::DoSetSize(x, y, w, h, sizeFlags); wxStaticTextBase::DoSetSize(x, y, w, h, sizeFlags);
// Avoid flicker by not refreshing or updating the label if the size didn't
// change.
if ( sizeBefore == GetSize() )
return;
#ifdef SS_ENDELLIPSIS #ifdef SS_ENDELLIPSIS
// do we need to ellipsize the contents? // do we need to ellipsize the contents?
long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE); long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE);