Add support for more CSS styles to SPAN tag in wxHtmlWindow.
Add limited support font-family, font-style and text-decoration. Closes #13170. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -458,6 +458,7 @@ All (GUI):
|
||||
- Added wxDataViewItemAttr::SetBackgroundColour() and implemented it in generic
|
||||
wxDataViewCtrl (Andrew Xu).
|
||||
- Fix item alignment in icon view in the generic wxListCtrl.
|
||||
- Support font-family/style, text-decoration in wxHtmlWindow (Blake Oleander).
|
||||
|
||||
GTK:
|
||||
|
||||
|
@@ -581,8 +581,14 @@ UL
|
||||
|
||||
wxHTML doesn't really have CSS support but it does support a few simple styles:
|
||||
you can use @c "text-align", @c "width", @c "vertical-align" and @c
|
||||
"background" with all elements and for @c SPAN elements the @c "color", @c
|
||||
"font-size" and @c "font-weight" are additionally recognized.
|
||||
"background" with all elements and for @c SPAN elements a few other styles are
|
||||
additionally recognized:
|
||||
- @c color
|
||||
- @c font-family
|
||||
- @c font-size (only in point units)
|
||||
- @c font-style (only "oblique", "italic" and "normal" values are supported)
|
||||
- @c font-weight (only "bold" and "normal" values are supported)
|
||||
- @c text-decoration (only "underline" value is supported)
|
||||
|
||||
*/
|
||||
|
||||
|
@@ -36,6 +36,9 @@ TAG_HANDLER_BEGIN(SPAN, "SPAN" )
|
||||
wxColour oldclr = m_WParser->GetActualColor();
|
||||
int oldsize = m_WParser->GetFontSize();
|
||||
int oldbold = m_WParser->GetFontBold();
|
||||
int olditalic = m_WParser->GetFontItalic();
|
||||
int oldunderlined = m_WParser->GetFontUnderlined();
|
||||
wxString oldfontface = m_WParser->GetFontFace();
|
||||
|
||||
// Load any style parameters
|
||||
wxHtmlStyleParams styleParams(tag);
|
||||
@@ -92,22 +95,60 @@ TAG_HANDLER_BEGIN(SPAN, "SPAN" )
|
||||
}
|
||||
}
|
||||
|
||||
str = styleParams.GetParam(wxS("font-style"));
|
||||
if ( !str.empty() )
|
||||
{
|
||||
// "oblique" and "italic" are more or less the same.
|
||||
// "inherit" (using the parent font) is not supported.
|
||||
if ( str == wxS("oblique") || str == wxS("italic") )
|
||||
{
|
||||
m_WParser->SetFontItalic(true);
|
||||
m_WParser->GetContainer()->InsertCell(
|
||||
new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||
}
|
||||
else if ( str == wxS("normal") )
|
||||
{
|
||||
m_WParser->SetFontItalic(false);
|
||||
m_WParser->GetContainer()->InsertCell(
|
||||
new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||
}
|
||||
}
|
||||
|
||||
str = styleParams.GetParam(wxS("text-decoration"));
|
||||
if ( !str.empty() )
|
||||
{
|
||||
// Only underline is supported.
|
||||
if ( str == wxS("underline") )
|
||||
{
|
||||
m_WParser->SetFontUnderlined(true);
|
||||
m_WParser->GetContainer()->InsertCell(
|
||||
new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||
}
|
||||
}
|
||||
|
||||
str = styleParams.GetParam(wxS("font-family"));
|
||||
if ( !str.empty() )
|
||||
{
|
||||
m_WParser->SetFontFace(str);
|
||||
m_WParser->GetContainer()->InsertCell(
|
||||
new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||
}
|
||||
|
||||
ParseInner(tag);
|
||||
|
||||
if (oldbold != m_WParser->GetFontBold())
|
||||
{
|
||||
m_WParser->SetFontBold(oldbold);
|
||||
m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||
}
|
||||
if (oldsize != m_WParser->GetFontSize())
|
||||
{
|
||||
m_WParser->SetFontSize(oldsize);
|
||||
m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||
}
|
||||
m_WParser->SetFontSize(oldsize);
|
||||
m_WParser->SetFontBold(oldbold);
|
||||
m_WParser->SetFontUnderlined(oldunderlined);
|
||||
m_WParser->SetFontFace(oldfontface);
|
||||
m_WParser->SetFontItalic(olditalic);
|
||||
m_WParser->GetContainer()->InsertCell(
|
||||
new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||
|
||||
if (oldclr != m_WParser->GetActualColor())
|
||||
{
|
||||
m_WParser->SetActualColor(oldclr);
|
||||
m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
|
||||
m_WParser->GetContainer()->InsertCell(
|
||||
new wxHtmlColourCell(oldclr));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user