Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix system text line sync issues #26279

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Fix system text line sync issues #26279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a577b1
Always force property sync for items within the same score
mike-spa Jan 30, 2025
209cafe
Make some line properties force-synced
mike-spa Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/engraving/dom/engravingitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,19 +1473,19 @@ PropertyPropagation EngravingItem::propertyPropagation(const EngravingItem* dest

const Score* sourceScore = score();
const Score* destinationScore = destinationItem->score();
const bool isTextProperty = propertyGroup(propertyId) == PropertyGroup::TEXT;
const Staff* sourceStaff = staff();
const Staff* destinationStaff = destinationItem->staff();

// Properties must be propagated to items cloned for MMRests
if (sourceScore == destinationScore && sourceStaff == destinationStaff) {
if (sourceScore == destinationScore) {
if (sourceStaff != destinationStaff && (propertyId == Pid::VISIBLE || propertyGroup(propertyId) == PropertyGroup::POSITION)) {
// Allow visibility and position to stay independent
return PropertyPropagation::NONE;
}
// Maintain every other property synced
return PropertyPropagation::PROPAGATE;
}

if (propertyGroup(propertyId) != PropertyGroup::TEXT && sourceScore == destinationScore) {
return PropertyPropagation::NONE;
}

const bool isTextProperty = propertyGroup(propertyId) == PropertyGroup::TEXT;
if (isTextProperty) {
if (sourceScore->isMaster() && destinationItem->isPropertyLinkedToMaster(propertyId)) {
// From master score - check if destination part follows master
Expand All @@ -1504,6 +1504,11 @@ PropertyPropagation EngravingItem::propertyPropagation(const EngravingItem* dest
return PropertyPropagation::UNLINK;
}

if (systemFlag() && !isTopSystemObject()) {
// Let only the top system object propagate
return PropertyPropagation::NONE;
}

if (destinationItem->isPropertyLinkedToMaster(propertyId)) {
return PropertyPropagation::PROPAGATE;
}
Expand Down
8 changes: 4 additions & 4 deletions src/engraving/dom/property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::GLISS_EASEOUT, false, "easeOutSpin", P_TYPE::INT, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "ease out") },
{ Pid::DIAGONAL, false, 0, P_TYPE::BOOL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "diagonal") },
{ Pid::GROUP_NODES, false, 0, P_TYPE::GROUPS, PropertyGroup::NONE , DUMMY_QT_TR_NOOP("propertyName", "groups") },
{ Pid::LINE_STYLE, false, "lineStyle", P_TYPE::LINE_TYPE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "line style") },
{ Pid::LINE_STYLE, true, "lineStyle", P_TYPE::LINE_TYPE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "line style") },
{ Pid::LINE_WIDTH, false, "lineWidth", P_TYPE::SPATIUM, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "line width") },
{ Pid::TIME_STRETCH, true, "timeStretch", P_TYPE::REAL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "time stretch") },
{ Pid::ORNAMENT_STYLE, true, "ornamentStyle", P_TYPE::ORNAMENT_STYLE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "ornament style") },
Expand Down Expand Up @@ -247,7 +247,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::SYLLABIC, true, "syllabic", P_TYPE::INT, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "syllabic") },
{ Pid::LYRIC_TICKS, true, "ticks_f", P_TYPE::FRACTION, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "ticks") },
{ Pid::VOLTA_ENDING, true, "endings", P_TYPE::INT_VEC, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "endings") },
{ Pid::LINE_VISIBLE, false, "lineVisible", P_TYPE::BOOL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "visible line") },
{ Pid::LINE_VISIBLE, true, "lineVisible", P_TYPE::BOOL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "visible line") },
{ Pid::MAG, false, "mag", P_TYPE::REAL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "mag") },
{ Pid::USE_DRUMSET, false, "useDrumset", P_TYPE::BOOL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "using drumset") },
{ Pid::DURATION, true, 0, P_TYPE::FRACTION, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "duration") },
Expand Down Expand Up @@ -326,7 +326,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::BEGIN_TEXT, true, "beginText", P_TYPE::STRING, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin text") },
{ Pid::BEGIN_TEXT_ALIGN, false, "beginTextAlign", P_TYPE::ALIGN, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin text align") },
{ Pid::BEGIN_TEXT_PLACE, false, "beginTextPlace", P_TYPE::TEXT_PLACE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin text place") },
{ Pid::BEGIN_HOOK_TYPE, false, "beginHookType", P_TYPE::HOOK_TYPE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin hook type") },
{ Pid::BEGIN_HOOK_TYPE, true, "beginHookType", P_TYPE::HOOK_TYPE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin hook type") },
{ Pid::BEGIN_HOOK_HEIGHT, false, "beginHookHeight", P_TYPE::SPATIUM, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin hook height") },
{ Pid::BEGIN_FONT_FACE, false, "beginFontFace", P_TYPE::STRING, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin font face") },
{ Pid::BEGIN_FONT_SIZE, false, "beginFontSize", P_TYPE::REAL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "begin font size") },
Expand All @@ -345,7 +345,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::END_TEXT, true, "endText", P_TYPE::STRING, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end text") },
{ Pid::END_TEXT_ALIGN, false, "endTextAlign", P_TYPE::ALIGN, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end text align") },
{ Pid::END_TEXT_PLACE, false, "endTextPlace", P_TYPE::TEXT_PLACE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end text place") },
{ Pid::END_HOOK_TYPE, false, "endHookType", P_TYPE::HOOK_TYPE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end hook type") },
{ Pid::END_HOOK_TYPE, true, "endHookType", P_TYPE::HOOK_TYPE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end hook type") },
{ Pid::END_HOOK_HEIGHT, false, "endHookHeight", P_TYPE::SPATIUM, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end hook height") },
{ Pid::END_FONT_FACE, false, "endFontFace", P_TYPE::STRING, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end font face") },
{ Pid::END_FONT_SIZE, false, "endFontSize", P_TYPE::REAL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "end font size") },
Expand Down