Add ShadowedImage and ShadowedTexture items
0c7ba88d3970
Actions

Authored by ahiemstra on Mar 23 2020, 4:35 PM.

Description

Add ShadowedImage and ShadowedTexture items

Summary:
This adds the ShadowedImage and ShadowedTexture items. The first is a
QML-only item that makes use of the second. The second is a
ShadowedRectangle that uses a texture as color source for the item
instead of just a color.

It also does some cleanup on the scenegraph/shader related bits
introduced with ShadowedRectangle. Most importantly, it removes the
mostly duplicated core shaders in favour of a simple solution using
a #define.

Test Plan:
There's a manual test included. It should look like this:

Reviewers: Kirigami, mart

Reviewed By: Kirigami, mart

Subscribers: mart, plasma-devel

Tags: Kirigami

Differential Revision: https://phabricator.kde.org/D28222

Details

Committed

ahiemstra

Mar 31 2020, 1:25 PM

Reviewer

Kirigami

Differential Revision

D28222: Add ShadowedImage and ShadowedTexture items

Parents

R169:9b6ec041936a: [controls/formlayout] Don't attempt to reset implicitWidth

Branches

Unknown

Tags

Unknown

ahiemstra committed R169:0c7ba88d3970: Add ShadowedImage and ShadowedTexture items (authored by ahiemstra).Mar 31 2020, 1:25 PM

Changes (40)

		Path
M		kirigami.qrc
M		src/CMakeLists.txt
A		src/controls/ShadowedImage.qml
M		src/kirigamiplugin.cpp
V		src/scenegraph/{ → shaders}/header_desktop.glsl
V		src/scenegraph/{ → shaders}/header_desktop_core.glsl
V		src/scenegraph/{ → shaders}/header_es.glsl
A	(dir)	src/scenegraph/shaders/
D		src/scenegraph/shaders.qrc
V		src/scenegraph/{shaders ← }/header_desktop.glsl
V		src/scenegraph/{shaders ← }/header_desktop_core.glsl
V		src/scenegraph/{shaders ← }/header_es.glsl
A		src/scenegraph/shaders/sdf.glsl
A		src/scenegraph/shaders/shaders.qrc
V		src/scenegraph/{shaders ← }/shadowedborderrectangle.frag
V		src/scenegraph/{shaders/shadowedbordertexture.frag ← shadowedborderrectangle_core.frag}
V		src/scenegraph/{shaders/shadowedrectangle.frag ← shadowedrectangle_core.frag}
V		src/scenegraph/{shaders ← }/shadowedrectangle.vert
V		src/scenegraph/{shaders/shadowedtexture.frag ← shadowedrectangle.frag}
V		src/scenegraph/{ → shaders}/shadowedborderrectangle.frag
V		src/scenegraph/{shadowedborderrectangle_core.frag → shaders/shadowedbordertexture.frag}
M		src/scenegraph/shadowedborderrectanglematerial.cpp
A		src/scenegraph/shadowedbordertexturematerial.cpp
A		src/scenegraph/shadowedbordertexturematerial.h
V		src/scenegraph/{shadowedrectangle.frag → shaders/shadowedtexture.frag}
V		src/scenegraph/{ → shaders}/shadowedrectangle.vert
V		src/scenegraph/{shadowedrectangle_core.frag → shaders/shadowedrectangle.frag}
D		src/scenegraph/shadowedrectangle_core.vert
M		src/scenegraph/shadowedrectanglematerial.cpp
M		src/scenegraph/shadowedrectanglenode.cpp
M		src/scenegraph/shadowedrectanglenode.h
A		src/scenegraph/shadowedtexturematerial.cpp
P		src/scenegraph/shadowedtexturematerial.h Copied from src/scenegraph/shadowedborderrectanglematerial.h
A		src/scenegraph/shadowedtexturenode.cpp
A		src/scenegraph/shadowedtexturenode.h
M		src/shadowedrectangle.cpp
M		src/shadowedrectangle.h
A		src/shadowedtexture.cpp
A		src/shadowedtexture.h
P		tests/ShadowedImageTest.qml Copied from tests/ShadowedRectangleTest.qml

Add ShadowedImage and ShadowedTexture items0c7ba88d3970Actions

Description

Details

Changes (40)

R169:0c7ba88d3970

kirigami.qrc

src/CMakeLists.txt

src/controls/ShadowedImage.qml

src/kirigamiplugin.cpp

src/scenegraph/header_desktop.glsl

src/scenegraph/header_desktop_core.glsl

src/scenegraph/header_es.glsl

src/scenegraph/shaders.qrc

src/scenegraph/shaders/header_desktop.glsl

src/scenegraph/shaders/header_desktop_core.glsl

src/scenegraph/shaders/header_es.glsl

src/scenegraph/shaders/sdf.glsl

src/scenegraph/shaders/shaders.qrc

src/scenegraph/shaders/shadowedborderrectangle.frag

src/scenegraph/shaders/shadowedbordertexture.frag

src/scenegraph/shaders/shadowedrectangle.frag

src/scenegraph/shaders/shadowedrectangle.vert

src/scenegraph/shaders/shadowedtexture.frag

src/scenegraph/shadowedborderrectangle.frag

src/scenegraph/shadowedborderrectangle_core.frag

src/scenegraph/shadowedborderrectanglematerial.cpp

src/scenegraph/shadowedbordertexturematerial.cpp

src/scenegraph/shadowedbordertexturematerial.h

src/scenegraph/shadowedrectangle.frag

src/scenegraph/shadowedrectangle.vert

src/scenegraph/shadowedrectangle_core.frag

src/scenegraph/shadowedrectangle_core.vert

src/scenegraph/shadowedrectanglematerial.cpp

src/scenegraph/shadowedrectanglenode.cpp

src/scenegraph/shadowedrectanglenode.h

src/scenegraph/shadowedtexturematerial.cpp

src/scenegraph/shadowedtexturematerial.h

src/scenegraph/shadowedtexturenode.cpp

src/scenegraph/shadowedtexturenode.h

src/shadowedrectangle.cpp

src/shadowedrectangle.h

src/shadowedtexture.cpp

src/shadowedtexture.h

tests/ShadowedImageTest.qml

Add ShadowedImage and ShadowedTexture items
0c7ba88d3970
Actions