fix for animated GIFs with frames of different dimensions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,6 +24,7 @@
|
|||||||
#include "wx/dc.h"
|
#include "wx/dc.h"
|
||||||
#include "wx/scrolwin.h"
|
#include "wx/scrolwin.h"
|
||||||
#include "wx/timer.h"
|
#include "wx/timer.h"
|
||||||
|
#include "wx/dcmemory.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/html/forcelnk.h"
|
#include "wx/html/forcelnk.h"
|
||||||
@@ -448,7 +449,17 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
|
|||||||
if ( m_window->GetClientRect().Intersects(rect) &&
|
if ( m_window->GetClientRect().Intersects(rect) &&
|
||||||
m_gifDecoder->ConvertToImage(&img) )
|
m_gifDecoder->ConvertToImage(&img) )
|
||||||
{
|
{
|
||||||
SetImage(img);
|
if ( (int)m_gifDecoder->GetWidth() != m_Width ||
|
||||||
|
(int)m_gifDecoder->GetHeight() != m_Height ||
|
||||||
|
m_gifDecoder->GetLeft() != 0 || m_gifDecoder->GetTop() != 0 )
|
||||||
|
{
|
||||||
|
wxBitmap bmp(img);
|
||||||
|
wxMemoryDC dc;
|
||||||
|
dc.SelectObject(*m_bitmap);
|
||||||
|
dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
SetImage(img);
|
||||||
m_window->Refresh(img.HasMask(), &rect);
|
m_window->Refresh(img.HasMask(), &rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user