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

wxHTML: fixed bug in tables rendering when rowspan was used

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-03-18 23:34:17 +00:00
parent afa3e1edcd
commit 2fa3b70778
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/html/m_tables.cpp
View File

@@ -231,16 +231,16 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
// width: // width:
{ {
if (tag.HasParam("WIDTH")) if (tag.HasParam("WIDTH"))
{ {
wxString wd = tag.GetParam("WIDTH"); wxString wd = tag.GetParam("WIDTH");
if (wd[wd.Length()-1] == '%') if (wd[wd.Length()-1] == '%')
{ {
wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width); wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width);
m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
} }
else else
{ {
wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width); wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width);
m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width); m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width);
m_ColsInfo[c].units = wxHTML_UNITS_PIXELS; m_ColsInfo[c].units = wxHTML_UNITS_PIXELS;
@@ -254,7 +254,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
if (tag.HasParam(wxT("COLSPAN"))) tag.ScanParam(wxT("COLSPAN"), wxT("%i"), &m_CellInfo[r][c].colspan); if (tag.HasParam(wxT("COLSPAN"))) tag.ScanParam(wxT("COLSPAN"), wxT("%i"), &m_CellInfo[r][c].colspan);
if (tag.HasParam(wxT("ROWSPAN"))) tag.ScanParam(wxT("ROWSPAN"), wxT("%i"), &m_CellInfo[r][c].rowspan); if (tag.HasParam(wxT("ROWSPAN"))) tag.ScanParam(wxT("ROWSPAN"), wxT("%i"), &m_CellInfo[r][c].rowspan);
if ((m_CellInfo[r][c].colspan != 1) || (m_CellInfo[r][c].rowspan != 1)) if ((m_CellInfo[r][c].colspan != 1) || (m_CellInfo[r][c].rowspan != 1))
{ {
int i, j; int i, j;
if (r + m_CellInfo[r][c].rowspan > m_NumRows) ReallocRows(r + m_CellInfo[r][c].rowspan); if (r + m_CellInfo[r][c].rowspan > m_NumRows) ReallocRows(r + m_CellInfo[r][c].rowspan);
@@ -271,7 +271,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
int bk = m_rBkg; int bk = m_rBkg;
if (tag.HasParam(wxT("BGCOLOR"))) tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &bk); if (tag.HasParam(wxT("BGCOLOR"))) tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &bk);
if (bk != -1) if (bk != -1)
{ {
wxColour clr = wxColour((bk & 0xFF0000) >> 16 , (bk & 0x00FF00) >> 8, (bk & 0x0000FF)); wxColour clr = wxColour((bk & 0xFF0000) >> 16 , (bk & 0x00FF00) >> 8, (bk & 0x0000FF));
cell->SetBackgroundColour(clr); cell->SetBackgroundColour(clr);
} }
@@ -353,7 +353,7 @@ void wxHtmlTableCell::Layout(int w)
{ {
int wpos = m_Spacing; int wpos = m_Spacing;
for (int i = 0; i < m_NumCols; i++) for (int i = 0; i < m_NumCols; i++)
{ {
m_ColsInfo[i].leftpos = wpos; m_ColsInfo[i].leftpos = wpos;
wpos += m_ColsInfo[i].pixwidth + m_Spacing; wpos += m_ColsInfo[i].pixwidth + m_Spacing;
} }
@@ -367,11 +367,11 @@ void wxHtmlTableCell::Layout(int w)
int fullwid; int fullwid;
wxHtmlContainerCell *actcell; wxHtmlContainerCell *actcell;
for (actrow = 0; actrow <= m_NumRows; actrow++) ypos[actrow] = m_Spacing; ypos[0] = m_Spacing;
for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1;
for (actrow = 0; actrow < m_NumRows; actrow++) for (actrow = 0; actrow < m_NumRows; actrow++)
{ {
if (ypos[actrow] == -1) ypos[actrow] = ypos[actrow-1];
// 3a. sub-layout and detect max height: // 3a. sub-layout and detect max height:
for (actcol = 0; actcol < m_NumCols; actcol++) { for (actcol = 0; actcol < m_NumCols; actcol++) {
@@ -390,14 +390,12 @@ void wxHtmlTableCell::Layout(int w)
} }
} }
for (actrow = 0; actrow < m_NumRows; actrow++) for (actrow = 0; actrow < m_NumRows; actrow++)
{ {
// 3b. place cells in row & let'em all have same height: // 3b. place cells in row & let'em all have same height:
for (actcol = 0; actcol < m_NumCols; actcol++) for (actcol = 0; actcol < m_NumCols; actcol++)
{ {
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(
@@ -410,7 +408,6 @@ void wxHtmlTableCell::Layout(int w)
actcell->Layout(fullwid); actcell->Layout(fullwid);
actcell->SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); actcell->SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]);
} }
} }
m_Height = ypos[m_NumRows]; m_Height = ypos[m_NumRows];
delete[] ypos; delete[] ypos;
@@ -448,7 +445,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
// new table started, backup upper-level table (if any) and create new: // new table started, backup upper-level table (if any) and create new:
if (tag.GetName() == wxT("TABLE")) if (tag.GetName() == wxT("TABLE"))
{ {
wxHtmlTableCell *oldt = m_Table; wxHtmlTableCell *oldt = m_Table;
wxHtmlContainerCell *oldcont; wxHtmlContainerCell *oldcont;
int m_OldAlign; int m_OldAlign;
@@ -472,10 +469,10 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
else if (m_Table && !tag.IsEnding()) else if (m_Table && !tag.IsEnding())
{ {
// new row in table // new row in table
if (tag.GetName() == wxT("TR")) if (tag.GetName() == wxT("TR"))
{ {
m_Table->AddRow(tag); m_Table->AddRow(tag);
m_rAlign = m_tAlign; m_rAlign = m_tAlign;
if (tag.HasParam(wxT("ALIGN"))) m_rAlign = tag.GetParam(wxT("ALIGN")); if (tag.HasParam(wxT("ALIGN"))) m_rAlign = tag.GetParam(wxT("ALIGN"));
@@ -483,7 +480,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
// new cell // new cell
else else
{ {
m_WParser->SetAlign(m_OldAlign); m_WParser->SetAlign(m_OldAlign);
c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table)); c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table));
m_Table->AddCell(c, tag); m_Table->AddCell(c, tag);
@@ -491,7 +488,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
m_WParser->OpenContainer(); m_WParser->OpenContainer();
if (tag.GetName() == wxT("TH")) /*header style*/ if (tag.GetName() == wxT("TH")) /*header style*/
{ {
m_WParser->SetAlign(wxHTML_ALIGN_CENTER); m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
} }