Skip to content

Fix chord symbols alignment when multiple staves have chord symbols #32811

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

Open
cbjeukendrup wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −6
Open

Fix chord symbols alignment when multiple staves have chord symbols #32811

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
2b4210a
Fix chord symbols alignment when multiple staves have chord symbols
cbjeukendrup Mar 26, 2026
5baef5b
Add vtest
miiizen Mar 30, 2026
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
12 changes: 6 additions & 6 deletions src/engraving/rendering/score/systemlayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,12 +1067,12 @@ void SystemLayout::layoutHarmonies(const std::vector<Harmony*> harmonies, System
}

// Only vertically align one chord symbol per tick & staff
std::map<Fraction, staff_idx_t> harmonyPositions;
std::set<std::pair<Fraction, staff_idx_t> > harmonyPositions;
std::vector<EngravingItem*> harmonyItemsAlign;
std::vector<EngravingItem*> harmonyItemsNoAlign;

for (Harmony* h : harmonies) {
if (muse::contains(harmonyPositions, h->tick())) {
if (muse::contains(harmonyPositions, { h->tick(), h->staffIdx() })) {
harmonyItemsNoAlign.push_back(h);
continue;
}
Expand Down Expand Up @@ -1114,13 +1114,13 @@ void SystemLayout::layoutFretDiagrams(const ElementsToLayout& elements, System*
}

// Only vertically align one fd per tick & staff
std::map<Fraction, staff_idx_t> fretHarmonyPositions;
std::set<std::pair<Fraction, staff_idx_t> > fretHarmonyPositions;
std::vector<EngravingItem*> fretItemsAlign;
std::vector<EngravingItem*> fretOrHarmonyItemsNoAlign;
std::vector<Harmony*> harmonyItemsAlign(elements.harmonies.begin(), elements.harmonies.end());

for (FretDiagram* fd : elements.fretDiagrams) {
if (muse::contains(fretHarmonyPositions, fd->tick())) {
if (muse::contains(fretHarmonyPositions, { fd->tick(), fd->staffIdx() })) {
fretOrHarmonyItemsNoAlign.push_back(fd);
if (fd->harmony()) {
harmonyItemsAlign.erase(std::remove(harmonyItemsAlign.begin(), harmonyItemsAlign.end(), fd->harmony()));
Expand All @@ -1140,7 +1140,7 @@ void SystemLayout::layoutFretDiagrams(const ElementsToLayout& elements, System*
if (h->getParentFretDiagram()) {
continue;
}
if (muse::contains(fretHarmonyPositions, h->tick())) {
if (muse::contains(fretHarmonyPositions, { h->tick(), h->staffIdx() })) {
harmonyItemsAlign.erase(std::remove(harmonyItemsAlign.begin(), harmonyItemsAlign.end(), h));
fretOrHarmonyItemsNoAlign.push_back(h);
continue;
Expand All @@ -1161,7 +1161,7 @@ void SystemLayout::layoutFretDiagrams(const ElementsToLayout& elements, System*
Autoplace::autoplaceSegmentElement(item, item->mutldata());
Harmony* harmony = toFretDiagram(item)->harmony();
if (harmony) {
autoplaceHarmony(item);
autoplaceHarmony(harmony);
}
} else if (item->isHarmony()) {
autoplaceHarmony(item);
Expand Down
Binary file added vtest/scores/harmony-align-2.mscz
View file
Open in desktop
Binary file not shown.
Loading