Skip to content

Add page locks to palette #34243

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
miiizen wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add page locks to palette #34243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8974b92
Add page lock icon to the layout palette
miiizen Jul 17, 2026
993e284
Update framework
miiizen Jul 17, 2026
1cb7271
Move nobreak out of "More"
miiizen Jul 17, 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
2 changes: 1 addition & 1 deletion muse
Open in desktop
Submodule muse updated 14 files
+1 −1 framework/audioplugins/internal/registeraudiopluginsscenario.cpp
+1 −1 framework/audioplugins/tests/registeraudiopluginsscenariotest.cpp
+4 −0 framework/dockwindow_v2/CMakeLists.txt
+7 −1 framework/dockwindow_v2/internal/dockbase.cpp
+1 −0 framework/dockwindow_v2/internal/dockbase.h
+2 −0 framework/dockwindow_v2/qml/Muse/Dock/CMakeLists.txt
+1 −1 framework/dockwindow_v2/qml/Muse/Dock/dockframemodel.cpp
+12 −273 framework/dockwindow_v2/qml/Muse/Dock/dockwindow.cpp
+5 −14 framework/dockwindow_v2/qml/Muse/Dock/dockwindow.h
+290 −0 framework/dockwindow_v2/qml/Muse/Dock/topleveltoolbarslayout.cpp
+64 −0 framework/dockwindow_v2/qml/Muse/Dock/topleveltoolbarslayout.h
+40 −0 framework/dockwindow_v2/tests/CMakeLists.txt
+530 −0 framework/dockwindow_v2/tests/topleveltoolbarslayout_tests.cpp
+2 −0 framework/ui/view/iconcodes.h
1 change: 1 addition & 0 deletions src/engraving/dom/actionicon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ enum class ActionIconType : signed char {
NOTE_ANCHORED_LINE,

SYSTEM_LOCK,
PAGE_LOCK
};

//! Dummy element, used for drag&drop
Expand Down
46 changes: 37 additions & 9 deletions src/engraving/dom/measure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "../editing/editmeasurerepeat.h"
#include "../editing/editstaff.h"
#include "../editing/editsystemlocks.h"
#include "../editing/editpagelocks.h"
#include "../editing/edittimesig.h"
#include "../editing/inserttime.h"
#include "../editing/mscoreview.h"
Expand Down Expand Up @@ -1407,7 +1408,7 @@ bool Measure::acceptDrop(EditData& data) const
case ElementType::LAYOUT_BREAK:
// Always drop to all staves
if (viewer) {
viewer->setDropRectangle(canvasBoundingRect());
viewer->setDropRectangles({ canvasBoundingRect() });
}
return true;

Expand All @@ -1418,9 +1419,9 @@ bool Measure::acceptDrop(EditData& data) const
// Drop to all staves or single staff depending on modifier
if (viewer) {
if (data.modifiers & ControlModifier) {
viewer->setDropRectangle(staffRect);
viewer->setDropRectangles({ staffRect });
} else {
viewer->setDropRectangle(canvasBoundingRect());
viewer->setDropRectangles({ canvasBoundingRect() });
}
}
return true;
Expand All @@ -1436,14 +1437,14 @@ bool Measure::acceptDrop(EditData& data) const
case ElementType::STAFFTYPE_CHANGE:
// Always drop to single staff
if (viewer) {
viewer->setDropRectangle(staffRect);
viewer->setDropRectangles({ staffRect });
}
return true;

