From 48853d38ef3c5bdc6de4e82dabb6d650f88b3828 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Mon, 6 Mar 2023 17:37:32 +0100
Subject: [PATCH] index of the combo box changes on the final
 QskMenu::trigereed - not while navigating in the menu

---
 src/controls/QskComboBox.cpp | 91 ++++++++++++++++++------------------
 src/controls/QskComboBox.h   |  5 --
 src/controls/QskMenu.cpp     |  2 +
 3 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/src/controls/QskComboBox.cpp b/src/controls/QskComboBox.cpp
index ec66ca0d..95c7b7ca 100644
--- a/src/controls/QskComboBox.cpp
+++ b/src/controls/QskComboBox.cpp
@@ -19,11 +19,29 @@ QSK_SUBCONTROL( QskComboBox, PopupIndicator )
 
 QSK_SYSTEM_STATE( QskComboBox, PopupOpen, QskAspect::FirstSystemState << 1 )
 
+static inline void qskIncrement( QskComboBox* comboBox, int steps )
+{
+    const auto count = comboBox->count();
+    if ( count == 0 )
+        return;
+
+    const int index = comboBox->currentIndex();
+
+    if ( index == -1 && steps < 0 )
+        steps++;
+
+    int nextIndex = ( index + steps ) % count;
+    if ( nextIndex < 0 )
+        nextIndex += count;
+    
+    if ( nextIndex != index )
+        comboBox->setCurrentIndex( nextIndex ); 
+}
+
 class QskComboBox::PrivateData
 {
   public:
-    PrivateData( QskComboBox* const box )
-        : menu( new QskMenu( box ) )
+    PrivateData( QskComboBox* comboBox )
     {
         menu = new QskMenu();
 
@@ -33,12 +51,14 @@ class QskComboBox::PrivateData
             So we set the box as QObject parent only, so that it gets
             destroyed properly.
          */
-        menu->setParent( box );
+        menu->setParent( comboBox );
         menu->setPopupFlag( QskPopup::DeleteOnClose, false );
     }
 
     QskMenu* menu;
     QString placeholderText;
+
+    int currentIndex = -1;
 };
 
 QskComboBox::QskComboBox( QQuickItem* parent )
@@ -56,10 +76,7 @@ QskComboBox::QskComboBox( QQuickItem* parent )
     setAcceptHoverEvents( true );
 
     connect( m_data->menu, &QskMenu::triggered,
-        this, &QskComboBox::activated );
-
-    connect( m_data->menu, &QskMenu::currentIndexChanged,
-        this, &QskComboBox::showOption );
+        this, &QskComboBox::setCurrentIndex );
 
     connect( m_data->menu, &QskMenu::countChanged,
         this, &QskComboBox::countChanged );
@@ -92,10 +109,9 @@ bool QskComboBox::isPopupOpen() const
 
 QskGraphic QskComboBox::graphic() const
 {
-    const int index = currentIndex();
-    if( index >= 0 )
+    if( m_data->currentIndex >= 0 )
     {
-        const auto option = m_data->menu->optionAt( index );
+        const auto option = optionAt( m_data->currentIndex );
         return option.at( 0 ).value< QskGraphic >();
     }
 
@@ -133,10 +149,9 @@ void QskComboBox::setPlaceholderText( const QString& text )
         return;
 
     m_data->placeholderText = text;
-
     resetImplicitSize();
 
-    if ( currentIndex() < 0 )
+    if ( m_data->currentIndex < 0 )
         update();
 
     Q_EMIT placeholderTextChanged( text );
@@ -144,10 +159,9 @@ void QskComboBox::setPlaceholderText( const QString& text )
 
 QString QskComboBox::currentText() const
 {
-    const int index = currentIndex();
-    if( index >= 0 )
+    if( m_data->currentIndex >= 0 )
     {
-        const auto option = optionAt( index );
+        const auto option = optionAt( m_data->currentIndex );
         return option.at( 1 ).toString();
     }
 
@@ -205,13 +219,13 @@ void QskComboBox::keyPressEvent( QKeyEvent* event )
         case Qt::Key_Up:
         case Qt::Key_PageUp:
         {
-            increment( -1 );
+            qskIncrement( this, -1 );
             return;
         }
         case Qt::Key_Down:
         case Qt::Key_PageDown:
         {
-            increment( 1 );
+            qskIncrement( this, 1 );
             return;
         }
         case Qt::Key_Home:
@@ -242,23 +256,33 @@ void QskComboBox::keyReleaseEvent( QKeyEvent* event )
 
 void QskComboBox::wheelEvent( QWheelEvent* event )
 {
-    increment( -qRound( qskWheelSteps( event ) ) );
+    if ( !isPopupOpen() )
+    {
+        const auto steps = -qRound( qskWheelSteps( event ) );
+        qskIncrement( this, steps );
+    }
 }
 
 void QskComboBox::clear()
 {
     m_data->menu->clear();
-    update();
+    setCurrentIndex( -1 );
 }
 
 void QskComboBox::setCurrentIndex( int index )
 {
-    m_data->menu->setCurrentIndex( index );
+    if ( m_data->currentIndex != index )
+    {
+        m_data->currentIndex = index;
+        update();
+
+        Q_EMIT currentIndexChanged( index );
+    }
 }
 
 int QskComboBox::currentIndex() const
 {
-    return m_data->menu->currentIndex();
+    return m_data->currentIndex;
 }
 
 int QskComboBox::count() const
@@ -266,29 +290,4 @@ int QskComboBox::count() const
     return m_data->menu->count();
 }
 
-void QskComboBox::showOption( int index )
-{
-    update();
-    Q_EMIT currentIndexChanged( index );
-}
-
-void QskComboBox::increment( int steps )
-{
-    if ( count() == 0 )
-        return;
-
-    if ( currentIndex() == -1 && steps < 0 )
-        steps++;
-
-    int nextIndex = ( currentIndex() + steps ) % count();
-    if ( nextIndex < 0 )
-        nextIndex += count();
-
-    if ( nextIndex != currentIndex() )
-    {
-        m_data->menu->setCurrentIndex( nextIndex );
-        Q_EMIT activated( nextIndex );
-    }
-}
-
 #include "moc_QskComboBox.cpp"
diff --git a/src/controls/QskComboBox.h b/src/controls/QskComboBox.h
index 9e0d4cae..3eb74ce9 100644
--- a/src/controls/QskComboBox.h
+++ b/src/controls/QskComboBox.h
@@ -59,7 +59,6 @@ class QSK_EXPORT QskComboBox : public QskControl
     void setCurrentIndex( int );
 
   Q_SIGNALS:
-    void activated( int );
     void currentIndexChanged( int );
 
     void countChanged();
@@ -78,10 +77,6 @@ class QSK_EXPORT QskComboBox : public QskControl
     virtual void closePopup();
 
   private:
-    void showOption( int );
-    void releaseButton();
-    void increment( int );
-
     class PrivateData;
     std::unique_ptr< PrivateData > m_data;
 };
diff --git a/src/controls/QskMenu.cpp b/src/controls/QskMenu.cpp
index be8f7592..b968bd85 100644
--- a/src/controls/QskMenu.cpp
+++ b/src/controls/QskMenu.cpp
@@ -247,6 +247,8 @@ void QskMenu::keyPressEvent( QKeyEvent* event )
 
         case Qt::Key_Select:
         case Qt::Key_Space:
+        case Qt::Key_Return:
+        case Qt::Key_Enter: 
         {
             m_data->isPressed = true;
             return;