wxRichTextCtrl::ApplyStyle now applies a paragraph style at the cursor
without needing a selection, and setting the default style now avoids duplicating character attributes in subsequently typed text when they exist in the paragraph style. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@65455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -97,6 +97,9 @@ All (GUI):
|
||||
- wxRTC: can now edit line spacing in .1 increments from 1 to 2.
|
||||
- wxRTC: fixed wrong line spacing and space after paragraph calculations.
|
||||
- wxRTC: GetStyleMergedWithBase now detects loops.
|
||||
- wxRTC: wxRichTextCtrl::ApplyStyle now applies a paragraph style at the cursor
|
||||
without needing a selection, and setting the default style now avoids duplicating
|
||||
character attributes in subsequently typed text when they exist in the paragraph style.
|
||||
|
||||
wxMSW:
|
||||
|
||||
|
@@ -3321,9 +3321,12 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
|
||||
return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags);
|
||||
}
|
||||
|
||||
bool isPara = false;
|
||||
|
||||
// Make sure the attr has the style name
|
||||
if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
|
||||
{
|
||||
isPara = true;
|
||||
attr.SetParagraphStyleName(def->GetName());
|
||||
|
||||
// If applying a paragraph style, we only want the paragraph nodes to adopt these
|
||||
@@ -3339,8 +3342,27 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
|
||||
else
|
||||
{
|
||||
wxRichTextAttr current = GetDefaultStyleEx();
|
||||
current.Apply(attr);
|
||||
wxRichTextAttr defaultStyle(attr);
|
||||
if (isPara)
|
||||
{
|
||||
// Don't apply extra character styles since they are already implied
|
||||
// in the paragraph style
|
||||
defaultStyle.SetFlags(defaultStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER);
|
||||
}
|
||||
current.Apply(defaultStyle);
|
||||
SetAndShowDefaultStyle(current);
|
||||
|
||||
// If it's a paragraph style, we want to apply the style to the
|
||||
// current paragraph even if we didn't select any text.
|
||||
if (isPara)
|
||||
{
|
||||
long pos = GetAdjustedCaretPosition(GetCaretPosition());
|
||||
wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos);
|
||||
if (para)
|
||||
{
|
||||
return SetStyleEx(para->GetRange().FromInternal(), attr, flags);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user