Merge branch 'master' into features/drawer

src/controls/QskDrawer.cpp

@@ -249,64 +249,6 @@ bool QskDrawer::event( QEvent* event )
     return Inherited::event( event );
 }
 
-void QskDrawer::keyPressEvent( QKeyEvent* event )
-{
-    if ( isOpen() )
-    {
-        bool doClose = false;
-
-        const auto key = event->key();
-
-        switch( key )
-        {
-            case Qt::Key_Escape:
-            case Qt::Key_Cancel:
-            {
-                doClose = true;
-                break;
-            }
-
-#if 0
-            /*
-                Do we want to have this - and what about opening with
-                the same keys ???
-             */
-            case Qt::Key_Up:
-            case Qt::Key_Down:
-            case Qt::Key_Left:
-            case Qt::Key_Right:
-            {
-                switch( m_data->edge )
-                {
-                    case Qt::TopEdge:
-                        doClose = ( key == Qt::Key_Up );
-                        break;
-                    case Qt::BottomEdge:
-                        doClose = ( key == Qt::Key_Down );
-                        break;
-                    case Qt::LeftEdge:
-                        doClose = ( key == Qt::Key_Left );
-                        break;
-                    case Qt::RightEdge:
-                        doClose = ( key == Qt::Key_Right );
-                        break;
-                }
-
-                break;
-            }
-#endif
-        }
-
-        if ( doClose )
-        {
-            close();
-            return;
-        }
-    }
-
-    Inherited::keyPressEvent( event );
-}
-
 void QskDrawer::gestureEvent( QskGestureEvent* event )
 {
     if ( event->gesture()->type() == QskGesture::Pan )

src/controls/QskDrawer.h

@@ -46,7 +46,6 @@ class QSK_EXPORT QskDrawer : public QskSlideIn
 
     void itemChange( ItemChange, const ItemChangeData& ) override;
     void gestureEvent( QskGestureEvent* ) override;
-    void keyPressEvent( QKeyEvent* ) override;
 
   private:
     class PrivateData;

src/controls/QskMenu.cpp

@@ -267,20 +267,18 @@ void QskMenu::keyPressEvent( QKeyEvent* event )
     if( m_data->currentIndex < 0 )
         return;
 
-    int key = event->key();
+    switch( event->key() )
-
-    switch( key )
     {
         case Qt::Key_Up:
         {
             traverse( -1 );
-            break;
+            return;
         }
 
         case Qt::Key_Down:
         {
             traverse( 1 );
-            break;
+            return;
         }
 
         case Qt::Key_Select:
@@ -292,19 +290,17 @@ void QskMenu::keyPressEvent( QKeyEvent* event )
             return;
         }
 
-        case Qt::Key_Escape:
-        case Qt::Key_Cancel:
-        {
-            close();
-            return;
-        }
-
         default:
         {
             if ( const int steps = qskFocusChainIncrement( event ) )
+            {
                 traverse( steps );
+                return;
+            }
         }
     }
+
+    return Inherited::keyPressEvent( event );
 }
 
 void QskMenu::keyReleaseEvent( QKeyEvent* )

src/controls/QskPopup.cpp

@@ -519,6 +519,17 @@ bool QskPopup::event( QEvent* event )
     return ok;
 }
 
+void QskPopup::keyPressEvent( QKeyEvent* event )
+{
+    if ( qskIsStandardKeyInput( event, QKeySequence::Cancel ) )
+    {
+        close();
+        return;
+    }
+
+    return Inherited::keyPressEvent( event );
+}
+
 void QskPopup::focusInEvent( QFocusEvent* event )
 {
     Inherited::focusInEvent( event );

src/controls/QskPopup.h

@@ -88,6 +88,7 @@ class QSK_EXPORT QskPopup : public QskControl
     bool event( QEvent* ) override;
     void focusInEvent( QFocusEvent* ) override;
     void focusOutEvent( QFocusEvent* ) override;
+    void keyPressEvent( QKeyEvent* ) override;
     void windowChangeEvent( QskWindowChangeEvent* ) override;
 
     void itemChange( QQuickItem::ItemChange,

src/dialogs/QskDialogSubWindow.cpp

@@ -278,15 +278,10 @@ void QskDialogSubWindow::keyPressEvent( QKeyEvent* event )
     {
         auto button = m_data->buttonBox->defaultButton();
         if ( button && button->isEnabled() )
+        {
             button->click();
-    }
+            return;
-
+        }
-    if ( qskIsStandardKeyInput( event, QKeySequence::Cancel ) )
-    {
-        // using shortcuts instead ???
-
-        reject();
-        return;
     }
 
     Inherited::keyPressEvent( event );