diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp index 26a2401d..104272d6 100644 --- a/skins/material3/QskMaterial3Skin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -471,35 +471,37 @@ void Editor::setupRadioBox() using Q = QskRadioBox; using A = QskAspect; + setAnimation( Q::Ripple | A::Metric | A::Position, qskDuration ); + setSpacing(Q::Panel, 10_dp); setStrutSize( Q::Button, { 20_dp, 20_dp }); setStrutSize( Q::Symbol, { 10_dp, 10_dp }); setStrutSize( Q::Ripple, { 40_dp, 40_dp }); + + setMargin( Q::Button, QskMargins( 10_dp, 0, 10, 0)); + setMargin( Q::Text, QskMargins( 10_dp, 0, 0, 0 )); + setAlignment( Q::Text, Qt::AlignBottom ); setBoxShape(Q::Button, 20_dp); setBoxShape(Q::Ripple, 40_dp); setBoxBorderMetrics( Q::Button, 2_dp ); - setBoxBorderColors( Q::Button, m_pal.onBackground ); - setBoxBorderColors( Q::Button | Q::Selected, m_pal.primary ); - setColor( Q::Text, m_pal.onBackground ); setColor( Q::Symbol, m_pal.primary ); setColor( Q::Ripple, stateLayerColor( m_pal.onSurface, m_pal.focusOpacity ) ); - setColor( Q::Ripple | Q::Selected, stateLayerColor( m_pal.primary, m_pal.focusOpacity ) ); + // Selected + setColor( Q::Ripple | Q::Selected, + stateLayerColor( m_pal.primary, m_pal.focusOpacity ) ); + setBoxBorderColors( Q::Button | Q::Selected, m_pal.primary ); + + // Disabled setBoxBorderColors( Q::Button | Q::Disabled, m_pal.onSurface38 ); setBoxBorderColors( Q::Button | Q::Disabled | Q::Selected, m_pal.onSurface38 ); setColor( Q::Text | Q::Disabled, m_pal.onSurface38 ); - setColor( Q::Symbol | Q::Disabled, m_pal.onSurface38 ); - setMargin( Q::Text, QskMargins( 10_dp, 0, 10_dp, 0 )); - - setAlignment( Q::Text, Qt::AlignBottom ); - - setAnimation( Q::Ripple | A::Metric | A::Position, qskDuration ); } void Editor::setupFocusIndicator()