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

Merge branch 'wxhtml-total-width'

Browse Source 
Fix computation of max total width for container cells in wxHTML.

See https://github.com/wxWidgets/wxWidgets/pull/1504
This commit is contained in:
Vadim Zeitlin
2019-08-27 13:09:51 +02:00
parent 5873ee7e4a 6cd53a2816
commit feb30d3929
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/html/htmlcell.cpp
View File

@@ -292,8 +292,9 @@ wxString wxHtmlCell::GetDescription() const
wxString wxHtmlCell::Dump(int indent) const wxString wxHtmlCell::Dump(int indent) const
{ {
wxString s(' ', indent); wxString s(' ', indent);
s += wxString::Format("%s at (%d, %d) %dx%d", s += wxString::Format("%s(%p) at (%d, %d) %dx%d",
GetDescription(), m_PosX, m_PosY, m_Width, m_Height); GetDescription(), this,
m_PosX, m_PosY, GetMaxTotalWidth(), m_Height);
if ( !m_id.empty() ) if ( !m_id.empty() )
s += wxString::Format(" [id=%s]", m_id); s += wxString::Format(" [id=%s]", m_id);
@@ -823,8 +824,9 @@ void wxHtmlContainerCell::Layout(int w)
if (curLineWidth > m_MaxTotalWidth) if (curLineWidth > m_MaxTotalWidth)
m_MaxTotalWidth = curLineWidth; m_MaxTotalWidth = curLineWidth;
if (wxMax(cell->GetWidth(), cell->GetMaxTotalWidth()) > m_MaxTotalWidth) if (cell->GetMaxTotalWidth() > m_MaxTotalWidth)
m_MaxTotalWidth = cell->GetMaxTotalWidth(); m_MaxTotalWidth = cell->GetMaxTotalWidth();
curLineWidth = 0; curLineWidth = 0;
} }
else else