Fix for wrong line placement when centering or right-aligning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
346c54a4bb
commit
0d6ca1c2f6
@ -3641,17 +3641,13 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttr& attr, const wxRe
|
||||
if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
|
||||
{
|
||||
int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
|
||||
pos.x = (rect.GetWidth() - (pos.x - rect.x) - rightIndent - size.x)/2 + pos.x;
|
||||
// Lines are relative to the paragraph position
|
||||
pos.x -= GetPosition().x;
|
||||
pos.x = (rect.GetWidth() - pos.x - rightIndent - size.x)/2 + pos.x;
|
||||
line->SetPosition(pos);
|
||||
}
|
||||
else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
|
||||
{
|
||||
int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
|
||||
pos.x = rect.x + rect.GetWidth() - size.x - rightIndent;
|
||||
// Lines are relative to the paragraph position
|
||||
pos.x -= GetPosition().x;
|
||||
pos.x = rect.GetWidth() - size.x - rightIndent;
|
||||
line->SetPosition(pos);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user