From 52b18ceafe25c68329cfc3a6220f21107cd8e77e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 30 Aug 2010 08:47:14 +0000 Subject: [PATCH] Don't add space before para twice in paragraph layout Discard attributes from empty text object when merging git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@65441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 55478d5b13..edda6fc5bc 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -4130,7 +4130,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) ApplyParagraphStyle(attr, rect); g_globalDC = NULL; - SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara)); + SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceAfterPara)); m_dirty = false; @@ -5701,8 +5701,13 @@ bool wxRichTextPlainText::Merge(wxRichTextObject* object) if (textObject) { + bool isEmpty = m_text.IsEmpty(); m_text += textObject->GetText(); - wxRichTextApplyStyle(m_attributes, textObject->GetAttributes()); + // Don't keep an empty object's attributes + if (isEmpty) + m_attributes = textObject->GetAttributes(); + else + wxRichTextApplyStyle(m_attributes, textObject->GetAttributes()); return true; } else