Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-24 15:45:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Increment numbered bullet continuation in wxRichTextCtrl

Browse Source 
Let the control continue numbered bullet styles that are not backed by a
named list style when creating the next paragraph. Preserve named list
style validation and keep explicit bullet numbers unchanged.

Fixes #10074.

Closes #27030.
This commit is contained in:
Richard
2026-09-20 18:19:19 +02:00
committed by Vadim Zeitlin
parent 6dc581f175
commit 3eee147111
2 changed files with 64 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/richtext/richtextbuffer.cpp
+54 -42
View File
@@ -4717,53 +4717,65 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
if (!previousParagraph || !previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
return false;
const wxRichTextAttr& previousAttr = previousParagraph->GetAttributes();
const int numberedStyles =
wxTEXT_ATTR_BULLET_STYLE_ARABIC |
wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER |
wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER |
wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER |
wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER |
wxTEXT_ATTR_BULLET_STYLE_OUTLINE;
wxRichTextBuffer* buffer = GetBuffer();
wxRichTextStyleSheet* styleSheet = buffer->GetStyleSheet();
if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
bool hasListStyle = !previousAttr.GetListStyleName().IsEmpty();
if ( !(previousAttr.GetBulletStyle() & numberedStyles) ||
(!hasListStyle && !previousAttr.HasBulletNumber()) )
return false;
if ( hasListStyle )
{
wxRichTextListStyleDefinition* def = styleSheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName());
if (def)
{
// int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
// int thisLevel = def->FindLevelForIndent(thisIndent);
bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0;
attr.SetFlags(previousParagraph->GetAttributes().GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME));
if (previousParagraph->GetAttributes().HasBulletName())
attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName());
attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle());
attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName());
int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1;
attr.SetBulletNumber(nextNumber);
if (isOutline)
{
wxString text = previousParagraph->GetAttributes().GetBulletText();
if (!text.IsEmpty())
{
int pos = text.Find(wxT('.'), true);
if (pos != wxNOT_FOUND)
{
text = text.Mid(0, text.length() - pos - 1);
}
else
text.clear();
if (!text.IsEmpty())
text += wxT(".");
text += wxString::Format(wxT("%d"), nextNumber);
attr.SetBulletText(text);
}
}
return true;
}
else
if ( !styleSheet ||
!styleSheet->FindListStyle(previousAttr.GetListStyleName()) )
return false;
}
else
return false;
bool isOutline =
(previousAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0;
attr.SetFlags(previousAttr.GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME));
if ( previousAttr.HasBulletName() )
attr.SetBulletName(previousAttr.GetBulletName());
attr.SetBulletStyle(previousAttr.GetBulletStyle());
if ( previousAttr.HasListStyleName() )
attr.SetListStyleName(previousAttr.GetListStyleName());
int nextNumber = previousAttr.HasBulletNumber()
? previousAttr.GetBulletNumber() + 1
: 1;
attr.SetBulletNumber(nextNumber);
if ( isOutline )
{
wxString text = previousAttr.GetBulletText();
if ( !text.IsEmpty() )
{
int pos = text.Find(wxT('.'), true);
if ( pos != wxNOT_FOUND )
{
text = text.Mid(0, text.length() - pos - 1);
}
else
text.clear();
if ( !text.IsEmpty() )
text += wxT(".");
text += wxString::Format(wxT("%d"), nextNumber);
attr.SetBulletText(text);
}
}
return true;
}
/*!
tests/controls/richtextctrltest.cpp
+10
View File
@@ -678,6 +678,16 @@ TEST_CASE_METHOD(RichTextCtrlTestCase, "RichTextCtrl::NumberedBullet",
CHECK(bullet.GetLeftIndent() == 15);
CHECK(bullet.GetLeftSubIndent() == 20);
wxRichTextParagraph *firstPara =
m_rich->GetFocusObject()->GetParagraphAtPosition(5);
wxRichTextAttr nextBullet;
REQUIRE(m_rich->GetFocusObject()->FindNextParagraphNumber(firstPara,
nextBullet));
CHECK(nextBullet.HasBulletStyle());
CHECK(nextBullet.HasBulletNumber());
CHECK(nextBullet.GetBulletNumber() == 2);
m_rich->GetStyle(15, bullet);
CHECK(bullet.HasBulletStyle());