Merge pull request #3885 from jthistle/275479-master-palette-doesnt-c…

…lose-on-esc-linux Fix #275479: Master palette doesn't close on ESC
musescore · Aug 24, 2018 · ad78d4e · ad78d4e
2 parents 8bdb7cd + 3e79402
commit ad78d4e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/mscore/masterpalette.cpp b/mscore/masterpalette.cpp
@@ -95,6 +95,19 @@ Palette* MasterPalette::createPalette(int w, int h, bool grid, double mag)
       return sp;
       }
 
+//---------------------------------------------------------
+//   keyPressEvent
+//---------------------------------------------------------
+
+void MasterPalette::keyPressEvent(QKeyEvent* ev) 
+      {
+      if (ev->key() == Qt::Key_Escape && ev->modifiers() == Qt::NoModifier) {
+            close();
+            return;
+            }
+      QWidget::keyPressEvent(ev);
+      }
+
 //---------------------------------------------------------
 //   selectItem
 //---------------------------------------------------------

diff --git a/mscore/masterpalette.h b/mscore/masterpalette.h
@@ -50,6 +50,7 @@ class MasterPalette : public QWidget, Ui::MasterPalette
    protected:
       virtual void changeEvent(QEvent *event);
       void retranslate(bool firstTime = false);
+      virtual void keyPressEvent(QKeyEvent *ev);
 
    public:
       MasterPalette(QWidget* parent = 0);