X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca16b7a98e70752eb57448571d7223052834550f..982d7f931701e2d65182f798e9182139efd67ed7:/src/html/m_tables.cpp
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 36f364e1af..5b5b22fca1 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -1,25 +1,22 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: m_tables.cpp
+// Name: src/html/m_tables.cpp
// Purpose: wxHtml module for tables
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
+ #include "wx/wxcrtvararg.h"
#endif
#include "wx/html/forcelnk.h"
@@ -74,8 +71,6 @@ class wxHtmlTableCell : public wxHtmlContainerCell
protected:
/* These are real attributes: */
- // should we draw borders or not?
- bool m_HasBorders;
// number of columns; rows
int m_NumCols, m_NumRows;
// array of column information
@@ -102,7 +97,10 @@ private:
public:
wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);
- ~wxHtmlTableCell();
+ virtual ~wxHtmlTableCell();
+
+ virtual void RemoveExtraSpacing(bool top, bool bottom);
+
virtual void Layout(int w);
void AddRow(const wxHtmlTag& tag);
@@ -116,10 +114,10 @@ private:
void ReallocRows(int rows);
// Computes minimal and maximal widths of columns. Needs to be called
- // only once, before first Layout().
+ // only once, before first Layout().
void ComputeMinMaxWidths();
- DECLARE_NO_COPY_CLASS(wxHtmlTableCell)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlTableCell);
};
@@ -128,8 +126,6 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
: wxHtmlContainerCell(parent)
{
m_PixelScale = pixel_scale;
- m_HasBorders =
- (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0"));
m_ColsInfo = NULL;
m_NumCols = m_NumRows = 0;
m_CellInfo = NULL;
@@ -137,7 +133,11 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
/* scan params: */
if (tag.HasParam(wxT("BGCOLOR")))
+ {
tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg);
+ if (m_tBkg.Ok())
+ SetBackgroundColour(m_tBkg);
+ }
if (tag.HasParam(wxT("VALIGN")))
m_tValign = tag.GetParam(wxT("VALIGN"));
else
@@ -149,8 +149,20 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
m_Spacing = (int)(m_PixelScale * (double)m_Spacing);
m_Padding = (int)(m_PixelScale * (double)m_Padding);
- if (m_HasBorders)
- SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2);
+ if(tag.HasParam(wxT("BORDER")))
+ {
+ if(tag.GetParam("BORDER").IsEmpty())
+ m_Border = 1;
+ else
+ tag.GetParamAsInt(wxT("BORDER"), &m_Border);
+ }
+ if (m_Border == 1)
+ SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2, m_Border); // special case see wxHtmlContainerCell::Draw
+ else if (m_Border> 0)
+ SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2, (int)(m_PixelScale * (double)m_Border));
+ else
+ m_Border = 0;
+
}
@@ -167,6 +179,15 @@ wxHtmlTableCell::~wxHtmlTableCell()
}
+void wxHtmlTableCell::RemoveExtraSpacing(bool WXUNUSED(top),
+ bool WXUNUSED(bottom))
+{
+ // Don't remove any spacing in the table -- it's always desirable,
+ // because it's part of table's definition.
+ // (If wxHtmlContainerCell::RemoveExtraSpacing() was applied to tables,
+ // then upper left cell of a table would be positioned above other cells
+ // if the table was the first element on the page.)
+}
void wxHtmlTableCell::ReallocCols(int cols)
{
@@ -267,16 +288,21 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
{
wxString wd = tag.GetParam(wxT("WIDTH"));
- if (wd[wd.Length()-1] == wxT('%'))
+ if (wd[wd.length()-1] == wxT('%'))
{
- wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width);
- m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
+ if ( wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width) == 1 )
+ {
+ m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
+ }
}
else
{
- 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].units = wxHTML_UNITS_PIXELS;
+ long width;
+ if ( wd.ToLong(&width) )
+ {
+ m_ColsInfo[c].width = (int)(m_PixelScale * (double)width);
+ m_ColsInfo[c].units = wxHTML_UNITS_PIXELS;
+ }
}
}
}
@@ -288,14 +314,14 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan);
// VS: the standard says this about col/rowspan:
- // "This attribute specifies the number of rows spanned by the
- // current cell. The default value of this attribute is one ("1").
- // The value zero ("0") means that the cell spans all rows from the
- // current row to the last row of the table." All mainstream
+ // "This attribute specifies the number of rows spanned by the
+ // current cell. The default value of this attribute is one ("1").
+ // The value zero ("0") means that the cell spans all rows from the
+ // current row to the last row of the table." All mainstream
// browsers act as if 0==1, though, and so does wxHTML.
- if (m_CellInfo[r][c].colspan < 1)
+ if (m_CellInfo[r][c].colspan < 1)
m_CellInfo[r][c].colspan = 1;
- if (m_CellInfo[r][c].rowspan < 1)
+ if (m_CellInfo[r][c].rowspan < 1)
m_CellInfo[r][c].rowspan = 1;
if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1))
@@ -321,7 +347,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
if (bk.Ok())
cell->SetBackgroundColour(bk);
}
- if (m_HasBorders)
+ if (m_Border > 0)
cell->SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1);
// vertical alignment:
@@ -350,8 +376,8 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
void wxHtmlTableCell::ComputeMinMaxWidths()
{
- if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return;
-
+ if (m_NumCols == 0 || m_ColsInfo[0].minWidth != wxDefaultCoord) return;
+
m_MaxTotalWidth = 0;
int percentage = 0;
for (int c = 0; c < m_NumCols; c++)
@@ -395,13 +421,13 @@ void wxHtmlTableCell::ComputeMinMaxWidths()
else
m_MaxTotalWidth = m_MaxTotalWidth * 100 / (100 - percentage);
- m_MaxTotalWidth += (m_NumCols + 1) * m_Spacing;
+ m_MaxTotalWidth += (m_NumCols + 1) * m_Spacing + 2 * m_Border;
}
void wxHtmlTableCell::Layout(int w)
{
ComputeMinMaxWidths();
-
+
wxHtmlCell::Layout(w);
/*
@@ -418,7 +444,7 @@ void wxHtmlTableCell::Layout(int w)
m_WidthFloat = -100;
m_Width = (100 + m_WidthFloat) * w / 100;
}
- else
+ else
{
if (m_WidthFloat > 100)
m_WidthFloat = 100;
@@ -438,19 +464,19 @@ void wxHtmlTableCell::Layout(int w)
*/
- /* 1. setup columns widths:
-
+ /* 1. setup columns widths:
+
The algorithm tries to keep the table size less than w if possible.
*/
{
- int wpix = m_Width - (m_NumCols + 1) * m_Spacing;
+ int wpix = m_Width - (m_NumCols + 1) * m_Spacing - 2 * m_Border; // Available space for cell content
int i, j;
// 1a. setup fixed-width columns:
for (i = 0; i < m_NumCols; i++)
if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS)
{
- m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width,
+ m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width,
m_ColsInfo[i].minWidth);
wpix -= m_ColsInfo[i].pixwidth;
}
@@ -481,12 +507,12 @@ void wxHtmlTableCell::Layout(int w)
newWidth = w;
else
newWidth = newWidth * 100 / (100 - percentage);
-
- newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing);
+
+ newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing - 2 * m_Border);
wpix -= m_Width - newWidth;
m_Width = newWidth;
}
-
+
// 1c. setup floating-width columns:
int wtemp = wpix;
@@ -496,7 +522,7 @@ void wxHtmlTableCell::Layout(int w)
m_ColsInfo[i].pixwidth = wxMin(m_ColsInfo[i].width, 100) * wpix / 100;
// Make sure to leave enough space for the other columns
- int minRequired = 0;
+ int minRequired = m_Border;
for (j = 0; j < m_NumCols; j++)
{
if ((m_ColsInfo[j].units == wxHTML_UNITS_PERCENT && j > i) ||
@@ -507,7 +533,7 @@ void wxHtmlTableCell::Layout(int w)
wtemp -= m_ColsInfo[i].pixwidth;
}
- wpix = wtemp;
+ wpix = wtemp; // minimum cells width
// 1d. setup default columns (no width specification supplied):
// The algorithm assigns calculates the maximum possible width if line
@@ -518,8 +544,8 @@ void wxHtmlTableCell::Layout(int w)
for (i = j = 0; i < m_NumCols; i++)
if (m_ColsInfo[i].width == 0) j++;
- if (wpix < 0)
- wpix = 0;
+ if (wpix < m_Border)
+ wpix = m_Border;
// Assign widths
for (i = 0; i < m_NumCols; i++)
@@ -527,10 +553,10 @@ void wxHtmlTableCell::Layout(int w)
{
// Assign with, make sure not to drop below minWidth
if (maxWidth)
- m_ColsInfo[i].pixwidth = wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5;
+ m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5);
else
m_ColsInfo[i].pixwidth = wpix / j;
-
+
// Make sure to leave enough space for the other columns
int minRequired = 0;
int r;
@@ -545,7 +571,7 @@ void wxHtmlTableCell::Layout(int w)
{
if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5))
{
- int diff = m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5);
+ int diff = (int)(m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5));
maxWidth += diff - m_ColsInfo[i].maxWidth;
}
else
@@ -557,12 +583,16 @@ void wxHtmlTableCell::Layout(int w)
/* 2. compute positions of columns: */
{
- int wpos = m_Spacing;
+ int wpos = m_Spacing + m_Border;
for (int i = 0; i < m_NumCols; i++)
{
m_ColsInfo[i].leftpos = wpos;
wpos += m_ColsInfo[i].pixwidth + m_Spacing;
}
+
+ // add the remaining space to the last column
+ if (m_NumCols > 0 && wpos < m_Width - m_Border)
+ m_ColsInfo[m_NumCols-1].pixwidth += m_Width - wpos - m_Border;
}
/* 3. sub-layout all cells: */
@@ -573,7 +603,7 @@ void wxHtmlTableCell::Layout(int w)
int fullwid;
wxHtmlContainerCell *actcell;
- ypos[0] = m_Spacing;
+ ypos[0] = m_Spacing + m_Border;
for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1;
for (actrow = 0; actrow < m_NumRows; actrow++)
{
@@ -615,15 +645,15 @@ void wxHtmlTableCell::Layout(int w)
actcell->SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]);
}
}
- m_Height = ypos[m_NumRows];
+ m_Height = ypos[m_NumRows] + m_Border;
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;
+ int twidth = m_ColsInfo[m_NumCols-1].leftpos +
+ m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing + m_Border;
if (twidth > m_Width)
m_Width = twidth;
}
@@ -644,10 +674,12 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
TAG_HANDLER_VARS
wxHtmlTableCell* m_Table;
wxString m_tAlign, m_rAlign;
+ wxHtmlContainerCell *m_enclosingContainer;
TAG_HANDLER_CONSTR(TABLE)
{
m_Table = NULL;
+ m_enclosingContainer = NULL;
m_tAlign = m_rAlign = wxEmptyString;
}
@@ -660,11 +692,11 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
if (tag.GetName() == wxT("TABLE"))
{
wxHtmlTableCell *oldt = m_Table;
- wxHtmlContainerCell *oldcont;
- oldcont = c = m_WParser->OpenContainer();
+ wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;
+ m_enclosingContainer = c = m_WParser->OpenContainer();
- m_Table = new wxHtmlTableCell(c, tag);
+ m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
// width:
{
@@ -672,7 +704,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
{
wxString wd = tag.GetParam(wxT("WIDTH"));
- if (wd[wd.Length()-1] == wxT('%'))
+ if (wd[wd.length()-1] == wxT('%'))
{
int width = 0;
wxSscanf(wd.c_str(), wxT("%i%%"), &width);
@@ -682,7 +714,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
{
int width = 0;
wxSscanf(wd.c_str(), wxT("%i"), &width);
- m_Table->SetWidthFloat(m_WParser->GetPixelScale() * width, wxHTML_UNITS_PIXELS);
+ m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS);
}
}
else
@@ -696,11 +728,13 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
ParseInner(tag);
m_WParser->SetAlign(oldAlign);
- m_WParser->SetContainer(oldcont);
+ m_WParser->SetContainer(m_enclosingContainer);
m_WParser->CloseContainer();
-
+
m_Table = oldt;
- return TRUE;
+ m_enclosingContainer = oldEnclosing;
+
+ return true; // ParseInner() called
}
@@ -723,28 +757,57 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
m_WParser->OpenContainer();
- if (tag.GetName() == wxT("TH")) /*header style*/
- m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
- else
- m_WParser->SetAlign(wxHTML_ALIGN_LEFT);
+ const bool isHeader = tag.GetName() == wxT("TH");
wxString als;
-
- als = m_rAlign;
if (tag.HasParam(wxT("ALIGN")))
als = tag.GetParam(wxT("ALIGN"));
+ else
+ als = m_rAlign;
als.MakeUpper();
+
if (als == wxT("RIGHT"))
m_WParser->SetAlign(wxHTML_ALIGN_RIGHT);
else if (als == wxT("LEFT"))
m_WParser->SetAlign(wxHTML_ALIGN_LEFT);
else if (als == wxT("CENTER"))
m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
+ else // use default alignment
+ m_WParser->SetAlign(isHeader ? wxHTML_ALIGN_CENTER
+ : wxHTML_ALIGN_LEFT);
m_WParser->OpenContainer();
+
+ // the header should be rendered in bold by default
+ int boldOld = 0;
+ if ( isHeader )
+ {
+ boldOld = m_WParser->GetFontBold();
+ m_WParser->SetFontBold(true);
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ }
+
+ ParseInner(tag);
+
+ if ( isHeader )
+ {
+ m_WParser->SetFontBold(boldOld);
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ }
+
+ // set the current container back to the enclosing one so that
+ // text outside of | and | isn't included in any cell
+ // (this happens often enough in practice because it's common
+ // to use whitespace between | and the next ):
+ m_WParser->SetContainer(m_enclosingContainer);
+
+ return true; // ParseInner() called
}
}
- return FALSE;
+
+ return false;
}
TAG_HANDLER_END(TABLE)
|