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

backported HTML tables horizontal size fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-21 14:47:05 +00:00
parent 0edd44ba7c
commit 945eecbe0f
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/html/m_tables.cpp
View File

@@ -351,8 +351,6 @@ void wxHtmlTableCell::ComputeMinMaxWidths()
{ {
if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return; if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return;
int left, right, width;
for (int c = 0; c < m_NumCols; c++) for (int c = 0; c < m_NumCols; c++)
{ {
for (int r = 0; r < m_NumRows; r++) for (int r = 0; r < m_NumRows; r++)
@@ -361,11 +359,9 @@ void wxHtmlTableCell::ComputeMinMaxWidths()
if (cell.flag == cellUsed) if (cell.flag == cellUsed)
{ {
cell.cont->Layout(2*m_Padding + 1); cell.cont->Layout(2*m_Padding + 1);
cell.cont->GetHorizontalConstraints(&left, &right); int width = cell.cont->GetWidth();
width = right - left;
width -= (cell.colspan-1) * m_Spacing; width -= (cell.colspan-1) * m_Spacing;
// HTML 4.0 says it is acceptable to distribute min/max // HTML 4.0 says it is acceptable to distribute min/max
// width of spanning cells evently
width /= cell.colspan; width /= cell.colspan;
for (int j = 0; j < cell.colspan; j++) for (int j = 0; j < cell.colspan; j++)
if (width > m_ColsInfo[c+j].minWidth) if (width > m_ColsInfo[c+j].minWidth)
@@ -435,13 +431,18 @@ void wxHtmlTableCell::Layout(int w)
wpix -= wtemp; wpix -= wtemp;
// 1c. setup defalut columns (no width specification supplied): // 1c. setup defalut columns (no width specification supplied):
// NOTE! This algorithm doesn't conform to HTML standard : it assigns equal widths // FIXME: This algorithm doesn't conform to HTML standard : it assigns
// instead of optimal // equal widths instead of optimal
for (i = j = 0; i < m_NumCols; i++) for (i = j = 0; i < m_NumCols; i++)
if (m_ColsInfo[i].width == 0) j++; if (m_ColsInfo[i].width == 0) j++;
for (i = 0; i < m_NumCols; i++) for (i = 0; i < m_NumCols; i++)
if (m_ColsInfo[i].width == 0) if (m_ColsInfo[i].width == 0)
m_ColsInfo[i].pixwidth = wpix / j; {
// FIXME: this is not optimal, because if we allocate more than
// wpix/j pixels to one column, we should try to allocate
// smaller place to other columns
m_ColsInfo[i].pixwidth = wxMax(wpix/j, m_ColsInfo[i].minWidth);
}
} }
/* 2. compute positions of columns: */ /* 2. compute positions of columns: */
@@ -507,6 +508,15 @@ void wxHtmlTableCell::Layout(int w)
m_Height = ypos[m_NumRows]; m_Height = ypos[m_NumRows];
delete[] ypos; delete[] ypos;
} }
/* 4. adjust table's width if it was too small: */
if (m_NumCols > 0)
{
int twidth = m_ColsInfo[m_NumCols-1].leftpos +
m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing;
if (twidth > m_Width)
m_Width = twidth;
}
} }