From 34b4899df5053a53482f18d8c97a2b1913019d30 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 28 Nov 2008 15:53:13 +0000 Subject: [PATCH] Fixed centering and right-justification when combined with left indentation (bug #10221). Fixed wrapping problem for long lines (bug #10149). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index eb0b15d417..80e5e8fd1b 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -3618,12 +3618,12 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttr& attr, const wxRe // centering, right-justification if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) { - pos.x = (rect.GetWidth() - size.x)/2 + pos.x; + pos.x = (rect.GetWidth() - (pos.x - rect.x) - size.x)/2 + pos.x; line->SetPosition(pos); } else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) { - pos.x = pos.x + rect.GetWidth() - size.x; + pos.x = rect.x + rect.GetWidth() - size.x; line->SetPosition(pos); } @@ -4228,7 +4228,7 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d widthBefore = 0; size_t i; - for (i = (size_t) range.GetStart(); i < (size_t) range.GetEnd(); i++) + for (i = (size_t) range.GetStart(); i= < (size_t) range.GetEnd(); i++) { int widthFromStartOfThisRange = (*partialExtents)[i - GetRange().GetStart()] - widthBefore; @@ -5473,7 +5473,7 @@ wxTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPositio if (para->GetAttributes().HasBulletNumber()) attr.SetBulletNumber(para->GetAttributes().GetBulletNumber()); } - } + } if (!foundAttributes) { -- 2.47.2