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

Corrected multiple cell property editing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-31 09:57:06 +00:00
parent 4618ed5f0b
commit 108f2cc7a7
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/richtext/richtextbuffer.cpp
View File

@@ -9565,19 +9565,23 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
if (ok) if (ok)
{ {
if (multipleCells) wxRichTextAttr newAttr = cellDlg.GetAttributes();
if (!(newAttr == attr))
{ {
const wxRichTextSelection& sel = buffer->GetRichTextCtrl()->GetSelection(); if (multipleCells)
// Apply the style; we interpret indeterminate attributes as 'don't touch this attribute' {
// since it may represent clashing attributes across multiple objects. const wxRichTextSelection& sel = buffer->GetRichTextCtrl()->GetSelection();
table->SetCellStyle(sel, attr); // Apply the style; we interpret indeterminate attributes as 'don't touch this attribute'
// since it may represent clashing attributes across multiple objects.
table->SetCellStyle(sel, attr);
}
else
// For a single object, indeterminate attributes set by the user should be reflected in the
// actual object style, so pass the wxRICHTEXT_SETSTYLE_RESET flag to assign
// the style directly instead of applying (which ignores indeterminate attributes,
// leaving them as they were).
cellDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
} }
else
// For a single object, indeterminate attributes set by the user should be reflected in the
// actual object style, so pass the wxRICHTEXT_SETSTYLE_RESET flag to assign
// the style directly instead of applying (which ignores indeterminate attributes,
// leaving them as they were).
cellDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
return true; return true;
} }
else else