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

fix #280830 exit edit mode if double-click palette

Browse source 
Previously, if user was in edit mode (by double-clicking an element in score), then applying palette elements by double-clicking would be problematic.  This would be because Palette::applyPaletteElement() doesn't perform score->startCmd() before applying the element nor a score->endCmd() after applying the element, because it assumes that the score is already in a startCmd.

Exiting edit mode fixes #280830 which was a crash when applying a time signature from palette while in editmode.  And fixes another glitch where applying system text from palette while in edit mode.

Turns out that ScoreView::editMode() encompasses more than just plane element edit, so I'm also making sure not inside states for LYRICS_EDIT, HARMONY_FIGBASS_EDIT, and TEXT_EDIT, where it might make sense for user to apply a symbol from a palette by doubleclicking.
This commit is contained in:
Eric Fontaine 2018-12-30 21:45:13 -05:00
parent cf1f5ceb13
commit 7f9f1df8eb
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mscore/palette.cpp
View file

@ -764,6 +764,11 @@ void Palette::mouseDoubleClickEvent(QMouseEvent* ev)
if (score->selection().isNone())
return;
// exit edit mode, to allow for palette element to be applied properly
ScoreView* viewer = mscore->currentScoreView();
if (viewer && viewer->editMode() && !(viewer->mscoreState() & STATE_ALLTEXTUAL_EDIT))
viewer->changeState(ViewState::NORMAL);
applyPaletteElement(cellAt(i), ev->modifiers());
}