From c8f28c05dcac77292200bfbdc36d7dc310951f40 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 5 Jul 2022 10:32:05 +0200 Subject: [PATCH] style check box --- skins/material3/QskMaterial3Skin.cpp | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp index a8adbde7..594fd377 100644 --- a/skins/material3/QskMaterial3Skin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -155,26 +155,28 @@ void Editor::setupCheckBox() using A = QskAspect; using Q = QskCheckBox; - setStrutSize( Q::Panel, 24, 24 ); + setSpacing( Q::Panel, 10 ); - setPadding( Q::Panel, 6 ); - setBoxShape( Q::Panel, 2 ); - setBoxBorderMetrics( Q::Panel, 2 ); - setBoxBorderColors( Q::Panel, m_pal.onBackground ); - setBoxBorderMetrics( Q::Panel | Q::Checked, 0 ); + setStrutSize( Q::Box, 24, 24 ); - setGradient( Q::Panel, m_pal.background ); - setGradient( Q::Panel | Q::Checked, m_pal.primary ); + setPadding( Q::Box, 6 ); + setBoxShape( Q::Box, 2 ); + setBoxBorderMetrics( Q::Box, 2 ); + setBoxBorderColors( Q::Box, m_pal.onBackground ); + setBoxBorderMetrics( Q::Box | Q::Checked, 0 ); - setGradient( Q::Panel | Q::Disabled, m_pal.surfaceVariant12 ); + setGradient( Q::Box, m_pal.background ); + setGradient( Q::Box | Q::Checked, m_pal.primary ); + setGradient( Q::Box | Q::Disabled, m_pal.surfaceVariant12 ); + setGradient( Q::Box | Q::Checked | Q::Disabled, m_pal.onSurface12 ); - setGradient( Q::Panel | Q::Checked | Q::Disabled, m_pal.onSurface12 ); - - - setColor( Q::Indicator | Q::Checked, m_pal.primaryContainer ); + setColor( Q::Indicator, m_pal.background ); + setColor( Q::Indicator | Q::Checked, m_pal.onPrimary ); setColor( Q::Indicator | Q::Checked | Q::Disabled, m_pal.onSurface38 ); - setAnimation( Q::Panel | A::Color, qskDuration ); + setColor( Q::Text, m_pal.onBackground ); + + setAnimation( Q::Box | A::Color, qskDuration ); } void Editor::setupBox()