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

Fixes for list style dialog and bullet drawing when no left subindent is specified

Browse Source
This commit is contained in:
JulianSmart
2015-11-14 18:37:12 +00:00
parent f48374a949
commit f2bc1f5e1d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/richtext/richtextbuffer.cpp
View File

@@ -5018,7 +5018,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co
} }
// Make space for a bullet with no subindent. // 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; wxSize bulletSize;
if (wxRichTextBuffer::GetRenderer() && wxRichTextBuffer::GetRenderer()->MeasureBullet(this, dc, attr, bulletSize)) if (wxRichTextBuffer::GetRenderer() && wxRichTextBuffer::GetRenderer()->MeasureBullet(this, dc, attr, bulletSize))

5
src/richtext/richtextliststylepage.cpp
View File

@@ -693,7 +693,10 @@ bool wxRichTextListStylePage::TransferDataFromWindow()
// if (m_hasBulletSymbol) // 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()); attr->SetBulletFont(m_symbolFontCtrl->GetValue());
} }