From cc5229f7a33a14332a61713e5592edbbaa9be98c Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 15 May 2025 11:41:27 +0200 Subject: [PATCH] from master --- .github/workflows/cmake.yml | 2 -- cmake/QskBuildFunctions.cmake | 4 ++-- playground/shadows/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/common/QskTextColors.h | 2 +- src/controls/QskTabBar.cpp | 2 +- src/nodes/QskGradientMaterial.cpp | 22 +++++++++++----------- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1508a476..f6599cda 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -202,7 +202,6 @@ jobs: install-deps: "true" modules: "qtwebengine" cached: ${{ steps.cache-qt-5-15.outputs.cache-hit }} - setup-python: "false" tools: "" set-env: "true" tools-only: "false" @@ -216,7 +215,6 @@ jobs: install-deps: "true" modules: "qtwebengine qtshadertools" cached: ${{ steps.cache-qt-6-2.outputs.cache-hit }} - setup-python: "false" tools: "" set-env: "true" tools-only: "false" diff --git a/cmake/QskBuildFunctions.cmake b/cmake/QskBuildFunctions.cmake index 5bee0e28..fbf57c07 100644 --- a/cmake/QskBuildFunctions.cmake +++ b/cmake/QskBuildFunctions.cmake @@ -149,7 +149,7 @@ function(qsk_add_example target) endfunction() -function(qsk_add_shaders target) +function(qsk_add_shaders target shader_name) cmake_parse_arguments( arg "" "" "FILES" ${ARGN} ) @@ -160,7 +160,7 @@ function(qsk_add_shaders target) list(APPEND outfiles "${qsbname}.qsb") endforeach() - qt6_add_shaders( ${target} "qskshaders" BATCHABLE PRECOMPILE QUIET + qt6_add_shaders( ${target} ${shader_name} BATCHABLE PRECOMPILE QUIET PREFIX "/qskinny/shaders" ${ARGV} OUTPUTS ${outfiles} ) # pass on OUTPUT_TARGETS to the caller of this function diff --git a/playground/shadows/CMakeLists.txt b/playground/shadows/CMakeLists.txt index 8b779858..9b278286 100644 --- a/playground/shadows/CMakeLists.txt +++ b/playground/shadows/CMakeLists.txt @@ -35,6 +35,6 @@ if (QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6) shaders/arcshadow-vulkan.vert shaders/arcshadow-vulkan.frag ) - qsk_add_shaders( ${target} FILES ${SHADERS} OUTPUT_TARGETS shader_target) + qsk_add_shaders( ${target} "qskArcShaders" FILES ${SHADERS} OUTPUT_TARGETS shader_target) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c69fa06..3b587adc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -510,7 +510,7 @@ else() endif() if (QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6) - qsk_add_shaders( ${target} FILES ${SHADERS} OUTPUT_TARGETS shader_target) + qsk_add_shaders( ${target} "qskshaders" FILES ${SHADERS} OUTPUT_TARGETS shader_target) endif() target_include_directories(${target} PUBLIC diff --git a/src/common/QskTextColors.h b/src/common/QskTextColors.h index b01b5c46..1cf13d27 100644 --- a/src/common/QskTextColors.h +++ b/src/common/QskTextColors.h @@ -41,7 +41,7 @@ class QSK_EXPORT QskTextColors void setLinkColor( QRgb ); void setLinkColor( Qt::GlobalColor ); - QskTextColors interpolated( const QskTextColors&, qreal value ) const; + QskTextColors interpolated( const QskTextColors&, qreal ratio ) const; static QVariant interpolate( const QskTextColors&, const QskTextColors&, qreal ratio ); diff --git a/src/controls/QskTabBar.cpp b/src/controls/QskTabBar.cpp index eb0eaff8..83ed1c1c 100644 --- a/src/controls/QskTabBar.cpp +++ b/src/controls/QskTabBar.cpp @@ -129,7 +129,7 @@ namespace { if ( qskIsAncestorOf( this, item ) ) { - const auto pos = mapFromItem( item, QPointF() ); + const auto pos = mapFromItem( item, QPointF() ) + scrollPos(); ensureVisible( QRectF( pos.x(), pos.y(), item->width(), item->height() ) ); } } diff --git a/src/nodes/QskGradientMaterial.cpp b/src/nodes/QskGradientMaterial.cpp index f6e490b0..04adbe3d 100644 --- a/src/nodes/QskGradientMaterial.cpp +++ b/src/nodes/QskGradientMaterial.cpp @@ -54,16 +54,16 @@ namespace } #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) - // make Qt 5/6 APIs matching - QSGMaterialShader* createShader( QSGRendererInterface::RenderMode ) const override final +#else + QSGMaterialShader* createShader() const override final +#endif { - return createShader(); + return createMaterialShader(); } - virtual QSGMaterialShader* createShader() const = 0; -#endif + virtual QSGMaterialShader* createMaterialShader() const = 0; virtual bool setGradient( const QskGradient& ) = 0; }; @@ -217,7 +217,7 @@ namespace return GradientMaterial::compare( other ); } - QSGMaterialShader* createShader() const override; + QSGMaterialShader* createMaterialShader() const override; /* xy: position @@ -299,7 +299,7 @@ namespace }; #endif - QSGMaterialShader* LinearMaterial::createShader() const + QSGMaterialShader* LinearMaterial::createMaterialShader() const { #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) if ( !( flags() & QSGMaterial::RhiShaderWanted ) ) @@ -371,7 +371,7 @@ namespace } } - QSGMaterialShader* createShader() const override; + QSGMaterialShader* createMaterialShader() const override; QVector2D m_center; QVector2D m_radius; @@ -465,7 +465,7 @@ namespace }; #endif - QSGMaterialShader* RadialMaterial::createShader() const + QSGMaterialShader* RadialMaterial::createMaterialShader() const { #ifdef SHADER_GL if ( !( flags() & QSGMaterial::RhiShaderWanted ) ) @@ -575,7 +575,7 @@ namespace return GradientMaterial::compare( other ); } - QSGMaterialShader* createShader() const override; + QSGMaterialShader* createMaterialShader() const override; QVector2D m_center; float m_aspectRatio = 1.0; @@ -685,7 +685,7 @@ namespace }; #endif - QSGMaterialShader* ConicMaterial::createShader() const + QSGMaterialShader* ConicMaterial::createMaterialShader() const { #ifdef SHADER_GL if ( !( flags() & QSGMaterial::RhiShaderWanted ) )