case ElementType::STRING_TUNINGS: {
const bool canAdd = canAddStringTunings(staffIdx);
if (viewer && canAdd) {
viewer->setDropRectangle(staffRect);
viewer->setDropRectangles({ staffRect });
}
return canAdd;
}
Expand All @@ -1462,7 +1463,7 @@ bool Measure::acceptDrop(EditData& data) const
}
}
if (viewer) {
viewer->setDropRectangle(canvasBoundingRect());
viewer->setDropRectangles({ canvasBoundingRect() });
}
return true;
}
Expand All @@ -1471,15 +1472,40 @@ bool Measure::acceptDrop(EditData& data) const
return false;
}
if (viewer) {
viewer->setDropRectangle(staffRect);
viewer->setDropRectangles({ staffRect });
}
return true;
case ActionIconType::SYSTEM_LOCK:
{
LayoutMode layoutMode = score()->layoutMode();
if (layoutMode == LayoutMode::PAGE || layoutMode == LayoutMode::SYSTEM) {
if (viewer) {
viewer->setDropRectangle(canvasBoundingRect().adjusted(-x(), 0.0, 0.0, 0.0));
viewer->setDropRectangles({ canvasBoundingRect().adjusted(-x(), 0.0, 0.0, 0.0) });
}
return true;
}
return false;
}
case ActionIconType::PAGE_LOCK:
{
LayoutMode layoutMode = score()->layoutMode();
if (layoutMode == LayoutMode::PAGE) {
if (viewer) {
std::vector<RectF> dropRects;
for (System* sys : page()->systems()) {
if (sys == system()) {
break;
}
MeasureBase* first = sys ? sys->first() : nullptr;
MeasureBase* last = sys ? sys->last() : nullptr;
if (!first || !last) {
continue;
}
dropRects.push_back(RectF(sys->first()->canvasBoundingRect().topLeft(),
sys->last()->canvasBoundingRect().bottomRight()));
}
dropRects.push_back(canvasBoundingRect().adjusted(-x(), 0.0, 0.0, 0.0));
viewer->setDropRectangles(dropRects);
}
return true;
}
Expand Down Expand Up @@ -1512,7 +1538,6 @@ EngravingItem* Measure::drop(Transaction& tx, EditData& data)
return nullptr;
}
Staff* staff = score()->staff(staffIdx);
//bool fromPalette = (e->track() == -1);

switch (e->type()) {
case ElementType::MARKER:
Expand Down Expand Up @@ -1806,6 +1831,9 @@ EngravingItem* Measure::drop(Transaction& tx, EditData& data)
case ActionIconType::SYSTEM_LOCK:
EditSystemLocks::makeIntoSystem(tx, score(), system()->first(), this);
break;
case ActionIconType::PAGE_LOCK:
EditPageLocks::makeIntoPage(tx, score(), page()->firstMeasureBase(), this);
break;
default:
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/editing/edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,7 +1582,7 @@ void Score::deleteItem(EngravingItem* el)
case ElementType::PAGE_LOCK_INDICATOR:
{
const RangeLock* pageLock = toPageLockIndicator(el)->pageLock();
EditPageLocks::undoRemovePageLock(tx, this, pageLock);
EditPageLocks::undoRemovePageLock(tx, pageLock);
}
break;

Expand Down
74 changes: 37 additions & 37 deletions src/engraving/editing/editpagelocks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ class RemovePageLock : public UndoableCommand
// EditPageLocks
//---------------------------------------------------------

void EditPageLocks::undoAddPageLock(Transaction& tx, Score* score, const RangeLock* lock)
void EditPageLocks::undoAddPageLock(Transaction& tx, const RangeLock* lock)
{
removeLayoutBreaksOnAddPageLock(tx, lock);
score->undo(new AddPageLock(lock));
tx.push(new AddPageLock(lock));
}

void EditPageLocks::undoRemovePageLock(Transaction& tx, Score* score, const RangeLock* lock)
void EditPageLocks::undoRemovePageLock(Transaction& tx, const RangeLock* lock)
{
tx.push(new RemovePageLock(lock));
}
Expand All @@ -135,7 +135,7 @@ void EditPageLocks::undoRemoveAllLocks(Transaction& tx, Score* score)
{
std::vector<const RangeLock*> allLocks = score->pageLocks()->allLocks(); // copy
for (const RangeLock* lock : allLocks) {
undoRemovePageLock(tx, score, lock);
undoRemovePageLock(tx, lock);
}
}

Expand All @@ -153,11 +153,11 @@ void EditPageLocks::togglePageLock(Transaction& tx, Score* score, const std::vec
MeasureBase* startMeas = page->firstMeasureBase();
const RangeLock* currentLock = score->pageLocks()->lockStartingAt(startMeas);
if (currentLock && unlockAll) {
undoRemovePageLock(tx, score, currentLock);
undoRemovePageLock(tx, currentLock);
continue;
} else if (!currentLock && !unlockAll) {
RangeLock* newPageLock = new RangeLock(startMeas, page->lastMeasureBase());
undoAddPageLock(tx, score, newPageLock);
undoAddPageLock(tx, newPageLock);
}
}
}
Expand All @@ -176,11 +176,11 @@ void EditPageLocks::toggleScoreLock(Transaction& tx, Score* score)
MeasureBase* startMeas = page->firstMeasureBase();
const RangeLock* currentLock = score->pageLocks()->lockStartingAt(startMeas);
if (currentLock && unlockAll) {
undoRemovePageLock(tx, score, currentLock);
undoRemovePageLock(tx, currentLock);
continue;
} else if (!currentLock && !unlockAll) {
RangeLock* newPageLock = new RangeLock(startMeas, page->lastMeasureBase());
undoAddPageLock(tx, score, newPageLock);
undoAddPageLock(tx, newPageLock);
}
}
}
Expand All @@ -207,15 +207,15 @@ void EditPageLocks::addRemovePageLocks(Transaction& tx, Score* score, int interv
break;
}
if (!page->isLocked()) {
undoAddPageLock(tx, score, new RangeLock(page->firstMeasureBase(), page->lastMeasureBase()));
undoAddPageLock(tx, new RangeLock(page->firstMeasureBase(), page->lastMeasureBase()));
}
}
return;
}

