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

fixed incorrect rendering of tables with cellspacing and cellpadding and colspan/rowspan

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-05 19:31:39 +00:00
parent 2b8f5a2488
commit a97a264f73
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/html/m_tables.cpp
View File

@@ -360,6 +360,7 @@ void wxHtmlTableCell::Layout(int w)
fullwid = 0; fullwid = 0;
for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++) for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++)
fullwid += m_ColsInfo[i].pixwidth; fullwid += m_ColsInfo[i].pixwidth;
fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing;
actcell -> SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign); actcell -> SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign);
actcell -> Layout(fullwid); actcell -> Layout(fullwid);
@@ -378,11 +379,12 @@ void wxHtmlTableCell::Layout(int w)
if (m_CellInfo[actrow][actcol].flag != cellUsed) continue; if (m_CellInfo[actrow][actcol].flag != cellUsed) continue;
actcell = m_CellInfo[actrow][actcol].cont; actcell = m_CellInfo[actrow][actcol].cont;
actcell -> SetMinHeight( actcell -> SetMinHeight(
ypos[actrow + m_CellInfo[actrow][actcol].rowspan] - ypos[actrow] - m_CellInfo[actrow][actcol].rowspan * m_Spacing, ypos[actrow + m_CellInfo[actrow][actcol].rowspan] - ypos[actrow] - m_Spacing,
m_CellInfo[actrow][actcol].valign); m_CellInfo[actrow][actcol].valign);
fullwid = 0; fullwid = 0;
for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++) for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++)
fullwid += m_ColsInfo[i].pixwidth; fullwid += m_ColsInfo[i].pixwidth;
fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing;
actcell -> Layout(fullwid); actcell -> Layout(fullwid);
actcell -> SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); actcell -> SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]);
} }