From 3c5b6f9f0143de19b8708c7f4963bb9db09a5743 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 29 Jun 2022 16:21:54 +0200 Subject: [PATCH] QskAbstractButton::Flat removed, using QskAspect::Header instead --- examples/buttons/buttons.qml | 7 +++---- examples/gallery/main.cpp | 7 ++----- examples/thumbnails/main.cpp | 2 +- skins/material/QskMaterialSkin.cpp | 8 ++++---- skins/squiek/QskSquiekSkin.cpp | 8 ++++---- src/controls/QskAbstractButton.cpp | 3 --- src/controls/QskAbstractButton.h | 2 +- src/controls/QskPushButton.cpp | 14 -------------- src/controls/QskPushButton.h | 6 ------ 9 files changed, 15 insertions(+), 42 deletions(-) diff --git a/examples/buttons/buttons.qml b/examples/buttons/buttons.qml index afd690d1..66fbb160 100644 --- a/examples/buttons/buttons.qml +++ b/examples/buttons/buttons.qml @@ -96,8 +96,7 @@ Qsk.Window { text: "Check Me" - flat: true - + section: Qsk.Aspect.Header checkable: true } @@ -105,14 +104,14 @@ Qsk.Window { text: "Push Me" - flat: true + section: Qsk.Aspect.Header } TestButton { text: "Disabled" - flat: true + section: Qsk.Aspect.Header enabled: false } diff --git a/examples/gallery/main.cpp b/examples/gallery/main.cpp index 8e8d622b..0d4bf2a5 100644 --- a/examples/gallery/main.cpp +++ b/examples/gallery/main.cpp @@ -52,8 +52,6 @@ namespace MenuButton( const QString& text, QQuickItem* parent = nullptr ) : QskPushButton( text, parent ) { - setFlat( true ); // until we have the section bit in QskAspect - connect( this, &QskPushButton::pressed, this, &MenuButton::openMenu ); } @@ -91,14 +89,13 @@ namespace { initSizePolicy( QskSizePolicy::Ignored, QskSizePolicy::Fixed ); + setSection( QskAspect::Header ); + setMargins( 10 ); setBackgroundColor( Qt::lightGray ); { auto button = new QskPushButton( "Skin", this ); -#if 1 - button->setFlat( true ); // until we have the section bit in QskAspect -#endif // transition leads to errors, when changing the tab before being completed. TODO ... connect( button, &QskSwitchButton::clicked, diff --git a/examples/thumbnails/main.cpp b/examples/thumbnails/main.cpp index 0f797af8..a4820c05 100644 --- a/examples/thumbnails/main.cpp +++ b/examples/thumbnails/main.cpp @@ -75,7 +75,7 @@ class Thumbnail : public QskPushButton setGraphic( thumbnailGraphic( color, shape, size ) ); setFixedSize( size ); - setFlat( true ); + setSection( QskAspect::Header ); // to make them flat } private: diff --git a/skins/material/QskMaterialSkin.cpp b/skins/material/QskMaterialSkin.cpp index d7ae073c..cde3b2fd 100644 --- a/skins/material/QskMaterialSkin.cpp +++ b/skins/material/QskMaterialSkin.cpp @@ -458,7 +458,7 @@ void Editor::setupPushButton() setBoxBorderColors( Q::Panel, noBorderColors ); setGradient( Q::Panel, White ); - setGradient( Q::Panel | Q::Flat, White & ColorMask ); + setGradient( Q::Panel | A::Header, White & ColorMask ); setColor( Q::Text, m_pal.textColor ); setColor( Q::Text | Q::Disabled, qskShadedColor( m_pal.textColor, 0.6 ) ); @@ -468,7 +468,7 @@ void Editor::setupPushButton() for ( auto state1 : { A::NoState, Q::Focused } ) { setBoxBorderColors( Q::Panel | Q::Hovered | state1, borderColors ); - setBoxBorderColors( Q::Panel | Q::Hovered | Q::Flat | state1, borderColors ); + setBoxBorderColors( Q::Panel | Q::Hovered | A::Header | state1, borderColors ); for ( auto state2 : { A::NoState, Q::Hovered } ) { @@ -479,8 +479,8 @@ void Editor::setupPushButton() setGradient( Q::Panel | states, m_pal.accentColor ); setColor( Q::Text | states, White ); - setGradient( Q::Panel | Q::Flat | states, m_pal.accentColor ); - setColor( Q::Text | Q::Flat | states, White ); + setGradient( Q::Panel | A::Header | states, m_pal.accentColor ); + setColor( Q::Text | A::Header | states, White ); } } } diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index b13f7e15..8031ee04 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -574,15 +574,15 @@ void Editor::setupPushButton() setMetric( Q::Panel | A::Spacing, 4 ); setButton( Q::Panel, Raised ); - setButton( Q::Panel | Q::Flat | Q::Hovered, Raised ); + setButton( Q::Panel | A::Header | Q::Hovered, Raised ); - setButton( Q::Panel | Q::Flat, Flat ); - setButton( Q::Panel | Q::Flat | Q::Disabled, Flat ); + setButton( Q::Panel | A::Header, Flat ); + setButton( Q::Panel | A::Header | Q::Disabled, Flat ); for ( auto state : { Q::Pressed, Q::Checked } ) { setButton( Q::Panel | state, Sunken ); - setButton( Q::Panel | Q::Flat | state, Sunken ); + setButton( Q::Panel | A::Header | state, Sunken ); } setAnimation( Q::Panel | A::Color, qskDuration ); diff --git a/src/controls/QskAbstractButton.cpp b/src/controls/QskAbstractButton.cpp index 01e1a352..f286f881 100644 --- a/src/controls/QskAbstractButton.cpp +++ b/src/controls/QskAbstractButton.cpp @@ -10,9 +10,6 @@ #include -// Flat is no state - we need to get rid of it. TODO ... -QSK_SYSTEM_STATE( QskAbstractButton, Flat, QskAspect::FirstSystemState << 1 ) - QSK_SYSTEM_STATE( QskAbstractButton, Checked, QskAspect::LastSystemState >> 3 ) QSK_SYSTEM_STATE( QskAbstractButton, Pressed, QskAspect::LastSystemState >> 2 ) diff --git a/src/controls/QskAbstractButton.h b/src/controls/QskAbstractButton.h index 22c0661b..af1a1038 100644 --- a/src/controls/QskAbstractButton.h +++ b/src/controls/QskAbstractButton.h @@ -33,7 +33,7 @@ class QSK_EXPORT QskAbstractButton : public QskControl using Inherited = QskControl; public: - QSK_STATES( Flat, Checked, Pressed ) + QSK_STATES( Checked, Pressed ) QskAbstractButton( QQuickItem* parent = nullptr ); ~QskAbstractButton() override; diff --git a/src/controls/QskPushButton.cpp b/src/controls/QskPushButton.cpp index 5ee33f25..dde79462 100644 --- a/src/controls/QskPushButton.cpp +++ b/src/controls/QskPushButton.cpp @@ -100,20 +100,6 @@ QskBoxShapeMetrics QskPushButton::shape() const return boxShapeHint( Panel ); } -void QskPushButton::setFlat( bool on ) -{ - if ( on != isFlat() ) - { - setSkinStateFlag( Flat, on ); - Q_EMIT flatChanged(); - } -} - -bool QskPushButton::isFlat() const -{ - return hasSkinState( Flat ); -} - void QskPushButton::setText( const QString& text ) { if ( text != m_data->text ) diff --git a/src/controls/QskPushButton.h b/src/controls/QskPushButton.h index 0a9cc6b8..25d83d92 100644 --- a/src/controls/QskPushButton.h +++ b/src/controls/QskPushButton.h @@ -36,8 +36,6 @@ class QSK_EXPORT QskPushButton : public QskAbstractButton Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL ) - Q_PROPERTY( bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL ) - Q_PROPERTY( QskBoxShapeMetrics shape READ shape WRITE setShape RESET resetShape NOTIFY shapeChanged ) @@ -70,9 +68,6 @@ class QSK_EXPORT QskPushButton : public QskAbstractButton void resetGraphicSourceSize(); - void setFlat( bool ); - bool isFlat() const; - QFont font() const; QRectF layoutRectForSize( const QSizeF& ) const override; @@ -89,7 +84,6 @@ class QSK_EXPORT QskPushButton : public QskAbstractButton void shapeChanged(); void textChanged(); void textOptionsChanged(); - void flatChanged(); void graphicChanged(); void graphicSourceChanged(); void graphicSourceSizeChanged();