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

Don't take right indent into account twice when aligning lines

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2014-11-07 17:32:07 +00:00
parent 702e83210c
commit 46d4a7d01c
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/richtext/richtextbuffer.cpp
View File

@@ -5496,7 +5496,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co
/// Apply paragraph styles, such as centering, to wrapped lines /// Apply paragraph styles, such as centering, to wrapped lines
/// TODO: take into account box attributes, possibly /// TODO: take into account box attributes, possibly
void wxRichTextParagraph::ApplyParagraphStyle(wxRichTextLine* line, const wxRichTextAttr& attr, const wxRect& rect, wxDC& dc) void wxRichTextParagraph::ApplyParagraphStyle(wxRichTextLine* line, const wxRichTextAttr& attr, const wxRect& rect, wxDC& WXUNUSED(dc))
{ {
if (!attr.HasAlignment()) if (!attr.HasAlignment())
return; return;
@@ -5508,14 +5508,12 @@ void wxRichTextParagraph::ApplyParagraphStyle(wxRichTextLine* line, const wxRich
// centering, right-justification // centering, right-justification
if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
{ {
int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); pos.x = (rect.GetWidth() - size.x)/2 + pos.x;
pos.x = (rect.GetWidth() - rightIndent - size.x)/2 + pos.x;
line->SetPosition(pos); line->SetPosition(pos);
} }
else if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) else if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
{ {
int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent()); pos.x = pos.x + rect.GetWidth() - size.x;
pos.x = pos.x + rect.GetWidth() - size.x - rightIndent;
line->SetPosition(pos); line->SetPosition(pos);
} }
@@ -6492,7 +6490,11 @@ wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxRichTextAttr&
// want to unnecessarily overwrite the background when we're drawing text // want to unnecessarily overwrite the background when we're drawing text
// because this may erase the guideline (which appears just under the text // because this may erase the guideline (which appears just under the text
// if there's no padding). // if there's no padding).
attr.SetFlags(attr.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR); if (attr.HasBackgroundColour())
{
attr.SetBackgroundColour(wxColour());
attr.SetFlags(attr.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR);
}
} }
wxRichTextApplyStyle(attr, GetAttributes()); wxRichTextApplyStyle(attr, GetAttributes());
} }
@@ -6512,7 +6514,14 @@ wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(bool includingBoxAttr)
{ {
attr = buf->GetBasicStyle(); attr = buf->GetBasicStyle();
if (!includingBoxAttr) if (!includingBoxAttr)
{
attr.GetTextBoxAttr().Reset(); attr.GetTextBoxAttr().Reset();
if (attr.HasBackgroundColour())
{
attr.SetBackgroundColour(wxColour());
attr.SetFlags(attr.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR);
}
}
wxRichTextApplyStyle(attr, GetAttributes()); wxRichTextApplyStyle(attr, GetAttributes());
} }
else else