diff --git a/doc/classes/QskAspect.dox b/doc/classes/QskAspect.dox index 60e3aae3..7e90df36 100644 --- a/doc/classes/QskAspect.dox +++ b/doc/classes/QskAspect.dox @@ -163,38 +163,38 @@ */ /*! - \enum QskAspect::Placement + \enum QskAspect::Variation - \brief Represents an orientation or relative position + \brief Some sort of variation - The placement bits can be used to have different definitions for - a skinnable depending on its position or orientation. F.e a tab bar + The variation bits can be used to have different definitions for + a skinnable depending on its position, orientation or emphasis. F.e a tab bar looks slightly different depending on its position. \note flags indicating an orientation can't be used together with the flags for the position - \sa QskSkinnable::effectivePlacement() + \sa QskSkinnable::effectiveVariation() - \var QskAspect::Placement QskAspect::NoPlacement - No specific placement bits + \var QskAspect::Variation QskAspect::NoVariation + No specific variation bits - \var QskAspect::Placement QskAspect::Vertical + \var QskAspect::Variation QskAspect::Vertical Indicates a vertical orientation - \var QskAspect::Placement QskAspect::Horizontal + \var QskAspect::Variation QskAspect::Horizontal Indicates a horizontal orientation - \var QskAspect::Placement QskAspect::Top + \var QskAspect::Variation QskAspect::Top Indicates a top position - \var QskAspect::Placement QskAspect::Left + \var QskAspect::Variation QskAspect::Left Indicates a left position - \var QskAspect::Placement QskAspect::Right + \var QskAspect::Variation QskAspect::Right Indicates a right position - \var QskAspect::Placement QskAspect::Bottom + \var QskAspect::Variation QskAspect::Bottom Indicates a bottom position */ @@ -288,10 +288,10 @@ */ /*! - \fn QskAspect::QskAspect( Placement ) + \fn QskAspect::QskAspect( Variation ) - Constructs an aspect with the placement bits being initialized - \param placement Initial placement + Constructs an aspect with the variation bits being initialized + \param variation Initial variation */ /*! @@ -351,9 +351,9 @@ */ /*! - \fn QskAspect::operator|( Placement ) const + \fn QskAspect::operator|( Variation ) const - Sets the placement bits + Sets the variation bits */ /*! @@ -378,7 +378,7 @@ /*! \fn QskAspect::trunk - \return A copy of the aspect without the runtime bits ( state, placement ) bits + \return A copy of the aspect without the runtime bits ( state, variation ) bits */ /*! @@ -443,17 +443,17 @@ */ /*! - \fn QskAspect::placement + \fn QskAspect::variation - \return Placement bits - \sa setPlacement() + \return Variation bits + \sa setVariation() */ /*! - \fn QskAspect::setPlacement + \fn QskAspect::setVariation - Sets the placement bits - \sa placement() + Sets the variation bits + \sa variation() */ /*! diff --git a/doc/classes/QskSkinnable.dox b/doc/classes/QskSkinnable.dox index 98b75209..fe07b1e5 100644 --- a/doc/classes/QskSkinnable.dox +++ b/doc/classes/QskSkinnable.dox @@ -182,14 +182,14 @@ \sa setSkinHint(), effectiveSkinHint() */ -/*! \fn QskSkinnable::effectivePlacement +/*! \fn QskSkinnable::effectiveVariation - The placements bits are added to an unresolved aspect when + The variation bits are added to an unresolved aspect when inserting or looking up values in the hint table. - \return The default implementation returns QskAspect::NoPlacement; + \return The default implementation returns QskAspect::NoVariation; - \sa QskAspect::Placement, effectiveSkinHint() + \sa QskAspect::Variation, effectiveSkinHint() */ /*! \fn QskSkinnable::hintStatus diff --git a/examples/tabview/OtherSlider.cpp b/examples/tabview/OtherSlider.cpp index b3d15fae..ce5008c1 100644 --- a/examples/tabview/OtherSlider.cpp +++ b/examples/tabview/OtherSlider.cpp @@ -30,9 +30,9 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) // Panel - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { - const auto aspect = Panel | placement; + const auto aspect = Panel | variation; ed.setMetric( aspect | A::Size, h ); ed.setBoxShape( aspect, 4 ); @@ -40,7 +40,7 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) ed.setBoxBorderColors( aspect, DimGray ); ed.setGradient( aspect, Silver ); - if ( placement == A::Horizontal ) + if ( variation == A::Horizontal ) ed.setPadding( aspect, QskMargins( paddingW, 0 ) ); else ed.setPadding( aspect, QskMargins( 0, paddingW ) ); @@ -48,9 +48,9 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) // Groove - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { - const auto aspect = Groove | placement; + const auto aspect = Groove | variation; ed.setMetric( aspect | A::Size, 4 ); ed.setBoxBorderMetrics( aspect, 0 ); @@ -60,24 +60,24 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) } // no Fill - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { - const auto aspect = Fill | placement; + const auto aspect = Fill | variation; ed.setMetric( aspect | A::Size, 0 ); } // Handle - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { - const auto aspect = Handle | placement; + const auto aspect = Handle | variation; ed.setBoxBorderMetrics( aspect, 1 ); ed.setBoxShape( aspect, 4 ); const qreal m = 0.5 * std::ceil( 0.5 * ( w - h ) ) + 1; - if ( placement == A::Horizontal ) + if ( variation == A::Horizontal ) ed.setMargin( aspect, QskMargins( -m, 0 ) ); else ed.setMargin( aspect, QskMargins( 0, -m ) ); diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp index ffde2ef5..6ff1dffa 100644 --- a/skins/material3/QskMaterial3Skin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -525,9 +525,9 @@ void Editor::setupSeparator() using A = QskAspect; using Q = QskSeparator; - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { - const auto aspect = Q::Panel | placement; + const auto aspect = Q::Panel | variation; setMetric( aspect | A::Size, 4_dp ); setBoxShape( Q::Panel, 0 ); @@ -742,13 +742,13 @@ void Editor::setupTabButton() setColor( Q::Text | Q::Checked, m_pal.primary ); setColor( Q::Text | Q::Hovered, m_pal.primary ); - for ( const auto placement : { A::Left, A::Right, A::Top, A::Bottom } ) + for ( const auto variation : { A::Left, A::Right, A::Top, A::Bottom } ) { - const auto aspect = Q::Panel | placement; + const auto aspect = Q::Panel | variation; Qt::Edge edge; - switch( placement ) + switch( variation ) { case A::Left: edge = Qt::RightEdge; diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index ce5a4ad6..9ae9a25f 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -624,33 +624,33 @@ void Editor::setupTabButton() setStrutSize( Q::Panel, 30, 16 ); - for ( auto placement : { A::Top, A::Bottom } ) + for ( auto variation : { A::Top, A::Bottom } ) { - setVGradient( Q::Panel | placement, m_pal.lighter125, m_pal.lighter110 ); + setVGradient( Q::Panel | variation, m_pal.lighter125, m_pal.lighter110 ); for ( const auto state : { Q::Checked | A::NoState, Q::Checked | Q::Pressed } ) { - setGradient( Q::Panel | placement | state, m_pal.lighter125 ); - setColor( Q::Text | placement | state, m_pal.themeForeground ); + setGradient( Q::Panel | variation | state, m_pal.lighter125 ); + setColor( Q::Text | variation | state, m_pal.themeForeground ); } } - for ( auto placement : { A::Left, A::Right } ) + for ( auto variation : { A::Left, A::Right } ) { - setGradient( Q::Panel | placement, m_pal.lighter125 ); + setGradient( Q::Panel | variation, m_pal.lighter125 ); for ( const auto state : { Q::Checked | A::NoState, Q::Checked | Q::Pressed } ) { - setGradient( Q::Panel | placement | state, m_pal.highlighted ); - setColor( Q::Text | placement | state, m_pal.highlightedText ); + setGradient( Q::Panel | variation | state, m_pal.highlighted ); + setColor( Q::Text | variation | state, m_pal.highlightedText ); } } setBoxBorderColors( Q::Panel, m_pal.darker200 ); - for ( auto placement : { A::Left, A::Right, A::Top, A::Bottom } ) + for ( auto variation : { A::Left, A::Right, A::Top, A::Bottom } ) { - const auto aspect = Q::Panel | placement; + const auto aspect = Q::Panel | variation; QskMargins margins0, margins1, padding; QskBoxBorderMetrics border( 1 ); @@ -658,7 +658,7 @@ void Editor::setupTabButton() const int indent = 4; - if ( placement == A::Top ) + if ( variation == A::Top ) { margins0 = QskMargins( -1, indent, -1, -1 ); margins1 = QskMargins( -1, 0, -1, -2 ); @@ -668,7 +668,7 @@ void Editor::setupTabButton() shape.setRadius( Qt::BottomLeftCorner, 0 ); shape.setRadius( Qt::BottomRightCorner, 0 ); } - else if ( placement == A::Bottom ) + else if ( variation == A::Bottom ) { margins0 = QskMargins( -1, -1, -1, indent ); margins1 = QskMargins( -1, -2, -1, 0 ); @@ -678,7 +678,7 @@ void Editor::setupTabButton() shape.setRadius( Qt::TopLeftCorner, 0 ); shape.setRadius( Qt::TopRightCorner, 0 ); } - else if ( placement == A::Left ) + else if ( variation == A::Left ) { margins0 = QskMargins( indent, -1, -1, -1 ); margins1 = QskMargins( 0, -1, -2, 0 ); @@ -688,7 +688,7 @@ void Editor::setupTabButton() shape.setRadius( Qt::TopRightCorner, 0 ); shape.setRadius( Qt::BottomRightCorner, 0 ); } - else if ( placement == A::Right ) + else if ( variation == A::Right ) { margins0 = QskMargins( -1, -1, indent, -1 ); margins1 = QskMargins( -2, -1, 0, 0 ); @@ -731,9 +731,9 @@ void Editor::setupSlider() // Panel - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { - const auto aspect = Q::Panel | placement; + const auto aspect = Q::Panel | variation; setMetric( aspect | A::Size, extent ); setBoxBorderMetrics( aspect, 0 ); @@ -746,11 +746,11 @@ void Editor::setupSlider() // Groove, Fill - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { for ( auto subControl : { Q::Groove, Q::Fill } ) { - const auto aspect = subControl | placement; + const auto aspect = subControl | variation; setMetric( aspect | A::Size, 0.3 * extent ); setPadding( aspect, 0 ); @@ -759,15 +759,15 @@ void Editor::setupSlider() setBoxShape( aspect, 0.1 * extent ); } - setGradient( Q::Groove | placement, m_pal.darker200 ); - setGradient( Q::Fill | placement, QskGradient() ); // no filling + setGradient( Q::Groove | variation, m_pal.darker200 ); + setGradient( Q::Fill | variation, QskGradient() ); // no filling } // Handle - for ( auto placement : { A::Horizontal, A::Vertical } ) + for ( auto variation : { A::Horizontal, A::Vertical } ) { - const auto aspect = Q::Handle | placement; + const auto aspect = Q::Handle | variation; setButton( aspect, Raised, 1 ); setBoxShape( aspect, 20.0, Qt::RelativeSize ); diff --git a/src/common/QskAspect.cpp b/src/common/QskAspect.cpp index 30533426..75b50162 100644 --- a/src/common/QskAspect.cpp +++ b/src/common/QskAspect.cpp @@ -260,9 +260,9 @@ QDebug operator<<( QDebug debug, QskAspect::Subcontrol subControl ) return debug; } -QDebug operator<<( QDebug debug, QskAspect::Placement placement ) +QDebug operator<<( QDebug debug, QskAspect::Variation variation ) { - qskDebugEnum( debug, "Placement", placement ); + qskDebugEnum( debug, "Variation", variation ); return debug; } @@ -334,8 +334,8 @@ void qskDebugAspect( QDebug debug, const QMetaObject* metaObject, QskAspect aspe } } - if ( aspect.placement() != QskAspect::NoPlacement ) - debug << ", " << qskEnumString( "Placement", aspect.placement() ); + if ( aspect.variation() != QskAspect::NoVariation ) + debug << ", " << qskEnumString( "Variation", aspect.variation() ); if ( aspect.hasStates() ) debug << ", " << qskStatesToString( metaObject, aspect.states() ); diff --git a/src/common/QskAspect.h b/src/common/QskAspect.h index cdd8ce15..ac1d91dc 100644 --- a/src/common/QskAspect.h +++ b/src/common/QskAspect.h @@ -69,9 +69,9 @@ class QSK_EXPORT QskAspect }; Q_ENUM( Primitive ) - enum Placement : quint8 + enum Variation : quint8 { - NoPlacement = 0, + NoVariation = 0, Vertical = Qt::Vertical, Horizontal = Qt::Horizontal, @@ -81,7 +81,7 @@ class QSK_EXPORT QskAspect Right = 3, Bottom = 4 }; - Q_ENUM( Placement ) + Q_ENUM( Variation ) enum Subcontrol : quint16 { @@ -111,7 +111,7 @@ class QSK_EXPORT QskAspect constexpr QskAspect( Subcontrol ) noexcept; constexpr QskAspect( Section ) noexcept; constexpr QskAspect( Type ) noexcept; - constexpr QskAspect( Placement ) noexcept; + constexpr QskAspect( Variation ) noexcept; constexpr QskAspect( const QskAspect& ) noexcept = default; constexpr QskAspect( QskAspect&& ) noexcept = default; @@ -127,7 +127,7 @@ class QSK_EXPORT QskAspect constexpr QskAspect operator|( Section ) const noexcept; constexpr QskAspect operator|( Type ) const noexcept; constexpr QskAspect operator|( Primitive ) const noexcept; - constexpr QskAspect operator|( Placement ) const noexcept; + constexpr QskAspect operator|( Variation ) const noexcept; constexpr QskAspect operator|( State ) const noexcept; QskAspect& operator|=( State ) noexcept; @@ -164,8 +164,8 @@ class QSK_EXPORT QskAspect constexpr bool isColor() const noexcept; constexpr bool isFlag() const noexcept; - constexpr Placement placement() const noexcept; - void setPlacement( Placement ) noexcept; + constexpr Variation variation() const noexcept; + void setVariation( Variation ) noexcept; constexpr States states() const noexcept; constexpr bool hasStates() const noexcept; @@ -198,10 +198,10 @@ class QSK_EXPORT QskAspect static void reservePrimitives( quint8 count ); private: - constexpr QskAspect( Subcontrol, Section, Type, Placement ) noexcept; + constexpr QskAspect( Subcontrol, Section, Type, Variation ) noexcept; constexpr QskAspect( uint subControl, uint section, uint type, bool isAnimator, - uint primitive, uint placement, uint states ) noexcept; + uint primitive, uint variation, uint states ) noexcept; struct Bits { @@ -212,7 +212,7 @@ class QSK_EXPORT QskAspect uint isAnimator : 1; uint primitive : 5; - uint placement : 3; + uint variation : 3; uint reserved1 : 4; uint states : 16; @@ -243,39 +243,39 @@ constexpr inline QskAspect::State operator>>( QskAspect::State a, const int b ) } inline constexpr QskAspect::QskAspect() noexcept - : QskAspect( NoSubcontrol, Body, Flag, NoPlacement ) + : QskAspect( NoSubcontrol, Body, Flag, NoVariation ) { } inline constexpr QskAspect::QskAspect( Subcontrol subControl ) noexcept - : QskAspect( subControl, Body, Flag, NoPlacement ) + : QskAspect( subControl, Body, Flag, NoVariation ) { } inline constexpr QskAspect::QskAspect( Section section ) noexcept - : QskAspect( NoSubcontrol, section, Flag, NoPlacement ) + : QskAspect( NoSubcontrol, section, Flag, NoVariation ) { } inline constexpr QskAspect::QskAspect( Type type ) noexcept - : QskAspect( NoSubcontrol, Body, type, NoPlacement ) + : QskAspect( NoSubcontrol, Body, type, NoVariation ) { } -inline constexpr QskAspect::QskAspect( Placement placement ) noexcept - : QskAspect( NoSubcontrol, Body, Flag, placement ) +inline constexpr QskAspect::QskAspect( Variation variation ) noexcept + : QskAspect( NoSubcontrol, Body, Flag, variation ) { } inline constexpr QskAspect::QskAspect( - Subcontrol subControl, Section section, Type type, Placement placement ) noexcept - : QskAspect( subControl, section, type, false, 0, placement, NoState ) + Subcontrol subControl, Section section, Type type, Variation variation ) noexcept + : QskAspect( subControl, section, type, false, 0, variation, NoState ) { } -inline constexpr QskAspect::QskAspect( uint subControl, uint section, uint type, bool isAnimator, - uint primitive, uint placement, uint states ) noexcept - : m_bits { subControl, section, type, isAnimator, primitive, placement, 0, states, 0 } +inline constexpr QskAspect::QskAspect( uint subControl, uint section, uint type, + bool isAnimator, uint primitive, uint variation, uint states ) noexcept + : m_bits { subControl, section, type, isAnimator, primitive, variation, 0, states, 0 } { } @@ -297,37 +297,37 @@ inline bool QskAspect::operator<( const QskAspect& other ) const noexcept inline constexpr QskAspect QskAspect::operator|( Subcontrol subControl ) const noexcept { return QskAspect( subControl, m_bits.section, m_bits.type, - m_bits.isAnimator, m_bits.primitive, m_bits.placement, m_bits.states ); + m_bits.isAnimator, m_bits.primitive, m_bits.variation, m_bits.states ); } inline constexpr QskAspect QskAspect::operator|( Section section ) const noexcept { return QskAspect( m_bits.subControl, section, m_bits.type, - m_bits.isAnimator, m_bits.primitive, m_bits.placement, m_bits.states ); + m_bits.isAnimator, m_bits.primitive, m_bits.variation, m_bits.states ); } inline constexpr QskAspect QskAspect::operator|( Type type ) const noexcept { return QskAspect( m_bits.subControl, m_bits.section, type, - m_bits.isAnimator, m_bits.primitive, m_bits.placement, m_bits.states ); + m_bits.isAnimator, m_bits.primitive, m_bits.variation, m_bits.states ); } inline constexpr QskAspect QskAspect::operator|( Primitive primitive ) const noexcept { return QskAspect( m_bits.subControl, m_bits.section, m_bits.type, - m_bits.isAnimator, primitive, m_bits.placement, m_bits.states ); + m_bits.isAnimator, primitive, m_bits.variation, m_bits.states ); } -inline constexpr QskAspect QskAspect::operator|( Placement placement ) const noexcept +inline constexpr QskAspect QskAspect::operator|( Variation variation ) const noexcept { return QskAspect( m_bits.subControl, m_bits.section, m_bits.type, - m_bits.isAnimator, m_bits.primitive, placement, m_bits.states ); + m_bits.isAnimator, m_bits.primitive, variation, m_bits.states ); } inline constexpr QskAspect QskAspect::operator|( State state ) const noexcept { return QskAspect( m_bits.subControl, m_bits.section, m_bits.type, - m_bits.isAnimator, m_bits.primitive, m_bits.placement, m_bits.states | state ); + m_bits.isAnimator, m_bits.primitive, m_bits.variation, m_bits.states | state ); } inline QskAspect& QskAspect::operator|=( State state ) noexcept @@ -339,7 +339,7 @@ inline QskAspect& QskAspect::operator|=( State state ) noexcept inline constexpr QskAspect QskAspect::operator&( State state ) const noexcept { return QskAspect( m_bits.subControl, m_bits.section, m_bits.type, m_bits.isAnimator, - m_bits.primitive, m_bits.placement, m_bits.states & state ); + m_bits.primitive, m_bits.variation, m_bits.states & state ); } inline QskAspect& QskAspect::operator&=( State state ) noexcept @@ -351,7 +351,7 @@ inline QskAspect& QskAspect::operator&=( State state ) noexcept inline constexpr QskAspect QskAspect::operator|( States states ) const noexcept { return QskAspect( m_bits.subControl, m_bits.section, m_bits.type, m_bits.isAnimator, - m_bits.primitive, m_bits.placement, m_bits.states | states ); + m_bits.primitive, m_bits.variation, m_bits.states | states ); } inline QskAspect& QskAspect::operator|=( States states ) noexcept @@ -363,7 +363,7 @@ inline QskAspect& QskAspect::operator|=( States states ) noexcept inline constexpr QskAspect QskAspect::operator&( States states ) const noexcept { return QskAspect( m_bits.subControl, m_bits.section, m_bits.type, - m_bits.isAnimator, m_bits.primitive, m_bits.placement, m_bits.states & states ); + m_bits.isAnimator, m_bits.primitive, m_bits.variation, m_bits.states & states ); } inline QskAspect& QskAspect::operator&=( States states ) noexcept @@ -375,7 +375,7 @@ inline QskAspect& QskAspect::operator&=( States states ) noexcept inline constexpr QskAspect QskAspect::stateless() const noexcept { return QskAspect( m_bits.subControl, m_bits.section, m_bits.type, - m_bits.isAnimator, m_bits.primitive, m_bits.placement, 0 ); + m_bits.isAnimator, m_bits.primitive, m_bits.variation, 0 ); } inline constexpr QskAspect QskAspect::trunk() const noexcept @@ -518,14 +518,14 @@ inline void QskAspect::clearPrimitive() noexcept m_bits.primitive = NoPrimitive; } -inline constexpr QskAspect::Placement QskAspect::placement() const noexcept +inline constexpr QskAspect::Variation QskAspect::variation() const noexcept { - return static_cast< Placement >( m_bits.placement ); + return static_cast< Variation >( m_bits.variation ); } -inline void QskAspect::setPlacement( Placement placement ) noexcept +inline void QskAspect::setVariation( Variation variation ) noexcept { - m_bits.placement = placement; + m_bits.variation = variation; } inline constexpr QskAspect operator|( @@ -559,9 +559,9 @@ inline constexpr QskAspect operator|( } inline constexpr QskAspect operator|( - QskAspect::Placement placement, const QskAspect& aspect ) noexcept + QskAspect::Variation variation, const QskAspect& aspect ) noexcept { - return aspect | placement; + return aspect | variation; } inline constexpr QskAspect operator|( @@ -601,15 +601,15 @@ inline constexpr QskAspect operator|( } inline constexpr QskAspect operator|( - QskAspect::Type type, QskAspect::Placement placement ) noexcept + QskAspect::Type type, QskAspect::Variation variation ) noexcept { - return QskAspect( type ) | placement; + return QskAspect( type ) | variation; } inline constexpr QskAspect operator|( - QskAspect::Placement placement, QskAspect::Type type ) noexcept + QskAspect::Variation variation, QskAspect::Type type ) noexcept { - return type | placement; + return type | variation; } inline constexpr QskAspect operator|( @@ -637,15 +637,15 @@ inline constexpr QskAspect operator|( } inline constexpr QskAspect operator|( - QskAspect::Subcontrol subControl, QskAspect::Placement placement ) noexcept + QskAspect::Subcontrol subControl, QskAspect::Variation variation ) noexcept { - return QskAspect( subControl ) | placement; + return QskAspect( subControl ) | variation; } inline constexpr QskAspect operator|( - QskAspect::Placement placement, QskAspect::Subcontrol subControl ) noexcept + QskAspect::Variation variation, QskAspect::Subcontrol subControl ) noexcept { - return subControl | placement; + return subControl | variation; } namespace std @@ -672,7 +672,7 @@ QSK_EXPORT QDebug operator<<( QDebug, QskAspect ); QSK_EXPORT QDebug operator<<( QDebug, QskAspect::Type ); QSK_EXPORT QDebug operator<<( QDebug, QskAspect::Subcontrol ); QSK_EXPORT QDebug operator<<( QDebug, QskAspect::Primitive ); -QSK_EXPORT QDebug operator<<( QDebug, QskAspect::Placement ); +QSK_EXPORT QDebug operator<<( QDebug, QskAspect::Variation ); QSK_EXPORT QDebug operator<<( QDebug, QskAspect::States ); QSK_EXPORT void qskDebugStates( QDebug, const QMetaObject*, QskAspect::States ); diff --git a/src/controls/QskPageIndicator.cpp b/src/controls/QskPageIndicator.cpp index 9316d9a2..74138873 100644 --- a/src/controls/QskPageIndicator.cpp +++ b/src/controls/QskPageIndicator.cpp @@ -162,9 +162,9 @@ int QskPageIndicator::indexAtPosition( const QPointF& pos ) const this, contentsRect(), QskPageIndicator::Bullet, pos ); } -QskAspect::Placement QskPageIndicator::effectivePlacement() const +QskAspect::Variation QskPageIndicator::effectiveVariation() const { - return static_cast< QskAspect::Placement >( m_data->orientation ); + return static_cast< QskAspect::Variation >( m_data->orientation ); } void QskPageIndicator::mousePressEvent( QMouseEvent* event ) diff --git a/src/controls/QskPageIndicator.h b/src/controls/QskPageIndicator.h index eeaeecfd..1ee919eb 100644 --- a/src/controls/QskPageIndicator.h +++ b/src/controls/QskPageIndicator.h @@ -42,7 +42,7 @@ class QSK_EXPORT QskPageIndicator : public QskControl QRectF bulletRect( int index ) const; int indexAtPosition( const QPointF& ) const; - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; Q_SIGNALS: void countChanged( int ); diff --git a/src/controls/QskProgressBar.cpp b/src/controls/QskProgressBar.cpp index 3acc736c..a9f01b13 100644 --- a/src/controls/QskProgressBar.cpp +++ b/src/controls/QskProgressBar.cpp @@ -154,10 +154,10 @@ void QskProgressBar::setIndeterminate( bool on ) Q_EMIT indeterminateChanged( on ); } -QskAspect::Placement QskProgressBar::effectivePlacement() const +QskAspect::Variation QskProgressBar::effectiveVariation() const { // so you can define different hints depending on the orientation - return static_cast< QskAspect::Placement >( m_data->orientation ); + return static_cast< QskAspect::Variation >( m_data->orientation ); } void QskProgressBar::setBarGradient( const QskGradient& gradient ) diff --git a/src/controls/QskProgressBar.h b/src/controls/QskProgressBar.h index b24a271c..0d5fa299 100644 --- a/src/controls/QskProgressBar.h +++ b/src/controls/QskProgressBar.h @@ -49,7 +49,7 @@ class QSK_EXPORT QskProgressBar : public QskBoundedControl bool isIndeterminate() const; void setIndeterminate( bool on = true ); - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; void setBarGradient( const QskGradient& ); void resetBarGradient(); diff --git a/src/controls/QskPushButton.cpp b/src/controls/QskPushButton.cpp index 36f74b16..798d4562 100644 --- a/src/controls/QskPushButton.cpp +++ b/src/controls/QskPushButton.cpp @@ -225,9 +225,9 @@ void QskPushButton::updateResources() m_data->ensureGraphic( this ); } -QskAspect::Placement QskPushButton::effectivePlacement() const +QskAspect::Variation QskPushButton::effectiveVariation() const { - return Inherited::effectivePlacement(); + return Inherited::effectiveVariation(); } QRectF QskPushButton::layoutRectForSize( const QSizeF& size ) const diff --git a/src/controls/QskPushButton.h b/src/controls/QskPushButton.h index 31b83c0d..22164370 100644 --- a/src/controls/QskPushButton.h +++ b/src/controls/QskPushButton.h @@ -73,7 +73,7 @@ class QSK_EXPORT QskPushButton : public QskAbstractButton QFont font() const; QRectF layoutRectForSize( const QSizeF& ) const override; - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; public Q_SLOTS: void setText( const QString& ); diff --git a/src/controls/QskSegmentedBar.cpp b/src/controls/QskSegmentedBar.cpp index c31fe12e..3d9f92de 100644 --- a/src/controls/QskSegmentedBar.cpp +++ b/src/controls/QskSegmentedBar.cpp @@ -159,9 +159,9 @@ QVariantList QskSegmentedBar::optionAt( int index ) const return list; } -QskAspect::Placement QskSegmentedBar::effectivePlacement() const +QskAspect::Variation QskSegmentedBar::effectiveVariation() const { - return static_cast< QskAspect::Placement >( m_data->orientation ); + return static_cast< QskAspect::Variation >( m_data->orientation ); } void QskSegmentedBar::mousePressEvent( QMouseEvent* event ) diff --git a/src/controls/QskSegmentedBar.h b/src/controls/QskSegmentedBar.h index c726ba25..fb65c577 100644 --- a/src/controls/QskSegmentedBar.h +++ b/src/controls/QskSegmentedBar.h @@ -63,7 +63,7 @@ class QSK_EXPORT QskSegmentedBar : public QskControl int indexAtPosition( const QPointF& ) const; QRectF focusIndicatorRect() const override final; - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; public Q_SLOTS: void setSelectedIndex( int index ); diff --git a/src/controls/QskSeparator.cpp b/src/controls/QskSeparator.cpp index 8d789c67..04a014d8 100644 --- a/src/controls/QskSeparator.cpp +++ b/src/controls/QskSeparator.cpp @@ -70,9 +70,9 @@ qreal QskSeparator::extent() const return metric( Panel | QskAspect::Size ); } -QskAspect::Placement QskSeparator::effectivePlacement() const +QskAspect::Variation QskSeparator::effectiveVariation() const { - return static_cast< QskAspect::Placement >( m_orientation ); + return static_cast< QskAspect::Variation >( m_orientation ); } #include "moc_QskSeparator.cpp" diff --git a/src/controls/QskSeparator.h b/src/controls/QskSeparator.h index f9c2f71b..a948d712 100644 --- a/src/controls/QskSeparator.h +++ b/src/controls/QskSeparator.h @@ -35,7 +35,7 @@ class QSK_EXPORT QskSeparator : public QskControl void resetExtent(); qreal extent() const; - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; Q_SIGNALS: void orientationChanged( Qt::Orientation ); diff --git a/src/controls/QskSkinHintTable.cpp b/src/controls/QskSkinHintTable.cpp index 4db0c557..6301f644 100644 --- a/src/controls/QskSkinHintTable.cpp +++ b/src/controls/QskSkinHintTable.cpp @@ -47,11 +47,11 @@ inline const QVariant* qskResolvedHint( QskAspect aspect, } #endif - if ( aspect.placement() ) + if ( aspect.variation() ) { - // clear the placement bits and restart + // clear the variation bits and restart aspect = a; - aspect.setPlacement( QskAspect::NoPlacement ); + aspect.setVariation( QskAspect::NoVariation ); continue; } @@ -285,15 +285,15 @@ bool QskSkinHintTable::isResolutionMatching( if ( s1 == 0 ) { - if ( aspect1.placement() == QskAspect::NoPlacement ) + if ( aspect1.variation() == QskAspect::NoVariation ) return true; - // clear the placement bits and restart with the initial state + // clear the variation bits and restart with the initial state aspect1 = a1; - aspect1.setPlacement( QskAspect::NoPlacement ); + aspect1.setVariation( QskAspect::NoVariation ); aspect2 = a2; - aspect2.setPlacement( QskAspect::NoPlacement ); + aspect2.setVariation( QskAspect::NoVariation ); } } else diff --git a/src/controls/QskSkinTransition.cpp b/src/controls/QskSkinTransition.cpp index 8ca0158b..fe478d82 100644 --- a/src/controls/QskSkinTransition.cpp +++ b/src/controls/QskSkinTransition.cpp @@ -347,7 +347,7 @@ void WindowAnimator::addHints( const QskControl* control, if ( !isControlAffected( control, subControls, aspect ) ) continue; - aspect.setPlacement( control->effectivePlacement() ); + aspect.setVariation( control->effectiveVariation() ); aspect.setStates( control->skinStates() ); if ( localTable.resolvedHint( aspect ) ) @@ -365,8 +365,8 @@ void WindowAnimator::addHints( const QskControl* control, { if ( QskVariantAnimator::maybeInterpolate( *v1, *v2 ) ) { - if ( r1.placement() == r2.placement() ) - aspect.setPlacement( r2.placement() ); + if ( r1.variation() == r2.variation() ) + aspect.setVariation( r2.variation() ); if ( r1.states() == r2.states() ) aspect.setStates( r2.states() ); @@ -377,7 +377,7 @@ void WindowAnimator::addHints( const QskControl* control, } else if ( v1 ) { - aspect.setPlacement( r1.placement() ); + aspect.setVariation( r1.variation() ); aspect.setStates( r1.states() ); storeAnimator( control, aspect, *v1, QVariant(), animatorHint ); @@ -385,7 +385,7 @@ void WindowAnimator::addHints( const QskControl* control, } else if ( v2 ) { - aspect.setPlacement( r1.placement() ); + aspect.setVariation( r1.variation() ); aspect.setStates( r1.states() ); storeAnimator( control, aspect, QVariant(), *v2, animatorHint ); diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 81e99c60..c5e9b243 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -725,7 +725,7 @@ QskColorFilter QskSkinnable::effectiveGraphicFilter( QskAspect aspect( effectiveSubcontrol( subControl ) | QskAspect::GraphicRole ); aspect.setSection( section() ); - aspect.setPlacement( effectivePlacement() ); + aspect.setVariation( effectiveVariation() ); QskSkinHintStatus status; @@ -735,7 +735,7 @@ QskColorFilter QskSkinnable::effectiveGraphicFilter( aspect.setSubcontrol( status.aspect.subControl() ); aspect.setSection( QskAspect::Body ); - aspect.setPlacement( QskAspect::NoPlacement ); + aspect.setVariation( QskAspect::NoVariation ); const auto v = animatedHint( aspect, nullptr ); @@ -877,8 +877,8 @@ QVariant QskSkinnable::effectiveSkinHint( if ( aspect.section() == QskAspect::Body ) aspect.setSection( section() ); - if ( aspect.placement() == QskAspect::NoPlacement ) - aspect.setPlacement( effectivePlacement() ); + if ( aspect.variation() == QskAspect::NoVariation ) + aspect.setVariation( effectiveVariation() ); if ( !aspect.hasStates() ) aspect.setStates( skinStates() ); @@ -980,11 +980,11 @@ QVariant QskSkinnable::interpolatedHint( continue; } - if ( aspect.placement() ) + if ( aspect.variation() ) { - // clear the placement bits and restart + // clear the variation bits and restart aspect = a; - aspect.setPlacement( QskAspect::NoPlacement ); + aspect.setVariation( QskAspect::NoVariation ); continue; } @@ -1257,7 +1257,7 @@ void QskSkinnable::startHintTransition( QskAspect aspect, int index, aspect.clearStates(); aspect.setSection( QskAspect::Body ); - aspect.setPlacement( QskAspect::NoPlacement ); + aspect.setVariation( QskAspect::NoVariation ); aspect.setAnimator( false ); #if DEBUG_ANIMATOR @@ -1345,7 +1345,7 @@ bool QskSkinnable::startHintTransitions( bool started = false; // at least one transition has been started QskAspect aspect; - aspect.setPlacement( effectivePlacement() ); + aspect.setVariation( effectiveVariation() ); aspect.setSection( section() ); const auto skin = effectiveSkin(); @@ -1426,9 +1426,9 @@ QskSkin* QskSkinnable::effectiveSkin() const return skin ? skin : qskSetup->skin(); } -QskAspect::Placement QskSkinnable::effectivePlacement() const +QskAspect::Variation QskSkinnable::effectiveVariation() const { - return QskAspect::NoPlacement; + return QskAspect::NoVariation; } QskAspect::Section QskSkinnable::section() const diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index e09bb84c..a5ab3aac 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -101,7 +101,7 @@ class QSK_EXPORT QskSkinnable QskAspect::States, QskSkinHintStatus* status = nullptr ) const; QVariant effectiveSkinHint( QskAspect, QskSkinHintStatus* = nullptr ) const; - virtual QskAspect::Placement effectivePlacement() const; + virtual QskAspect::Variation effectiveVariation() const; virtual QskAspect::Section section() const; diff --git a/src/controls/QskSlider.cpp b/src/controls/QskSlider.cpp index 08226db5..61f84a33 100644 --- a/src/controls/QskSlider.cpp +++ b/src/controls/QskSlider.cpp @@ -87,9 +87,9 @@ Qt::Orientation QskSlider::orientation() const return m_data->orientation; } -QskAspect::Placement QskSlider::effectivePlacement() const +QskAspect::Variation QskSlider::effectiveVariation() const { - return static_cast< QskAspect::Placement >( m_data->orientation ); + return static_cast< QskAspect::Variation >( m_data->orientation ); } void QskSlider::setTracking( bool on ) diff --git a/src/controls/QskSlider.h b/src/controls/QskSlider.h index 45c39a9b..fe75294a 100644 --- a/src/controls/QskSlider.h +++ b/src/controls/QskSlider.h @@ -41,7 +41,7 @@ class QSK_EXPORT QskSlider : public QskBoundedValueInput qreal handlePosition() const; // [0,0, 1.0] - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; Q_SIGNALS: void pressedChanged( bool ); diff --git a/src/controls/QskSwitchButton.cpp b/src/controls/QskSwitchButton.cpp index 78700579..c0b28d3c 100644 --- a/src/controls/QskSwitchButton.cpp +++ b/src/controls/QskSwitchButton.cpp @@ -72,13 +72,9 @@ void QskSwitchButton::setInverted( bool on ) } } -QskAspect::Placement QskSwitchButton::effectivePlacement() const +QskAspect::Variation QskSwitchButton::effectiveVariation() const { - /* - So you can define different hints depending on the orientation, - but what about the layoutDirection ??? - */ - return static_cast< QskAspect::Placement >( m_data->orientation ); + return static_cast< QskAspect::Variation >( m_data->orientation ); } #include "moc_QskSwitchButton.cpp" diff --git a/src/controls/QskSwitchButton.h b/src/controls/QskSwitchButton.h index c88da791..067d2638 100644 --- a/src/controls/QskSwitchButton.h +++ b/src/controls/QskSwitchButton.h @@ -32,7 +32,7 @@ class QSK_EXPORT QskSwitchButton : public QskAbstractButton bool isInverted() const; void setInverted( bool ); - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; Q_SIGNALS: void orientationChanged( Qt::Orientation ); diff --git a/src/controls/QskTabBar.cpp b/src/controls/QskTabBar.cpp index b068e4f8..4c3be246 100644 --- a/src/controls/QskTabBar.cpp +++ b/src/controls/QskTabBar.cpp @@ -688,7 +688,7 @@ QskAspect::Subcontrol QskTabBar::substitutedSubcontrol( return Inherited::substitutedSubcontrol( subControl ); } -QskAspect::Placement QskTabBar::effectivePlacement() const +QskAspect::Variation QskTabBar::effectiveVariation() const { switch ( edge() ) { @@ -705,7 +705,7 @@ QskAspect::Placement QskTabBar::effectivePlacement() const return QskAspect::Bottom; } - return QskAspect::NoPlacement; + return QskAspect::NoVariation; } #include "moc_QskTabBar.cpp" diff --git a/src/controls/QskTabBar.h b/src/controls/QskTabBar.h index c54337e0..9a5b58cf 100644 --- a/src/controls/QskTabBar.h +++ b/src/controls/QskTabBar.h @@ -89,7 +89,7 @@ class QSK_EXPORT QskTabBar : public QskBox int indexOf( const QskTabButton* ) const; Q_INVOKABLE int indexOf( QskTabButton* ) const; - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; public Q_SLOTS: void setCurrentIndex( int index ); diff --git a/src/controls/QskTabButton.cpp b/src/controls/QskTabButton.cpp index 20b4167c..f77012f7 100644 --- a/src/controls/QskTabButton.cpp +++ b/src/controls/QskTabButton.cpp @@ -98,12 +98,12 @@ QRectF QskTabButton::layoutRectForSize( const QSizeF& size ) const return subControlContentsRect( size, Panel ); } -QskAspect::Placement QskTabButton::effectivePlacement() const +QskAspect::Variation QskTabButton::effectiveVariation() const { if ( m_data->tabBar ) - return m_data->tabBar->effectivePlacement(); + return m_data->tabBar->effectiveVariation(); - return QskAspect::NoPlacement; + return QskAspect::NoVariation; } const QskTabBar* QskTabButton::tabBar() const diff --git a/src/controls/QskTabButton.h b/src/controls/QskTabButton.h index f59384ec..b2ead21f 100644 --- a/src/controls/QskTabButton.h +++ b/src/controls/QskTabButton.h @@ -41,7 +41,7 @@ class QSK_EXPORT QskTabButton : public QskAbstractButton QRectF layoutRectForSize( const QSizeF& ) const override; - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; const QskTabBar* tabBar() const; QskTabBar* tabBar(); diff --git a/src/controls/QskTabView.cpp b/src/controls/QskTabView.cpp index af9c4cad..cea5d604 100644 --- a/src/controls/QskTabView.cpp +++ b/src/controls/QskTabView.cpp @@ -206,9 +206,9 @@ int QskTabView::count() const return m_data->tabBar->count(); } -QskAspect::Placement QskTabView::effectivePlacement() const +QskAspect::Variation QskTabView::effectiveVariation() const { - return m_data->tabBar->effectivePlacement(); + return m_data->tabBar->effectiveVariation(); } QSizeF QskTabView::layoutSizeHint( diff --git a/src/controls/QskTabView.h b/src/controls/QskTabView.h index 133220d2..f4a9b8af 100644 --- a/src/controls/QskTabView.h +++ b/src/controls/QskTabView.h @@ -73,7 +73,7 @@ class QSK_EXPORT QskTabView : public QskControl QRectF tabRect() const; - QskAspect::Placement effectivePlacement() const override; + QskAspect::Variation effectiveVariation() const override; public Q_SLOTS: void setCurrentIndex( int index );