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

QskMenu::cascading added

This commit is contained in:
Uwe Rathmann 2021-12-26 12:17:31 +01:00
parent 26336fa5dc
commit a4d34dfa54
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
skins/squiek/QskSquiekSkin.cpp
View File

@ -311,6 +311,9 @@ void Editor::setupMenu()
setBoxShape( Q::Panel, 4 ); setBoxShape( Q::Panel, 4 );
setVGradient( Q::Panel, c1, c2 ); setVGradient( Q::Panel, c1, c2 );
const bool isCascading = qskMaybeDesktopPlatform();
setFlagHint( Q::Panel | QskAspect::Style, isCascading );
#if 0 #if 0
setPadding( Q::Separator, QMarginsF( 10, 0, 10, 0 ) ); setPadding( Q::Separator, QMarginsF( 10, 0, 10, 0 ) );
setMetric( Q::Separator | QskAspect::Size, 3 ); setMetric( Q::Separator | QskAspect::Size, 3 );

17
src/controls/QskMenu.cpp
View File

@ -48,6 +48,23 @@ QskMenu::~QskMenu()
{ {
} }
bool QskMenu::isCascading() const
{
return flagHint( QskMenu::Panel | QskAspect::Style );
}
void QskMenu::setCascading( bool on )
{
if ( setFlagHint( QskMenu::Panel | QskAspect::Style, on ) )
Q_EMIT cascadingChanged( on );
}
void QskMenu::resetCascading()
{
if ( resetFlagHint( QskMenu::Panel | QskAspect::Style ) )
Q_EMIT cascadingChanged( isCascading() );
}
void QskMenu::setOrigin( const QPointF& origin ) void QskMenu::setOrigin( const QPointF& origin )
{ {
if ( origin != m_data->origin ) if ( origin != m_data->origin )

12
src/controls/QskMenu.h
View File

@ -21,6 +21,9 @@ class QSK_EXPORT QskMenu : public QskPopup
Q_PROPERTY( QPointF origin READ origin Q_PROPERTY( QPointF origin READ origin
WRITE setOrigin NOTIFY originChanged ) WRITE setOrigin NOTIFY originChanged )
Q_PROPERTY( bool cascading READ isCascading WRITE setCascading
RESET resetCascading NOTIFY cascadingChanged )
Q_PROPERTY( int count READ count ) Q_PROPERTY( int count READ count )
Q_PROPERTY( int currentIndex READ currentIndex Q_PROPERTY( int currentIndex READ currentIndex
@ -41,6 +44,10 @@ class QSK_EXPORT QskMenu : public QskPopup
QskMenu( QQuickItem* parentItem = nullptr ); QskMenu( QQuickItem* parentItem = nullptr );
~QskMenu() override; ~QskMenu() override;
bool isCascading() const;
void setCascading( bool );
void resetCascading();
void setOrigin( const QPointF& ); void setOrigin( const QPointF& );
QPointF origin() const; QPointF origin() const;
@ -50,7 +57,6 @@ class QSK_EXPORT QskMenu : public QskPopup
void addSeparator(); void addSeparator();
Entry entryAt( int index ) const; Entry entryAt( int index ) const;
QskGraphic graphicAt( int index ) const; QskGraphic graphicAt( int index ) const;
@ -67,9 +73,11 @@ class QSK_EXPORT QskMenu : public QskPopup
int indexAtPosition( const QPointF& ) const; int indexAtPosition( const QPointF& ) const;
Q_SIGNALS: Q_SIGNALS:
void cascadingChanged( bool );
void originChanged( const QPointF& );
void triggered( int index ); void triggered( int index );
void currentIndexChanged( int index ); void currentIndexChanged( int index );
void originChanged( const QPointF& );
public Q_SLOTS: public Q_SLOTS:
void setCurrentIndex( int index ); void setCurrentIndex( int index );