From 4e581486c385db0604491cf77eb0f7bc2738c52f Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Fri, 17 Jun 2022 12:50:35 +0200 Subject: [PATCH] style segmented bar some more --- skins/material/QskMaterialSkin.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/skins/material/QskMaterialSkin.cpp b/skins/material/QskMaterialSkin.cpp index df439d81..3f35e48b 100644 --- a/skins/material/QskMaterialSkin.cpp +++ b/skins/material/QskMaterialSkin.cpp @@ -332,6 +332,8 @@ void Editor::setupSegmentedBar() using A = QskAspect; using Q = QskSegmentedBar; + const QSize strutSize( -1, 40 ); + { // Panel @@ -343,8 +345,6 @@ void Editor::setupSegmentedBar() setBoxBorderMetrics( Q::Panel, 1 ); setBoxBorderColors( Q::Panel, m_pal.outline ); - const QSize strutSize( qskDpiScaled( -1 ), qskDpiScaled( 40 ) ); - setStrutSize( Q::Panel | A::Horizontal, strutSize ); setStrutSize( Q::Panel | A::Vertical, strutSize.transposed() ); } @@ -353,10 +353,16 @@ void Editor::setupSegmentedBar() // Segment setGradient( Q::Segment, Qt::transparent ); + setPadding( Q::Segment, 0 ); + } - // ### resolve this problem: -// setBoxBorderMetrics( Q::Segment, 0, 0, 1, 0 ); -// setBoxBorderColors( Q::Segment, m_pal.outline ); + { + // Separator + + setStrutSize( Q::Separator | A::Horizontal, 1, strutSize.height() ); + setStrutSize( Q::Separator | A::Vertical, strutSize.height(), 1 ); + setPadding( Q::Separator, 0 ); + setGradient( Q::Separator, m_pal.outline ); } { @@ -381,6 +387,8 @@ void Editor::setupSegmentedBar() { // Text + setFontRole( Q::Text, QskMaterialSkin::M3LabelLarge ); + setColor( Q::Text, m_pal.onSurface ); setColor( Q::Text | Q::Selected, m_pal.onSecondaryContainer ); }