From f2bc1f5e1d4019bb59b73b0703aa2576d2f70307 Mon Sep 17 00:00:00 2001 From: JulianSmart Date: Sat, 14 Nov 2015 18:37:12 +0000 Subject: [PATCH] Fixes for list style dialog and bullet drawing when no left subindent is specified --- src/richtext/richtextbuffer.cpp | 2 +- src/richtext/richtextliststylepage.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 5438fd3a23..c78138ee1f 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -5018,7 +5018,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co } // Make space for a bullet with no subindent. - if ((leftIndent == 0) && (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)) + if ((leftSubIndent == 0) && (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)) { wxSize bulletSize; if (wxRichTextBuffer::GetRenderer() && wxRichTextBuffer::GetRenderer()->MeasureBullet(this, dc, attr, bulletSize)) diff --git a/src/richtext/richtextliststylepage.cpp b/src/richtext/richtextliststylepage.cpp index f7908d949d..4296f566bb 100644 --- a/src/richtext/richtextliststylepage.cpp +++ b/src/richtext/richtextliststylepage.cpp @@ -693,7 +693,10 @@ bool wxRichTextListStylePage::TransferDataFromWindow() // if (m_hasBulletSymbol) { - attr->SetBulletText(m_symbolCtrl->GetValue()); + if (!m_symbolCtrl->GetValue().IsEmpty()) + attr->SetBulletText(m_symbolCtrl->GetValue()); + else + attr->SetFlags(attr->GetFlags() & ~wxTEXT_ATTR_BULLET_TEXT); attr->SetBulletFont(m_symbolFontCtrl->GetValue()); }