From 75c39a8e3e4f471d3a14bd460e169deb8a712e6e Mon Sep 17 00:00:00 2001 From: "Vogel, Rick" Date: Mon, 11 Dec 2023 12:38:08 +0100 Subject: [PATCH] enable color and node alpha --- playground/charts/ChartView.cpp | 8 ++++++-- src/nodes/shaders/arcshadow-vulkan.frag | 2 +- src/nodes/shaders/arcshadow.frag | 2 +- src/nodes/shaders/arcshadow.frag.qsb | Bin 2718 -> 2655 bytes 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/playground/charts/ChartView.cpp b/playground/charts/ChartView.cpp index afd3a89d..6e581d15 100644 --- a/playground/charts/ChartView.cpp +++ b/playground/charts/ChartView.cpp @@ -159,7 +159,7 @@ namespace setBoxBorderColorsHint( Inherited::Handle, Qt::white ); if(skinStates().testFlag(Alpha)) { - m_color.setAlpha(value); + m_color.setAlpha(value * 255); } else { @@ -413,6 +413,8 @@ namespace ChartView::ChartView( ArcControl* chart, QQuickItem* parent ) : QskMainView( parent ) { + setColor(Panel, Qt::white); + auto hBox = new QskLinearBox( Qt::Horizontal ); // auto chartBox = new ChartBox( chart, hBox ); @@ -469,7 +471,9 @@ ChartView::ChartView( ArcControl* chart, QQuickItem* parent ) [ = ]( QColor c ) { chart->setColor( subcontrol, c ); } ); connect( controlPanel, &ControlPanel::shadowColorChanged, chart, - [ = ]( QColor c ) { chart->setShadowColorHint( subcontrol, c ); } ); + [ = ]( QColor c ) { + chart->setShadowColorHint( subcontrol, c ); + } ); connect( controlPanel, &ControlPanel::strokeColorChanged, chart, [ = ]( QColor c ) { diff --git a/src/nodes/shaders/arcshadow-vulkan.frag b/src/nodes/shaders/arcshadow-vulkan.frag index 69a6929e..21f01210 100644 --- a/src/nodes/shaders/arcshadow-vulkan.frag +++ b/src/nodes/shaders/arcshadow-vulkan.frag @@ -48,5 +48,5 @@ void main() float d = sdRing(p, cs, ubuf.radius / 2.0, ubuf.thickness); float a = 1.0 - smoothstep(0.0, ubuf.extend, d); - fragColor = vec4(ubuf.color.rgb, 1.0) * a * ubuf.opacity; + fragColor = ubuf.color * a * ubuf.opacity; } \ No newline at end of file diff --git a/src/nodes/shaders/arcshadow.frag b/src/nodes/shaders/arcshadow.frag index 2d44a320..5ad0e2a7 100644 --- a/src/nodes/shaders/arcshadow.frag +++ b/src/nodes/shaders/arcshadow.frag @@ -43,5 +43,5 @@ void main() float d = sdRing(p, cs, radius / 2.0, thickness); float a = 1.0 - smoothstep(0.0, extend, d); - gl_FragColor = vec4(color.rgb, 1.0) * a * opacity; + gl_FragColor = color * a * opacity; } \ No newline at end of file diff --git a/src/nodes/shaders/arcshadow.frag.qsb b/src/nodes/shaders/arcshadow.frag.qsb index 435e2fe94e0e87a49656a486f4a8d1bd0901ec4b..3eb9ca6c61121509d53aa9c49f46b8ef5b8fa581 100644 GIT binary patch literal 2655 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 NOUtRxe*j>LCD!?jRs8?} literal 2718 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