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

Fix for caret positioning inaccuracy when there are tabs and a non-zero control margin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-11-29 20:20:46 +00:00
parent c8b1284f7e
commit f98779189c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextbuffer.cpp
View File

@@ -5429,6 +5429,8 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
wxASSERT (para != NULL);
int relativeX = position.x - GetParent()->GetPosition().x;
wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
// Always assume unformatted text, since at this level we have no knowledge
@@ -5519,9 +5521,9 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
textExtents.Add(oldWidth + p[j]);
if (textExtents.GetCount() > 0)
absoluteWidth = textExtents[textExtents.GetCount()-1] + position.x;
absoluteWidth = textExtents[textExtents.GetCount()-1] + relativeX;
else
absoluteWidth = position.x;
absoluteWidth = relativeX;
}
else
#endif
@@ -5550,7 +5552,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
notFound = false;
width = nextTabPos - position.x;
width = nextTabPos - relativeX;
#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
if (g_UseGlobalPartialTextExtents)