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

Merge pull request #12368 from wizofaus/allow-actions-in-edit-mode

Browse source 
Fix #1128 - ensure Format|Style and other supported actions work in edit mode
This commit is contained in:
RomanPudashkin 2022-07-14 15:15:25 +03:00 committed by GitHub
commit 4b42139c37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/notation/internal/notationactioncontroller.h
View file

@ -196,13 +196,13 @@ private:
bool isStandardStaff() const;
bool isTablatureStaff() const;
void registerAction(const mu::actions::ActionCode&, void (NotationActionController::*)(const actions::ActionData& data),
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
bool (NotationActionController::*)() const = &NotationActionController::isNotationPage);
void registerAction(const mu::actions::ActionCode&, void (NotationActionController::*)(),
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
bool (NotationActionController::*)() const = &NotationActionController::isNotationPage);
void registerAction(const mu::actions::ActionCode&, std::function<void()>,
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
bool (NotationActionController::*)() const = &NotationActionController::isNotationPage);
void registerAction(const mu::actions::ActionCode&, std::function<void(const actions::ActionData& data)>,
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
bool (NotationActionController::*)() const = &NotationActionController::isNotationPage);
void registerAction(const mu::actions::ActionCode&, void (NotationActionController::*)(MoveDirection, bool), MoveDirection, bool,
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
@ -221,15 +221,15 @@ private:
void registerAction(const mu::actions::ActionCode&, void (INotationInteraction::*)(), bool (NotationActionController::*)() const);
void registerAction(const mu::actions::ActionCode&, void (INotationInteraction::*)(), PlayMode = PlayMode::NoPlay,
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
bool (NotationActionController::*)() const = &NotationActionController::isNotationPage);
template<typename P1>
void registerAction(const mu::actions::ActionCode&, void (INotationInteraction::*)(P1), P1, PlayMode = PlayMode::NoPlay,
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
bool (NotationActionController::*)() const = &NotationActionController::isNotationPage);
template<typename P1>
void registerAction(const mu::actions::ActionCode&, void (INotationInteraction::*)(P1), P1, bool (NotationActionController::*)() const);
template<typename P1, typename P2>
void registerAction(const mu::actions::ActionCode&, void (INotationInteraction::*)(P1, P2), P1, P2, PlayMode = PlayMode::NoPlay,
bool (NotationActionController::*)() const = &NotationActionController::isNotEditingElement);
bool (NotationActionController::*)() const = &NotationActionController::isNotationPage);
async::Notification m_currentNotationNoteInputChanged;