From ed767b91610b10ec9100799bec0cbf1dadbf7295 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 5 Jul 2022 11:44:19 +0200 Subject: [PATCH] style buttons when hovered, focused and pressed --- skins/material3/QskMaterial3Skin.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp index 594fd377..3eca297d 100644 --- a/skins/material3/QskMaterial3Skin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -460,12 +460,19 @@ void Editor::setupPushButton() setGradient( Q::Panel, m_pal.primary ); setGradient( Q::Panel | Q::Disabled, m_pal.onSurface12 ); - setColor( Q::Text, m_pal.onPrimary ); - setColor( Q::Text | Q::Disabled, m_pal.onSurface38 ); - + QColor hoverColor = flattenedColor( m_pal.onPrimary, m_pal.primary, 0.08 ); + setGradient( Q::Panel | Q::Hovered, hoverColor ); setShadowMetrics( Q::Panel | Q::Hovered, m_pal.elevationLight1 ); setShadowColor( Q::Panel | Q::Hovered, m_pal.shadow ); + QColor focusColor = flattenedColor( m_pal.onPrimary, m_pal.primary, 0.12 ); + setGradient( Q::Panel | Q::Focused, focusColor ); + + setGradient( Q::Panel | Q::Pressed, focusColor ); + + setColor( Q::Text, m_pal.onPrimary ); + setColor( Q::Text | Q::Disabled, m_pal.onSurface38 ); + setAnimation( Q::Panel | A::Color, qskDuration ); setAnimation( Q::Panel | A::Metric, qskDuration ); setAnimation( Q::Text | A::Color, qskDuration );