peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API extended

Browse Source
This commit is contained in:
Uwe Rathmann 2023-03-07 13:26:05 +01:00
parent 48853d38ef
commit 69546707d2
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/controls/QskMenu.cpp
View File

@ -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;

4
src/controls/QskMenu.h
View File

@ -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;