solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Stop using wxClientDC in wxGenericAnimationCtrl

Browse source 
Just refresh the window and repaint it from OnPaint().

This was already effectively done under Mac and now this class can be
also used in wxGTK (where it may be preferable to the native one as the
latter one doesn't support high DPI animations yet).
This commit is contained in:
Vadim Zeitlin 2023-08-25 20:48:34 +02:00
parent a91e974004
commit 2dd39d6b8c
2 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/wx/generic/animate.h
View file

@ -140,6 +140,9 @@ protected:
// on the screen
private:
// True if we need to show the next frame after painting the current one.
bool m_needToShowNextFrame = false;
typedef wxAnimationCtrlBase base_type;
wxDECLARE_DYNAMIC_CLASS(wxGenericAnimationCtrl);
wxDECLARE_EVENT_TABLE();

37
src/generic/animateg.cpp
View file

@ -337,19 +337,9 @@ bool wxGenericAnimationCtrl::Play(bool looped)
m_isPlaying = true;
// do a ClearBackground() to avoid that e.g. the custom static bitmap which
// was eventually shown previously remains partially drawn
ClearBackground();
m_needToShowNextFrame = true;
// DrawCurrentFrame() will use our updated backing store
wxClientDC clientDC(this);
DrawCurrentFrame(clientDC);
// start the timer
int delay = m_animation.GetDelay(0);
if (delay == 0)
delay = 1; // 0 is invalid timeout for wxTimer.
m_timer.StartOnce(delay);
Refresh();
return true;
}
@ -562,6 +552,17 @@ void wxGenericAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
// clear then our area to the background colour
DisposeToBackground(dc);
}
if ( m_needToShowNextFrame )
{
m_needToShowNextFrame = false;
// Set the timer for the next frame
int delay = m_animation.GetDelay(m_currentFrame);
if (delay == 0)
delay = 1; // 0 is invalid timeout for wxTimer.
m_timer.StartOnce(delay);
}
}
void wxGenericAnimationCtrl::OnTimer(wxTimerEvent &WXUNUSED(event))
@ -581,19 +582,9 @@ void wxGenericAnimationCtrl::OnTimer(wxTimerEvent &WXUNUSED(event))
IncrementalUpdateBackingStore();
wxClientDC dc(this);
DrawCurrentFrame(dc);
m_needToShowNextFrame = true;
#ifdef __WXMAC__
// without this, the animation currently doesn't redraw under Mac
Refresh();
#endif // __WXMAC__
// Set the timer for the next frame
int delay = m_animation.GetDelay(m_currentFrame);
if (delay == 0)
delay = 1; // 0 is invalid timeout for wxTimer.
m_timer.StartOnce(delay);
}
void wxGenericAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event))