diff --git a/examples/gallery/icons/airport_shuttle.svg b/examples/gallery/icons/airport_shuttle.svg
index 77c8c91c..2bb059f5 100644
--- a/examples/gallery/icons/airport_shuttle.svg
+++ b/examples/gallery/icons/airport_shuttle.svg
@@ -1,4 +1,4 @@
diff --git a/examples/gallery/icons/flight.svg b/examples/gallery/icons/flight.svg
index e58b8009..dc1051bb 100644
--- a/examples/gallery/icons/flight.svg
+++ b/examples/gallery/icons/flight.svg
@@ -1,4 +1,4 @@
diff --git a/examples/gallery/icons/local_pizza.svg b/examples/gallery/icons/local_pizza.svg
index 64f80fc5..3a6569dd 100644
--- a/examples/gallery/icons/local_pizza.svg
+++ b/examples/gallery/icons/local_pizza.svg
@@ -1,4 +1,4 @@
diff --git a/examples/gallery/icons/plus.svg b/examples/gallery/icons/plus.svg
index ac5859d3..6a19322e 100644
--- a/examples/gallery/icons/plus.svg
+++ b/examples/gallery/icons/plus.svg
@@ -1,4 +1,4 @@
diff --git a/examples/gallery/icons/qvg/airport_shuttle.qvg b/examples/gallery/icons/qvg/airport_shuttle.qvg
index b52ec830..fe2cb660 100644
Binary files a/examples/gallery/icons/qvg/airport_shuttle.qvg and b/examples/gallery/icons/qvg/airport_shuttle.qvg differ
diff --git a/examples/gallery/icons/qvg/flight.qvg b/examples/gallery/icons/qvg/flight.qvg
index d31dd2de..c4d0cd47 100644
Binary files a/examples/gallery/icons/qvg/flight.qvg and b/examples/gallery/icons/qvg/flight.qvg differ
diff --git a/examples/gallery/icons/qvg/local_pizza.qvg b/examples/gallery/icons/qvg/local_pizza.qvg
index 61967c8f..84289057 100644
Binary files a/examples/gallery/icons/qvg/local_pizza.qvg and b/examples/gallery/icons/qvg/local_pizza.qvg differ
diff --git a/examples/gallery/icons/qvg/plus.qvg b/examples/gallery/icons/qvg/plus.qvg
index 6d3d6d42..ce9688d9 100644
Binary files a/examples/gallery/icons/qvg/plus.qvg and b/examples/gallery/icons/qvg/plus.qvg differ
diff --git a/examples/gallery/icons/qvg/sports_soccer.qvg b/examples/gallery/icons/qvg/sports_soccer.qvg
index 52557da2..cbf98807 100644
Binary files a/examples/gallery/icons/qvg/sports_soccer.qvg and b/examples/gallery/icons/qvg/sports_soccer.qvg differ
diff --git a/examples/gallery/icons/sports_soccer.svg b/examples/gallery/icons/sports_soccer.svg
index 5aabceb6..43daf268 100644
--- a/examples/gallery/icons/sports_soccer.svg
+++ b/examples/gallery/icons/sports_soccer.svg
@@ -1,4 +1,4 @@
diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp
index a944d31c..646a36f6 100644
--- a/skins/material3/QskMaterial3Skin.cpp
+++ b/skins/material3/QskMaterial3Skin.cpp
@@ -1408,7 +1408,7 @@ void QskMaterial3Skin::setGraphicColor( GraphicRole role, QRgb rgb )
{
QskColorFilter colorFilter;
colorFilter.setMask( QskRgb::RGBAMask );
- colorFilter.addColorSubstitution( QskRgb::White, rgb );
+ colorFilter.addColorSubstitution( QskRgb::Black, rgb );
setGraphicFilter( role, colorFilter );
}
diff --git a/skins/material3/icons/check_small.svg b/skins/material3/icons/check_small.svg
index 3fce0e84..e7a84071 100644
--- a/skins/material3/icons/check_small.svg
+++ b/skins/material3/icons/check_small.svg
@@ -1,4 +1,4 @@
diff --git a/skins/material3/icons/combo-box-arrow-closed.svg b/skins/material3/icons/combo-box-arrow-closed.svg
index 2937c960..c288b426 100644
--- a/skins/material3/icons/combo-box-arrow-closed.svg
+++ b/skins/material3/icons/combo-box-arrow-closed.svg
@@ -1,4 +1,4 @@
diff --git a/skins/material3/icons/combo-box-arrow-open.svg b/skins/material3/icons/combo-box-arrow-open.svg
index fbc7b469..4138c2cd 100644
--- a/skins/material3/icons/combo-box-arrow-open.svg
+++ b/skins/material3/icons/combo-box-arrow-open.svg
@@ -1,4 +1,4 @@
diff --git a/skins/material3/icons/qvg/check_small.qvg b/skins/material3/icons/qvg/check_small.qvg
index 19ae6901..ea738b86 100644
Binary files a/skins/material3/icons/qvg/check_small.qvg and b/skins/material3/icons/qvg/check_small.qvg differ
diff --git a/skins/material3/icons/qvg/combo-box-arrow-closed.qvg b/skins/material3/icons/qvg/combo-box-arrow-closed.qvg
index 273f5a09..2585b892 100644
Binary files a/skins/material3/icons/qvg/combo-box-arrow-closed.qvg and b/skins/material3/icons/qvg/combo-box-arrow-closed.qvg differ
diff --git a/skins/material3/icons/qvg/combo-box-arrow-open.qvg b/skins/material3/icons/qvg/combo-box-arrow-open.qvg
index 88e44ca4..6ddcf6c0 100644
Binary files a/skins/material3/icons/qvg/combo-box-arrow-open.qvg and b/skins/material3/icons/qvg/combo-box-arrow-open.qvg differ
diff --git a/skins/material3/icons/qvg/segmented-button-check.qvg b/skins/material3/icons/qvg/segmented-button-check.qvg
index b9c74eea..fa0e1ce2 100644
Binary files a/skins/material3/icons/qvg/segmented-button-check.qvg and b/skins/material3/icons/qvg/segmented-button-check.qvg differ
diff --git a/skins/material3/icons/segmented-button-check.svg b/skins/material3/icons/segmented-button-check.svg
index 5d4b949b..b0b66ac9 100644
--- a/skins/material3/icons/segmented-button-check.svg
+++ b/skins/material3/icons/segmented-button-check.svg
@@ -1,4 +1,4 @@
diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp
index 64806af2..8c92d590 100644
--- a/skins/squiek/QskSquiekSkin.cpp
+++ b/skins/squiek/QskSquiekSkin.cpp
@@ -181,7 +181,8 @@ namespace
enum ColorRole
{
- DisabledColor = 1
+ DisabledSymbol = 1,
+ CursorSymbol
};
}
@@ -383,6 +384,10 @@ void Editor::setupMenu()
setColor( Q::Text | Q::Selected, m_pal.highlightedText );
setFontRole( Q::Text, QskSkin::SmallFont );
+ setStrutSize( Q::Graphic, 16, 16 );
+ setGraphicRole( Q::Graphic | Q::Disabled, DisabledSymbol );
+ setGraphicRole( Q::Graphic | Q::Selected, CursorSymbol );
+
setPosition( Q::Panel, 0 );
setPosition( Q::Panel | QskPopup::Closed, 1 );
@@ -559,8 +564,9 @@ void Editor::setupSegmentedBar()
{
// Graphic
+ setGraphicRole( Q::Graphic | Q::Disabled, DisabledSymbol );
+ setGraphicRole( Q::Graphic | Q::Selected, CursorSymbol );
#if 0
- setGraphicRole( Q::Graphic, ... );
setStrutSize( Q::Graphic, ... );
#endif
}
@@ -1074,7 +1080,7 @@ void Editor::setupSpinBox()
for ( auto subControl : { Q::UpIndicator, Q::DownIndicator } )
{
- setGraphicRole( subControl | Q::Disabled, DisabledColor );
+ setGraphicRole( subControl | Q::Disabled, DisabledSymbol );
setAlignment( subControl, Qt::AlignCenter );
setAnimation( subControl | A::Color, 100 );
@@ -1137,9 +1143,12 @@ QskSquiekSkin::QskSquiekSkin( QObject* parent )
{
setupFonts( QStringLiteral( "DejaVuSans" ) );
- addGraphicRole( DisabledColor, m_data->palette.lighter150 );
+ const auto& pal = m_data->palette;
- Editor editor( &hintTable(), m_data->palette );
+ addGraphicRole( DisabledSymbol, pal.lighter150 );
+ addGraphicRole( CursorSymbol, pal.highlightedText );
+
+ Editor editor( &hintTable(), pal );
editor.setup();
}