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

Layout fix for paragraphs after floating objects not centering

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2014-07-13 08:44:22 +00:00
parent 1dec9f059b
commit 6eec9dda58
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/richtext/richtextbuffer.cpp
View File

@@ -1205,6 +1205,20 @@ bool wxRichTextObject::LayoutToBestSize(wxDC& dc, wxRichTextDrawingContext& cont
// on this basis // on this basis
if (!attr.GetTextBoxAttr().GetWidth().IsValid() && maxSize.x < availableChildRect.width) if (!attr.GetTextBoxAttr().GetWidth().IsValid() && maxSize.x < availableChildRect.width)
{ {
if (!attr.HasAlignment() || attr.GetAlignment() == wxTEXT_ALIGNMENT_LEFT)
{
// Redo the layout with a fixed, minimum size this time.
Invalidate(wxRICHTEXT_ALL);
wxRichTextAttr newAttr(attr);
newAttr.GetTextBoxAttr().GetWidth().SetValue(maxSize.x, wxTEXT_ATTR_UNITS_PIXELS);
newAttr.GetTextBoxAttr().GetWidth().SetPosition(wxTEXT_BOX_ATTR_POSITION_ABSOLUTE);
availableChildRect = AdjustAvailableSpace(dc, buffer, parentAttr, newAttr, availableParentSpace, availableContainerSpace);
Layout(dc, context, availableChildRect, availableContainerSpace, style);
}
#if 0
// Redo the layout with a fixed, minimum size this time. // Redo the layout with a fixed, minimum size this time.
Invalidate(wxRICHTEXT_ALL); Invalidate(wxRICHTEXT_ALL);
wxRichTextAttr newAttr(attr); wxRichTextAttr newAttr(attr);
@@ -1231,6 +1245,7 @@ bool wxRichTextObject::LayoutToBestSize(wxDC& dc, wxRichTextDrawingContext& cont
} }
Layout(dc, context, availableChildRect, availableContainerSpace, style); Layout(dc, context, availableChildRect, availableContainerSpace, style);
#endif
} }
/* /*
@@ -7748,8 +7763,6 @@ bool wxRichTextParagraphLayoutBox::InsertTextWithUndo(wxRichTextBuffer* buffer,
length --; length --;
action->GetNewParagraphs().SetPartialParagraph(true); action->GetNewParagraphs().SetPartialParagraph(true);
} }
else if (!text.empty() && text.Last() == wxT('\n'))
length --;
action->SetPosition(pos); action->SetPosition(pos);