fix #113556: Note input toolbar not accessible via tab

musescore · Jun 1, 2016 · 1388540 · 1388540
1 parent d1c649d
commit 1388540
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/mscore/accessibletoolbutton.cpp b/mscore/accessibletoolbutton.cpp
@@ -7,11 +7,11 @@ namespace Ms {
 
 AccessibleToolButton::AccessibleToolButton(QWidget* parent, QAction* defaultQAction ): QToolButton(parent)
       {
-      this->setDefaultAction(defaultQAction);
-      this->setFocusPolicy(Qt::TabFocus);
+      setDefaultAction(defaultQAction);
+      setFocusPolicy(Qt::TabFocus);
 
-      this->setAccessibleName(defaultQAction->text());
-      this->setAccessibleDescription(defaultQAction->toolTip());
+      setAccessibleName(defaultQAction->text());
+      setAccessibleDescription(defaultQAction->toolTip());
       }
 
 
@@ -27,15 +27,15 @@ void AccessibleToolButton::focusInEvent(QFocusEvent* e)
 
 void AccessibleToolButton::focusOutEvent(QFocusEvent* e)
       {
-      this->setGraphicsEffect(NULL);
+      setGraphicsEffect(nullptr);
       QToolButton::focusInEvent(e);
       }
 
 void AccessibleToolButton::keyPressEvent(QKeyEvent *e)
       {
       //Pressing Enter or Return button triggers the default action
       if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-            this->animateClick();
+            animateClick();
             return;
             }
 

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -348,6 +348,7 @@ void MuseScore::preferencesChanged()
       updateNewWizard();
       }
 
+//---------------------------------------------------------
 //---------------------------------------------------------
 //   MuseScore
 //---------------------------------------------------------
@@ -630,7 +631,7 @@ MuseScore::MuseScore()
             if (!*s)
                   entryTools->addSeparator();
             else
-                  entryTools->addAction(getAction(s));
+                  entryTools->addWidget(new AccessibleToolButton(entryTools, getAction(s)));
             }
 
       static const char* vbsh { "QToolButton:checked, QToolButton:pressed { color: white;}" };