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

Fix for wrong line placement when centering or right-aligning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2009-09-23 07:38:42 +00:00
parent 346c54a4bb
commit 0d6ca1c2f6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextbuffer.cpp
View File

@ -3641,17 +3641,13 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttr& attr, const wxRe
if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
{ {
int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
pos.x = (rect.GetWidth() - (pos.x - rect.x) - rightIndent - size.x)/2 + pos.x; pos.x = (rect.GetWidth() - pos.x - rightIndent - size.x)/2 + pos.x;
// Lines are relative to the paragraph position
pos.x -= GetPosition().x;
line->SetPosition(pos); line->SetPosition(pos);
} }
else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
{ {
int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
pos.x = rect.x + rect.GetWidth() - size.x - rightIndent; pos.x = rect.GetWidth() - size.x - rightIndent;
// Lines are relative to the paragraph position
pos.x -= GetPosition().x;
line->SetPosition(pos); line->SetPosition(pos);
} }