Skip to content

Fix #33520: Allow unhidden instruments in part scores #33563

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
officialasishkumar wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −4
Open

Fix #33520: Allow unhidden instruments in part scores #33563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/parttreeitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ using namespace mu::instrumentsscene;
using namespace mu::notation;
using namespace muse;

static bool isPartItemEnabled(const Part* part, bool partExists)
{
if (!partExists) {
return true;
}

return part->isSharedPart() || !(part->sharedPart() && part->sharedPart()->enabled());
}

PartTreeItem::PartTreeItem(IMasterNotationPtr masterNotation, INotationPtr notation, QObject* parent, LayoutPanelItemType::ItemType type)
: AbstractLayoutPanelTreeItem(type, masterNotation, notation, parent), Contextable(iocCtxForQmlObject(this))
{
Expand All @@ -46,7 +55,7 @@ void PartTreeItem::init(const notation::Part* masterPart)
const Part* part = notation()->parts()->part(masterPart->id());
m_partExists = part != nullptr;
bool visible = m_partExists && part->getProperty(Pid::VISIBLE).toBool();
bool enabled = m_partExists && !(part->sharedPart() && part->sharedPart()->enabled());
bool enabled = isPartItemEnabled(part, m_partExists);

if (!m_partExists) {
part = masterPart;
Expand Down Expand Up @@ -84,9 +93,7 @@ void PartTreeItem::onScoreChanged(const mu::engraving::ScoreChanges&)

m_ignoreVisibilityChange = true;
setIsVisible(m_partExists && m_part->getProperty(Pid::VISIBLE).toBool());
if (!m_part->isSharedPart()) {
setIsEnabled(!(m_part->sharedPart() && m_part->sharedPart()->enabled()));
}
setIsEnabled(isPartItemEnabled(m_part, m_partExists));
m_ignoreVisibilityChange = false;
}

Expand Down
Loading