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 435e2fe9..3eb9ca6c 100644 Binary files a/src/nodes/shaders/arcshadow.frag.qsb and b/src/nodes/shaders/arcshadow.frag.qsb differ