Fix handling of spaces after <img> tag in wxHTML.
Don't collapse the spaces following this tag with the ones preceding it. See #14557. Closes #2980. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -138,6 +138,11 @@ public:
|
|||||||
// applies current parser state (link, sub/supscript, ...) to given cell
|
// applies current parser state (link, sub/supscript, ...) to given cell
|
||||||
void ApplyStateToCell(wxHtmlCell *cell);
|
void ApplyStateToCell(wxHtmlCell *cell);
|
||||||
|
|
||||||
|
// Needs to be called after inserting a cell that interrupts the flow of
|
||||||
|
// the text like e.g. <img> and tells us to not consider any of the
|
||||||
|
// following space as being part of the same space run as before.
|
||||||
|
void StopCollapsingSpaces() { m_tmpLastWasSpace = false; }
|
||||||
|
|
||||||
#if !wxUSE_UNICODE
|
#if !wxUSE_UNICODE
|
||||||
void SetInputEncoding(wxFontEncoding enc);
|
void SetInputEncoding(wxFontEncoding enc);
|
||||||
wxFontEncoding GetInputEncoding() const { return m_InputEnc; }
|
wxFontEncoding GetInputEncoding() const { return m_InputEnc; }
|
||||||
|
@@ -718,6 +718,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
|
|||||||
m_WParser->GetPixelScale(),
|
m_WParser->GetPixelScale(),
|
||||||
al, mn);
|
al, mn);
|
||||||
m_WParser->ApplyStateToCell(cel);
|
m_WParser->ApplyStateToCell(cel);
|
||||||
|
m_WParser->StopCollapsingSpaces();
|
||||||
cel->SetId(tag.GetParam(wxT("id"))); // may be empty
|
cel->SetId(tag.GetParam(wxT("id"))); // may be empty
|
||||||
cel->SetAlt(tag.GetParam(wxT("alt")));
|
cel->SetAlt(tag.GetParam(wxT("alt")));
|
||||||
m_WParser->GetContainer()->InsertCell(cel);
|
m_WParser->GetContainer()->InsertCell(cel);
|
||||||
|
Reference in New Issue
Block a user