Differential D28314

Allow setting separate corner radii for ShadowedRectangle
ClosedPublic
Actions

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

Details

Reviewers

mart

Group Reviewers

Kirigami

Commits

R169:eb4e9064e7e4: Allow setting separate corner radii for ShadowedRectangle

Summary

This adds a "corners" grouped property that allows setting separate radii for
the different corners of ShadowedRectangle. By default, these are ignored and
instead the value of "radius" is used.

Test Plan

The manual test has been updated, it should look like this:

Diff Detail

Repository

R169 Kirigami

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

ahiemstra created this revision.Mar 26 2020, 4:35 PM

Restricted Application added a project: Kirigami. · View Herald TranscriptMar 26 2020, 4:35 PM

Restricted Application added a subscriber: plasma-devel. · View Herald Transcript

ahiemstra requested review of this revision.Mar 26 2020, 4:35 PM

Harbormaster completed remote builds in B24282: Diff 78573.Mar 26 2020, 4:35 PM

Update test

Harbormaster completed remote builds in B24283: Diff 78574.Mar 26 2020, 4:35 PM

ahiemstra edited the test plan for this revision. (Show Details)Mar 26 2020, 4:37 PM

Cool

src/shadowedrectangle.h
162	How about using NaN to define "not set"? though you can't have negative radius, so probably fine

Rebase onto master, also support ShadowedTexture

Harbormaster completed remote builds in B24593: Diff 79075.Apr 1 2020, 6:10 PM

mart accepted this revision.Apr 6 2020, 8:59 AM

This revision is now accepted and ready to land.Apr 6 2020, 8:59 AM

Closed by commit R169:eb4e9064e7e4: Allow setting separate corner radii for ShadowedRectangle (authored by ahiemstra). · Explain WhyApr 6 2020, 1:47 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			src/controls/ShadowedImage.qml (1 line)
M			src/kirigamiplugin.cpp (2 lines)
M			src/scenegraph/shaders/shadowedborderrectangle.frag (12 lines)
M			src/scenegraph/shaders/shadowedbordertexture.frag (13 lines)
M			src/scenegraph/shaders/shadowedrectangle.frag (10 lines)
M			src/scenegraph/shaders/shadowedtexture.frag (11 lines)
M			src/scenegraph/shadowedrectanglematerial.h (2 lines)
M			src/scenegraph/shadowedrectanglenode.h (5 lines)
M			src/scenegraph/shadowedrectanglenode.cpp (19 lines)
M			src/shadowedrectangle.h (73 lines)
M			src/shadowedrectangle.cpp (88 lines)
M			src/shadowedtexture.h (3 lines)
M			src/shadowedtexture.cpp (16 lines)
M			tests/ShadowedImageTest.qml (54 lines)
M			tests/ShadowedRectangleTest.qml (50 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	78573	d6cfab5		Mar 26 2020, 4:35 PM	★	★
Diff 2	78574	d6cfab5	- Update test	Mar 26 2020, 4:35 PM	★	★
Diff 3	79075	0c7ba88	Rebase onto master, also support ShadowedTexture	Apr 1 2020, 6:10 PM	★	★
Diff 4	79480	989cd30	R169:eb4e9064e7e490e4e01663b31f5fa458509e733f	Apr 6 2020, 1:47 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
9ed092962c3c	070ff8a62574	7125c88649ec	Arjen Hiemstra	Fixes after rebase	Apr 1 2020, 6:09 PM
7125c88649ec	ed083be35a64	5e859cbd479d	Arjen Hiemstra	Update test	Mar 26 2020, 4:35 PM
5e859cbd479d	b34d6cc58944	0c7ba88d3970	Arjen Hiemstra	Allow setting separate corner radii for ShadowedRectangle (Show More…)	Mar 26 2020, 4:32 PM