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

Optimize wrapping lines in wxRichTextCtrl

Browse Source 
When wrapping long text into multiple lines, avoid unnecessary
GetFirstLineBreakPosition calls for each wrapped line, leading to
quadratic complexity.

Closes https://github.com/wxWidgets/wxWidgets/pull/1567
This commit is contained in:
mehmets
2019-09-27 02:33:30 +03:00
committed by Vadim Zeitlin
parent f46a5423ae
commit 9c291ffbbc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/richtext/richtextbuffer.cpp
View File

@@ -5099,6 +5099,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co
// continue. // continue.
wxRect availableRect; wxRect availableRect;
long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1);
node = m_children.GetFirst(); node = m_children.GetFirst();
while (node) while (node)
@@ -5127,7 +5128,8 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co
// and found a suitable point some way into the child. So get the size for the fragment // and found a suitable point some way into the child. So get the size for the fragment
// if necessary. // if necessary.
long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1); if (nextBreakPos > -1 && nextBreakPos < lastEndPos+1)
nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1);
long lastPosToUse = child->GetRange().GetEnd(); long lastPosToUse = child->GetRange().GetEnd();
bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd()); bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd());