From 69546707d28c7444b272b69170f9c25309cb5b79 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Tue, 7 Mar 2023 13:26:05 +0100
Subject: [PATCH] API extended

---
 src/controls/QskMenu.cpp | 34 ++++++++++++++++++++++++++++++----
 src/controls/QskMenu.h   |  4 +++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/controls/QskMenu.cpp b/src/controls/QskMenu.cpp
index b968bd85..36d24307 100644
--- a/src/controls/QskMenu.cpp
+++ b/src/controls/QskMenu.cpp
@@ -32,6 +32,12 @@ namespace
     class Option
     {
       public:
+        Option( const QskGraphic& graphic, const QString& text )
+            : text( text )
+            , graphic( graphic )
+        {
+        }
+
         Option( const QUrl& graphicSource, const QString& text )
             : graphicSource( graphicSource )
             , text( text )
@@ -129,6 +135,11 @@ QPointF QskMenu::origin() const
     return m_data->origin;
 }
 
+void QskMenu::addOption( const QString& text )
+{
+    addOption( QUrl(), text );
+}
+
 void QskMenu::addOption( const QUrl& graphicSource, const QString& text )
 {
     m_data->options += Option( graphicSource, text );
@@ -140,6 +151,17 @@ void QskMenu::addOption( const QUrl& graphicSource, const QString& text )
         Q_EMIT countChanged( count() );
 }
 
+void QskMenu::addOption( const QskGraphic& graphic, const QString& text )
+{
+    m_data->options += Option( graphic, text );
+
+    resetImplicitSize();
+    update();
+
+    if ( isComponentComplete() )
+        Q_EMIT countChanged( count() );
+}
+
 void QskMenu::addOption( const QString& graphicSource, const QString& text )
 {
     addOption( QUrl( graphicSource ), text );
@@ -170,8 +192,14 @@ int QskMenu::separatorCount() const
 
 void QskMenu::clear()
 {
-    m_data->options.clear();
     m_data->separators.clear();
+
+    if ( !m_data->options.isEmpty() )
+    {
+        m_data->options.clear();
+        if ( isComponentComplete() )
+            Q_EMIT countChanged( count() );
+    }
 }
 
 QVariantList QskMenu::optionAt( int index ) const
@@ -225,9 +253,7 @@ int QskMenu::currentIndex() const
 void QskMenu::keyPressEvent( QKeyEvent* event )
 {
     if( m_data->currentIndex < 0 )
-    {
         return;
-    }
 
     int key = event->key();
 
@@ -248,7 +274,7 @@ void QskMenu::keyPressEvent( QKeyEvent* event )
         case Qt::Key_Select:
         case Qt::Key_Space:
         case Qt::Key_Return:
-        case Qt::Key_Enter: 
+        case Qt::Key_Enter:
         {
             m_data->isPressed = true;
             return;
diff --git a/src/controls/QskMenu.h b/src/controls/QskMenu.h
index e669a532..b1b5d470 100644
--- a/src/controls/QskMenu.h
+++ b/src/controls/QskMenu.h
@@ -48,9 +48,11 @@ class QSK_EXPORT QskMenu : public QskPopup
     void setTextOptions( const QskTextOptions& );
     QskTextOptions textOptions() const;
 
-    // insert, remove, functors, actions, QskGraphic ...
+    // insert, remove, functors, actions
     void addOption( const QUrl& graphicSource, const QString& text );
     void addOption( const QString& graphicSource, const QString& text );
+    void addOption( const QskGraphic&, const QString& text );
+    void addOption( const QString& text );
 
     QVariantList optionAt( int ) const;
     int count() const;