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

fixed incorrect layout width caching in wxHtmlContainerCell (patch #1931479)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-04-13 12:29:53 +00:00
parent 3657a5a4d8
commit 87be8ad315
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -131,6 +131,7 @@ All (GUI):
best size if needed. best size if needed.
- Made wxSpinCtrl::Reparent() in MSW and generic versions (Angelo Mottola). - Made wxSpinCtrl::Reparent() in MSW and generic versions (Angelo Mottola).
- Fixed timing of malformed animated GIFs in wxHTML (Gennady Feller). - Fixed timing of malformed animated GIFs in wxHTML (Gennady Feller).
- Fixed incorrect layout width caching in wxHTML (Jeff Tupper).
All (Unix): All (Unix):

6
src/html/htmlcell.cpp
View File

@@ -750,7 +750,9 @@ void wxHtmlContainerCell::Layout(int w)
{ {
wxHtmlCell::Layout(w); wxHtmlCell::Layout(w);
if (m_LastLayout == w) return; if (m_LastLayout == w)
return;
m_LastLayout = w;
// VS: Any attempt to layout with negative or zero width leads to hell, // VS: Any attempt to layout with negative or zero width leads to hell,
// but we can't ignore such attempts completely, since it sometimes // but we can't ignore such attempts completely, since it sometimes
@@ -1006,8 +1008,6 @@ void wxHtmlContainerCell::Layout(int w)
m_MaxTotalWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); m_MaxTotalWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
if (m_Width < MaxLineWidth) m_Width = MaxLineWidth; if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
m_LastLayout = w;
} }
void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info, void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info,