From 595c7ec5f2337644fa4f473a323f10eae6aa840e Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Thu, 2 Jun 2022 14:20:40 +0200 Subject: [PATCH] fixup --- examples/boxes/Box.cpp | 10 +-- examples/boxes/main.cpp | 84 +++++++++---------- .../gallery/progressbar/ProgressBarPage.cpp | 20 ++--- examples/tabview/CustomSlider.cpp | 8 +- examples/tabview/CustomSliderSkinlet.cpp | 2 +- examples/tabview/OtherSlider.cpp | 8 +- skins/material/QskMaterialSkinFactory.cpp | 2 +- skins/squiek/QskSquiekSkin.cpp | 2 +- 8 files changed, 68 insertions(+), 68 deletions(-) diff --git a/examples/boxes/Box.cpp b/examples/boxes/Box.cpp index a1de2035..4492ee13 100644 --- a/examples/boxes/Box.cpp +++ b/examples/boxes/Box.cpp @@ -32,8 +32,8 @@ void Box::setBackground( FillType type, QskRgbPalette::Theme theme, bool inverte const auto pal = QskRgbPalette::palette( theme ); - const QColor light = pal.color( QskRgbPalette::W300 ); - const QColor mid = pal.color( QskRgbPalette::W600 ); + const QColor light = pal.color( QskRgbPalette::W60 ); + const QColor mid = pal.color( QskRgbPalette::W30 ); switch ( type ) { @@ -64,9 +64,9 @@ void Box::setBorder( BorderType type, QskRgbPalette::Theme theme ) setBorderWidth( 5 ); - QColor dark = pal.color( QskRgbPalette::W700 ); - QColor mid = pal.color( QskRgbPalette::W500 ); - QColor light = pal.color( QskRgbPalette::W300 ); + QColor dark = pal.color( QskRgbPalette::W30 ); + QColor mid = pal.color( QskRgbPalette::W50 ); + QColor light = pal.color( QskRgbPalette::W70 ); #if 0 dark.setAlpha( 100 ); mid.setAlpha( 100 ); diff --git a/examples/boxes/main.cpp b/examples/boxes/main.cpp index 95261fc2..50fa82ba 100644 --- a/examples/boxes/main.cpp +++ b/examples/boxes/main.cpp @@ -55,7 +55,7 @@ static void addTestRectangle( QskLinearBox* parent ) auto box = new Box( parent ); box->setMargins( 50 ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); box->setBorderWidth( 10, 20, 40, 20 ); QskBoxShapeMetrics shape( 50, Qt::RelativeSize ); @@ -63,7 +63,7 @@ static void addTestRectangle( QskLinearBox* parent ) shape.setRadius( Qt::TopRightCorner, 70 ); box->setShape( shape ); - box->setGradient( QskGradient::Diagonal, QskRgbPalette::Blue ); + box->setGradient( QskGradient::Diagonal, QskRgbPalette::DefaultMaterialSecondary ); } static void addRectangles1( QskLinearBox* parent ) @@ -72,7 +72,7 @@ static void addRectangles1( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* rectangle = new MyRectangle( parent ); - rectangle->setBackground( type, QskRgbPalette::Teal ); + rectangle->setBackground( type, QskRgbPalette::DefaultMaterialTertiary ); } } @@ -82,8 +82,8 @@ static void addRectangles2( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* rectangle = new MyRectangle( parent ); - rectangle->setBorder( Box::Flat, QskRgbPalette::Brown ); - rectangle->setBackground( type, QskRgbPalette::Yellow ); + rectangle->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + rectangle->setBackground( type, QskRgbPalette::DefaultMaterialSecondary ); } } @@ -91,22 +91,22 @@ static void addRectangles3( QskLinearBox* parent ) { using namespace QskRgb; - const auto borderTheme = QskRgbPalette::Grey; - const auto fillTheme = QskRgbPalette::Blue; + const auto borderTheme = QskRgbPalette::DefaultMaterialPrimary; + const auto fillTheme = QskRgbPalette::DefaultMaterialSecondary; Box* box; box = new MyRectangle( parent ); box->setBorder( Box::Raised1, borderTheme ); - box->setGradient( Grey400 ); + box->setGradient( DefaultMaterialNeutral60 ); box = new MyRectangle( parent ); box->setBorder( Box::Sunken1, borderTheme ); - box->setGradient( QskGradient::Diagonal, Grey400, Grey500 ); + box->setGradient( QskGradient::Diagonal, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); - box->setGradient( QskGradient::Vertical, Grey400, Grey500 ); + box->setGradient( QskGradient::Vertical, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); @@ -123,7 +123,7 @@ static void addRectangles4( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyRoundedRectangle( parent ); - box->setBackground( type, QskRgbPalette::DeepOrange ); + box->setBackground( type, QskRgbPalette::DefaultMaterialError ); } } @@ -133,8 +133,8 @@ static void addRectangles5( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyRoundedRectangle( parent ); - box->setBorder( Box::Flat, QskRgbPalette::Indigo ); - box->setBackground( type, QskRgbPalette::Pink ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + box->setBackground( type, QskRgbPalette::DefaultMaterialSecondary ); } } @@ -142,22 +142,22 @@ static void addRectangles6( QskLinearBox* parent ) { using namespace QskRgb; - const auto borderTheme = QskRgbPalette::Grey; - const auto fillTheme = QskRgbPalette::Lime; + const auto borderTheme = QskRgbPalette::DefaultMaterialPrimary; + const auto fillTheme = QskRgbPalette::DefaultMaterialSecondary; Box* box; box = new MyRoundedRectangle( parent ); box->setBorder( Box::Raised1, borderTheme ); - box->setGradient( Grey400 ); + box->setGradient( DefaultMaterialNeutral60 ); box = new MyRoundedRectangle( parent ); box->setBorder( Box::Sunken1, borderTheme ); - box->setGradient( QskGradient::Diagonal, Grey400, Grey500 ); + box->setGradient( QskGradient::Diagonal, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRoundedRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); - box->setGradient( QskGradient::Vertical, Grey400, Grey500 ); + box->setGradient( QskGradient::Vertical, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRoundedRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); @@ -174,7 +174,7 @@ static void addRectangles7( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyEllipse( parent ); - box->setBackground( type, QskRgbPalette::BlueGrey ); + box->setBackground( type, QskRgbPalette::DefaultMaterialNeutralVariant ); } } @@ -184,8 +184,8 @@ static void addRectangles8( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyEllipse( parent ); - box->setBorder( Box::Flat, QskRgbPalette::Indigo ); - box->setBackground( type, QskRgbPalette::Red ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + box->setBackground( type, QskRgbPalette::DefaultMaterialError ); } } @@ -193,22 +193,22 @@ static void addRectangles9( QskLinearBox* parent ) { using namespace QskRgb; - const auto borderTheme = QskRgbPalette::Grey; - const auto fillTheme = QskRgbPalette::Lime; + const auto borderTheme = QskRgbPalette::DefaultMaterialNeutral; + const auto fillTheme = QskRgbPalette::DefaultMaterialPrimary; Box* box; box = new MyEllipse( parent ); box->setBorder( Box::Raised1, borderTheme ); - box->setGradient( Grey400 ); + box->setGradient( DefaultMaterialNeutral60 ); box = new MyEllipse( parent ); box->setBorder( Box::Sunken1, borderTheme ); - box->setGradient( QskGradient::Diagonal, Grey400, Grey500 ); + box->setGradient( QskGradient::Diagonal, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyEllipse( parent ); box->setBorder( Box::Raised2, borderTheme ); - box->setGradient( QskGradient::Vertical, Grey400, Grey500 ); + box->setGradient( QskGradient::Vertical, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyEllipse( parent ); box->setBorder( Box::Raised2, borderTheme ); @@ -263,14 +263,14 @@ static void addRectangles11( QskLinearBox* parent ) { auto box = new MyRectangle( parent ); - box->setBorder( Box::Flat, QskRgbPalette::Teal ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialTertiary ); qreal bw[ 4 ] = { border, border, border, border }; if ( i != 0 ) bw[ i - 1 ] = 0; box->setBorderWidth( bw[ 0 ], bw[ 1 ], bw[ 2 ], bw[ 3 ] ); - box->setBackground( fillType[ i ], QskRgbPalette::Brown, i >= 3 ); + box->setBackground( fillType[ i ], QskRgbPalette::DefaultMaterialSecondary, i >= 3 ); } } @@ -281,14 +281,14 @@ static void addRectangles12( QskLinearBox* parent ) { auto* box = new Box( parent ); box->setBorderWidth( 0 ); - box->setGradient( orientation, QskRgbPalette::Brown ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialSecondary ); } for ( auto orientation : { QskGradient::Vertical, QskGradient::Diagonal } ) { auto* box = new Box( parent ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); - box->setGradient( orientation, QskRgbPalette::Blue ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialTertiary ); } for ( auto orientation : { QskGradient::Vertical, @@ -297,15 +297,15 @@ static void addRectangles12( QskLinearBox* parent ) auto* box = new Box( parent ); box->setBorderWidth( 0 ); box->setShape( 30, 40, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Brown ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialTertiary ); } for ( auto orientation : { QskGradient::Vertical, QskGradient::Diagonal } ) { auto* box = new Box( parent ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); box->setShape( 30, 40, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Blue ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialSecondary ); } for ( auto orientation : { QskGradient::Vertical, @@ -314,15 +314,15 @@ static void addRectangles12( QskLinearBox* parent ) auto* box = new Box( parent ); box->setBorderWidth( 0 ); box->setShape( 100, 100, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Brown ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialTertiary ); } for ( auto orientation : { QskGradient::Vertical, QskGradient::Diagonal } ) { auto* box = new Box( parent ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); box->setShape( 100, 100, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Blue ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialSecondary ); } } @@ -374,7 +374,7 @@ static void addColoredBorderRectangles1( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient1, gradient2, gradient3, gradient4 ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -387,7 +387,7 @@ static void addColoredBorderRectangles2( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( Qt::red, Qt::green, Qt::blue, Qt::yellow ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -416,7 +416,7 @@ static void addColoredBorderRectangles3( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient3, gradient3, gradient3, gradient3 ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -430,7 +430,7 @@ static void addColoredBorderRectangles4( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient, gradient, gradient, gradient ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -447,7 +447,7 @@ static void addColoredBorderRectangles5( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient, gradient, gradient, gradient ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( { 10, 20, 20, 40 } ); diff --git a/examples/gallery/progressbar/ProgressBarPage.cpp b/examples/gallery/progressbar/ProgressBarPage.cpp index 18985ecf..3c2efaac 100644 --- a/examples/gallery/progressbar/ProgressBarPage.cpp +++ b/examples/gallery/progressbar/ProgressBarPage.cpp @@ -30,10 +30,10 @@ namespace const auto pal = QskRgbPalette::palette( theme ); QVector< QRgb > rgb; - rgb += pal.rgb( QskRgbPalette::W200 ); - rgb += pal.rgb( QskRgbPalette::W400 ); - rgb += pal.rgb( QskRgbPalette::W600 ); - rgb += pal.rgb( QskRgbPalette::W900 ); + rgb += pal.rgb( QskRgbPalette::W90 ); + rgb += pal.rgb( QskRgbPalette::W60 ); + rgb += pal.rgb( QskRgbPalette::W40 ); + rgb += pal.rgb( QskRgbPalette::W20 ); const auto stops = QskRgbPalette::colorStops( rgb, true ); @@ -62,19 +62,19 @@ void ProgressBarPage::populate() { auto bar = new ProgressBar( hBox ); - bar->setTheme( QskRgbPalette::BlueGrey ); + bar->setTheme( QskRgbPalette::DefaultMaterialPrimary ); bar->setValue( 100 ); } { auto bar = new ProgressBar( hBox ); - bar->setTheme( QskRgbPalette::Blue ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setValue( 75 ); } { auto bar = new ProgressBar( hBox ); - bar->setTheme( QskRgbPalette::Blue ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setOrigin( 60 ); bar->setValue( 25 ); } @@ -90,20 +90,20 @@ void ProgressBarPage::populate() { auto bar = new ProgressBar( vBox ); - bar->setTheme( QskRgbPalette::DeepOrange ); + bar->setTheme( QskRgbPalette::DefaultMaterialPrimary ); bar->setValue( 100 ); } { auto bar = new ProgressBar( vBox ); - bar->setTheme( QskRgbPalette::Pink ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setMaximum( 40 ); bar->setValue( 25 ); } { auto bar = new ProgressBar( vBox ); - bar->setTheme( QskRgbPalette::Pink ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setOrigin( 40 ); bar->setValue( 10 ); } diff --git a/examples/tabview/CustomSlider.cpp b/examples/tabview/CustomSlider.cpp index e8da8471..5a97f1c9 100644 --- a/examples/tabview/CustomSlider.cpp +++ b/examples/tabview/CustomSlider.cpp @@ -26,17 +26,17 @@ CustomSlider::CustomSlider( QQuickItem* parentItem ) QskSkinHintTableEditor ed( &hintTable() ); ed.setBoxShape( Fill, 0 ); - ed.setGradient( Fill, Grey700 ); + ed.setGradient( Fill, DefaultMaterialPrimary40 ); ed.setColor( Scale, qRgb( 178, 178, 178 ) ); // for the ticks ed.setStrutSize( Handle, 80, 80 ); - ed.setColor( Handle, Grey800 ); + ed.setColor( Handle, DefaultMaterialNeutral30 ); - ed.setColor( Handle | Pressed, Orange600 ); + ed.setColor( Handle | Pressed, DefaultMaterialPrimary30 ); const auto combinationMask = Focused | Hovered; - ed.setColor( Handle, Orange600, combinationMask ); + ed.setColor( Handle, 0xfffb8c00, combinationMask ); ed.setAnimation( Handle | QskAspect::Color, 300, combinationMask ); ed.setAnimation( Handle | QskAspect::Color, 1000 ); diff --git a/examples/tabview/CustomSliderSkinlet.cpp b/examples/tabview/CustomSliderSkinlet.cpp index 0766957d..1ae6b08a 100644 --- a/examples/tabview/CustomSliderSkinlet.cpp +++ b/examples/tabview/CustomSliderSkinlet.cpp @@ -307,7 +307,7 @@ QSGNode* CustomSliderSkinlet::updateDecorationNode( labelNode = QskSkinlet::updateTextNode( slider, labelNode, QRectF( x - 0.5 * w, y, w, h ), Qt::AlignHCenter, text, qskLabelFont, - QskTextOptions(), QskTextColors( QskRgb::Grey700 ), Qsk::Normal ); + QskTextOptions(), QskTextColors( QskRgb::DefaultMaterialNeutral30 ), Qsk::Normal ); if ( labelNode ) { diff --git a/examples/tabview/OtherSlider.cpp b/examples/tabview/OtherSlider.cpp index bba59381..4561ccb5 100644 --- a/examples/tabview/OtherSlider.cpp +++ b/examples/tabview/OtherSlider.cpp @@ -37,8 +37,8 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) ed.setMetric( aspect | A::Size, h ); ed.setBoxShape( aspect, 4 ); ed.setBoxBorderMetrics( aspect, 1 ); - ed.setBoxBorderColors( aspect, Grey900 ); - ed.setGradient( aspect, Grey400 ); + ed.setBoxBorderColors( aspect, DefaultMaterialNeutral10 ); + ed.setGradient( aspect, DefaultMaterialNeutral60 ); if ( placement == A::Horizontal ) ed.setPadding( aspect, QskMargins( paddingW, 0 ) ); @@ -84,8 +84,8 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) for ( auto state : { A::NoState, Pressed } ) { - ed.setBoxBorderColors( aspect | state, Grey600 ); - ed.setGradient( aspect | state, Blue400 ); + ed.setBoxBorderColors( aspect | state, DefaultMaterialNeutral40 ); + ed.setGradient( aspect | state, DefaultMaterialPrimary60 ); } } } diff --git a/skins/material/QskMaterialSkinFactory.cpp b/skins/material/QskMaterialSkinFactory.cpp index 038103d1..cfeeebd6 100644 --- a/skins/material/QskMaterialSkinFactory.cpp +++ b/skins/material/QskMaterialSkinFactory.cpp @@ -71,7 +71,7 @@ QskSkin* QskMaterialSkinFactory::createSkin( const QString& skinName ) pal.secondary = 0xff03dac6; pal.secondaryVariant = 0xff018786; pal.onSecondary = QskRgb::White; - pal.background = QskRgb::Grey100; + pal.background = QskRgb::DefaultMaterialNeutral90; pal.onBackground = QskRgb::Black; pal.error = 0xffb00020; pal.onError = QskRgb::White; diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index bfe118ad..4a0d8cae 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -89,7 +89,7 @@ namespace contrasted = DarkGrey; contrastedText = White; - highlighted = BlueGrey500; + highlighted = 0xff607d8b; highlightedText = White; base = Black;