std::vector<const RangeLock*> currentLocks = score->pageLocks()->locksContainedInRange(startMeasure, endMeasure);
for (const RangeLock* l : currentLocks) {
undoRemovePageLock(tx, score, l);
undoRemovePageLock(tx, l);
}

if (interval == 0) {
Expand All @@ -230,7 +230,7 @@ void EditPageLocks::addRemovePageLocks(Transaction& tx, Score* score, int interv
}
count++;
if (count == interval || mb == endMeasure) {
undoAddPageLock(tx, score, new RangeLock(lockStart, mb));
undoAddPageLock(tx, new RangeLock(lockStart, mb));
lockStart = nullptr;
count = 0;
}
Expand All @@ -246,34 +246,34 @@ void EditPageLocks::makeIntoPage(Transaction& tx, Score* score, MeasureBase* fir
const RangeLock* lockContainingLast = score->pageLocks()->lockContaining(last);

if (lockContainingFirst) {
undoRemovePageLock(tx, score, lockContainingFirst);
undoRemovePageLock(tx, lockContainingFirst);
if (lockContainingFirst->startMB()->isBefore(first)) {
MeasureBase* oneBeforeFirst = first->prevMM();
RangeLock* newLockBefore = new RangeLock(lockContainingFirst->startMB(), oneBeforeFirst);
undoAddPageLock(tx, score, newLockBefore);
undoAddPageLock(tx, newLockBefore);
}
}

if (lockContainingLast) {
if (lockContainingLast != lockContainingFirst) {
undoRemovePageLock(tx, score, lockContainingLast);
undoRemovePageLock(tx, lockContainingLast);
}
if (last->isBefore(lockContainingLast->endMB())) {
MeasureBase* oneAfterLast = last->nextMM();
RangeLock* newLockAfter = new RangeLock(oneAfterLast, lockContainingLast->endMB());
undoAddPageLock(tx, score, newLockAfter);
undoAddPageLock(tx, newLockAfter);
}
}

std::vector<const RangeLock*> locksContainedInRange = score->pageLocks()->locksContainedInRange(first, last);
for (const RangeLock* lock : locksContainedInRange) {
if (lock != lockContainingFirst && lock != lockContainingLast) {
undoRemovePageLock(tx, score, lock);
undoRemovePageLock(tx, lock);
}
}

RangeLock* newLock = new RangeLock(first, last);
undoAddPageLock(tx, score, newLock);
undoAddPageLock(tx, newLock);
}

void EditPageLocks::moveMeasuresToPrevPage(Transaction& tx, Score* score, MeasureBase* first, MeasureBase* last)
Expand Down Expand Up @@ -302,22 +302,22 @@ void EditPageLocks::moveMeasuresToPrevPage(Transaction& tx, Score* score, Measur

const RangeLock* prevPageLock = score->pageLocks()->lockStartingAt(prevPageFirstMeas);
if (prevPageLock) {
undoRemovePageLock(tx, score, prevPageLock);
undoRemovePageLock(tx, prevPageLock);
}

const Page* curPage = last->page();
const RangeLock* curPageLock = score->pageLocks()->lockStartingAt(curPage->firstMeasureBase());
if (curPageLock) {
undoRemovePageLock(tx, score, curPageLock);
undoRemovePageLock(tx, curPageLock);
if (curPageLock->endMB() != last) {
MeasureBase* nextMB = last->nextMM();
RangeLock* newLockOnCurPage = new RangeLock(nextMB, curPageLock->endMB());
undoAddPageLock(tx, score, newLockOnCurPage);
undoAddPageLock(tx, newLockOnCurPage);
}
}

RangeLock* pageLock = new RangeLock(prevPageFirstMeas, last);
undoAddPageLock(tx, score, pageLock);
undoAddPageLock(tx, pageLock);
}

void EditPageLocks::moveMeasuresToNextPage(Transaction& tx, Score* score, MeasureBase* first, MeasureBase* last)
Expand Down Expand Up @@ -349,7 +349,7 @@ void EditPageLocks::moveMeasuresToNextPage(Transaction& tx, Score* score, Measur

const RangeLock* curLock = score->pageLocks()->lockStartingAt(startMeas);
if (curLock) {
undoRemovePageLock(tx, score, curLock);
undoRemovePageLock(tx, curLock);
}

if (!refMeasureIsStartOfPage) {
Expand All @@ -358,18 +358,18 @@ void EditPageLocks::moveMeasuresToNextPage(Transaction& tx, Score* score, Measur
prevMeas->undoSetBreak(true, LayoutBreakType::PAGE);
} else {
RangeLock* pageLock = new RangeLock(startMeas, prevMeas);
undoAddPageLock(tx, score, pageLock);
undoAddPageLock(tx, pageLock);
}
}

const RangeLock* nextPageLock = score->pageLocks()->lockStartingAt(nextPage->firstMeasureBase());
if (nextPageLock) {
undoRemovePageLock(tx, score, nextPageLock);
undoRemovePageLock(tx, nextPageLock);
}

if (nextPageLock || refMeasureIsStartOfPage) {
RangeLock* newNextPageLock = new RangeLock(first, nextPage->lastMeasureBase());
undoAddPageLock(tx, score, newNextPageLock);
undoAddPageLock(tx, newNextPageLock);
}
}

Expand Down Expand Up @@ -408,7 +408,7 @@ void EditPageLocks::applyLockToSelection(Transaction& tx, Score* score)

const RangeLock* lockOnLast = score->pageLocks()->lockContaining(last);
if (lockOnLast && lockOnLast->endMB() == last) {
undoRemovePageLock(tx, score, lockOnLast);
undoRemovePageLock(tx, lockOnLast);
} else if (first != last) {
makeIntoPage(tx, score, first, last);
} else {
Expand All @@ -425,11 +425,11 @@ void EditPageLocks::removePageLocksOnAddLayoutBreak(Transaction& tx, Score* scor
const RangeLock* lock = score->pageLocks()->lockContaining(measure);
MeasureBase* lockEndMeasure = lock ? lock->endMB() : nullptr;
if (lock && breakType == LayoutBreakType::PAGE) {
undoRemovePageLock(tx, score, lock);
undoRemovePageLock(tx, lock);

if (measure != lockEndMeasure && measure->next()) {
// Make sure the resultant page is locked
undoAddPageLock(tx, score, new RangeLock(measure->next(), lockEndMeasure));
undoAddPageLock(tx, new RangeLock(measure->next(), lockEndMeasure));
}
}
}
Expand All @@ -450,17 +450,17 @@ void EditPageLocks::removePageLocksOnRemoveMeasures(Transaction& tx, Score* scor
bool lockStartIsInRange = lockStart->isAfterOrEqual(m1) && lockStart->isBeforeOrEqual(m2);
bool lockEndIsInRange = lockEnd->isAfterOrEqual(m1) && lockEnd->isBeforeOrEqual(m2);
if (lockStartIsInRange || lockEndIsInRange) {
undoRemovePageLock(tx, score, lock);
undoRemovePageLock(tx, lock);
}
if (lockStartIsInRange && !lockEndIsInRange) {
MeasureBase* newLockStart = m2->nextMeasure();
if (newLockStart) {
undoAddPageLock(tx, score, new RangeLock(newLockStart, lockEnd));
undoAddPageLock(tx, new RangeLock(newLockStart, lockEnd));
}
} else if (!lockStartIsInRange && lockEndIsInRange) {
MeasureBase* newLockEnd = m1->prevMeasure();
if (newLockEnd) {
undoAddPageLock(tx, score, new RangeLock(lockStart, newLockEnd));
undoAddPageLock(tx, new RangeLock(lockStart, newLockEnd));
}
}
}
Expand All @@ -472,7 +472,7 @@ void EditPageLocks::removePageLocksContainingMMRests(Transaction& tx, Score* sco
for (const RangeLock* lock : allLocks) {
for (MeasureBase* mb = lock->startMB(); mb; mb = mb->next()) {
if (mb->isMeasure() && toMeasure(mb)->mmRest()) {
undoRemovePageLock(tx, score, lock);
undoRemovePageLock(tx, lock);
break;
}
if (mb->isAfter(lock->endMB())) {
Expand All @@ -488,7 +488,7 @@ void EditPageLocks::updatePageLocksOnCreateMMRests(Transaction& tx, Score* score

for (const RangeLock* lock : score->pageLocks()->locksContainedInRange(first, last)) {
// These locks are inside the range of the mmRest so remove them
undoRemovePageLock(tx, score, lock);
undoRemovePageLock(tx, lock);
}

const RangeLock* lockOnFirst = score->pageLocks()->lockContaining(first);
Expand All @@ -509,8 +509,8 @@ void EditPageLocks::updatePageLocksOnCreateMMRests(Transaction& tx, Score* score
}

if (startMB != lockOnFirst->startMB() || endMB != lockOnFirst->endMB()) {
undoRemovePageLock(tx, score, lockOnFirst);
undoAddPageLock(tx, score, new RangeLock(startMB, endMB));
undoRemovePageLock(tx, lockOnFirst);
undoAddPageLock(tx, new RangeLock(startMB, endMB));
}
}

Expand All @@ -522,7 +522,7 @@ void EditPageLocks::updatePageLocksOnCreateMMRests(Transaction& tx, Score* score
MeasureBase* endMB = lockOnLast->endMB();
assert(startMB->isAfter(first) && endMB->isAfter(last));

undoRemovePageLock(tx, score, lockOnLast);
undoRemovePageLock(tx, lockOnLast);
startMB = last->nextMM();
undoAddPageLock(tx, score, new RangeLock(startMB, endMB));
undoAddPageLock(tx, new RangeLock(startMB, endMB));
}
Loading
Loading