LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9932 from RomanPudashkin/text_style_fix

Browse source 
[MU4] Fix #9837: Settings in Styles dialog override changes to individual text objects
This commit is contained in:
RomanPudashkin 2021-12-09 08:46:20 +02:00 committed by GitHub
commit fe5e8cc6c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engraving/libmscore/textbase.cpp
View file

@ -3665,7 +3665,7 @@ void TextBase::undoChangeProperty(Pid id, const PropertyValue& v, PropertyFlags
}
if (id == Pid::FONT_STYLE || id == Pid::FONT_FACE || id == Pid::FONT_SIZE || id == Pid::TEXT_SCRIPT_ALIGN) {
// can't use standard change property as Undo might set to "undefined"
score()->undo(new ChangeTextProperties(_cursor, id, v));
score()->undo(new ChangeTextProperties(_cursor, id, v, ps));
} else {
EngravingItem::undoChangeProperty(id, v, ps);
}

5
src/engraving/libmscore/textedit.cpp
View file

@ -845,11 +845,12 @@ void ChangeTextProperties::restoreSelection()
tc.text()->cursor()->setColumn(tc.column());
}
ChangeTextProperties::ChangeTextProperties(const TextCursor* tc, Ms::Pid propId, const PropertyValue& propVal)
ChangeTextProperties::ChangeTextProperties(const TextCursor* tc, Ms::Pid propId, const PropertyValue& propVal, PropertyFlags flags_)
: TextEditUndoCommand(*tc)
{
propertyId = propId;
propertyVal = propVal;
flags = flags_;
if (propertyId == Pid::FONT_STYLE) {
existingStyle = static_cast<FontStyle>(cursor().text()->getProperty(propId).toInt());
}
@ -867,6 +868,8 @@ void ChangeTextProperties::redo(EditData*)
{
xmlText = cursor().text()->xmlText();
restoreSelection();
cursor().text()->setPropertyFlags(propertyId, flags);
if (propertyId == Pid::FONT_STYLE) {
FontStyle setStyle = static_cast<FontStyle>(propertyVal.toInt());
TextCursor* tc = cursor().text()->cursor();

3
src/engraving/libmscore/textedit.h
View file

@ -82,11 +82,12 @@ class ChangeTextProperties : public TextEditUndoCommand
Pid propertyId;
mu::engraving::PropertyValue propertyVal;
FontStyle existingStyle;
PropertyFlags flags;
void restoreSelection();
public:
ChangeTextProperties(const TextCursor* tc, Ms::Pid propId, const mu::engraving::PropertyValue& propVal);
ChangeTextProperties(const TextCursor* tc, Ms::Pid propId, const mu::engraving::PropertyValue& propVal, PropertyFlags flags);
void undo(EditData*) override;
void redo(EditData*) override;
};