fix #37346: pan button ineffective in pianoroll

musescore · Jul 9, 2015 · 30cfd6b · 30cfd6b
1 parent c728d38
commit 30cfd6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/mscore/pianoroll.cpp b/mscore/pianoroll.cpp
@@ -64,7 +64,9 @@ PianorollEditor::PianorollEditor(QWidget* parent)
       tb->addAction(getAction("loop"));
       tb->addSeparator();
       tb->addAction(getAction("repeat"));
-      tb->addAction(getAction("follow"));
+      QAction* followAction = getAction("follow");
+      followAction->setChecked(preferences.followSong);
+      tb->addAction(followAction);
       tb->addSeparator();
       tb->addAction(getAction("metronome"));
 

diff --git a/mscore/shortcut.cpp b/mscore/shortcut.cpp
@@ -2372,10 +2372,12 @@ Shortcut Shortcut::_sc[] = {
          MsWidget::MAIN_WINDOW,
          STATE_NORMAL | STATE_NOTE_ENTRY | STATE_PLAY,
          "follow",
-         QT_TRANSLATE_NOOP("action","Pan piano roll"),
+         QT_TRANSLATE_NOOP("action","Pan Piano Roll"),
          QT_TRANSLATE_NOOP("action","Toggle pan piano roll"),
          QT_TRANSLATE_NOOP("action","Pan roll during playback"),
-         Icons::pan_ICON
+         Icons::pan_ICON,
+         Qt::WindowShortcut,
+         ShortcutFlags::A_SCORE | ShortcutFlags::A_CHECKABLE | ShortcutFlags::A_CHECKED
          },
       {
          MsWidget::MAIN_WINDOW,