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

Allow passing already parsed HTML to wxHtmlDCRenderer

Browse Source 
This is more efficient when the same HTML is reused multiple times, e.g.
for measuring it first and then rendering it.

The new function also makes it simpler to parse HTML and manipulate it
in some way before measuring and rendering it.
This commit is contained in:
Vadim Zeitlin
2018-08-25 02:35:20 +02:00
parent de5ba70203
commit 9db0234abc
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/html/htmprint.cpp
View File

@@ -70,6 +70,7 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
m_DC = NULL;
m_Width = m_Height = 0;
m_Cells = NULL;
m_ownsCells = false;
m_Parser = new wxHtmlWinParser();
m_FS = new wxFileSystem();
m_Parser->SetFS(m_FS);
@@ -80,7 +81,9 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
wxHtmlDCRenderer::~wxHtmlDCRenderer()
{
if (m_Cells) delete m_Cells;
if ( m_ownsCells )
delete m_Cells;
if (m_Parser) delete m_Parser;
if (m_FS) delete m_FS;
}
@@ -110,14 +113,33 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat
wxCHECK_RET( m_DC, "SetDC() must be called before SetHtmlText()" );
wxCHECK_RET( m_Width, "SetSize() must be called before SetHtmlText()" );
wxDELETE(m_Cells);
m_FS->ChangePathTo(basepath, isdir);
m_Cells = (wxHtmlContainerCell*) m_Parser->Parse(html);
wxHtmlContainerCell* const cell = (wxHtmlContainerCell*) m_Parser->Parse(html);
wxCHECK_RET( cell, "Failed to parse HTML" );
DoSetHtmlCell(cell);
m_ownsCells = true;
}
void wxHtmlDCRenderer::DoSetHtmlCell(wxHtmlContainerCell* cell)
{
if ( m_ownsCells )
delete m_Cells;
m_Cells = cell;
m_Cells->SetIndent(0, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
m_Cells->Layout(m_Width);
}
void wxHtmlDCRenderer::SetHtmlCell(wxHtmlContainerCell& cell)
{
DoSetHtmlCell(&cell);
m_ownsCells = false;
}
void wxHtmlDCRenderer::SetFonts(const wxString& normal_face, const wxString& fixed_face,
const int *sizes)