Add SolidLayer. #288
Merged
Add SolidLayer. #288
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kevingpqi123
requested review from
domchen,
Hparty,
lvpengwei and
shlzxjp
as code owners
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/LayerType.h
Outdated
| @@ -43,5 +43,9 @@ enum class LayerType { | |||
| * A layer displaying a simple text. | |||
| */ | |||
| Text, | |||
| /** | |||
| * A layer that fills its bounds with style. | |||
There was a problem hiding this comment.
A layer that fills its bounds with a solid color.
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
|
|
||
| namespace tgfx { | ||
| /** | ||
| * A layer that fills its bounds with a solid color, gradient, or image pattern. |
There was a problem hiding this comment.
A layer that fills its bounds with a solid color.
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| * Returns the style used to fill the layer, which can be a solid color, gradient, or image | ||
| * pattern. | ||
| */ | ||
| std::shared_ptr<ShapeStyle> fillStyle() const { |
There was a problem hiding this comment.
只需要一个Color，复杂的用ShapeLayer实现。
There was a problem hiding this comment.
再添加两个圆角属性：float radiusX 和 float radiusY
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| /** | ||
| * Creates a new solid layer with the given dimensions and solid color. | ||
| */ | ||
| static std::shared_ptr<SolidLayer> Make(float width, float height, |
There was a problem hiding this comment.
我们所有Layer都不提供初始化参数，统一在layer暴露的属性上设置。改成空Make()吧
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| } | ||
|
|
||
| /** | ||
| * Returns the width of the layer. |
There was a problem hiding this comment.
Returns the width of the solid layer.
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| void setHeight(float height); | ||
|
|
||
| /** | ||
| * Returns the axis length on x-axis of the rounded corners. |
There was a problem hiding this comment.
Returns the x-axis radius of corners.
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| /** | ||
| * Returns the solid color used to fill the layer. | ||
| */ | ||
| std::shared_ptr<SolidColor> solidColor() const { |
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| float _height = 0; | ||
| float _radiusX = 0; | ||
| float _radiusY = 0; | ||
| Path _path = {}; |
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| std::unique_ptr<LayerContent> onUpdateContent() override; | ||
|
|
||
| private: | ||
| std::shared_ptr<SolidColor> _solidColor = nullptr; |
domchen
reviewed
Oct 31, 2024
src/core/SolidLayer.cpp
Outdated
Comment on lines
94
to
98
| std::vector<std::unique_ptr<LayerContent>> contents = {}; | ||
| auto shader = _solidColor ? _solidColor->getShader() : nullptr; | ||
| auto content = std::make_unique<ShapeContent>(_path, shader); | ||
| contents.push_back(std::move(content)); | ||
| return LayerContent::Compose(std::move(contents)); |
There was a problem hiding this comment.
你只有一个ShapeContent，为啥需要Compose，又没有描边。再写个简化的专用的，SolidContent，只记录必要的属性。一个RRect，一个Color就行。
domchen
reviewed
Oct 31, 2024
test/src/LayerTest.cpp
Outdated
| solidLayer->setRadiusY(50); | ||
| auto bounds = Rect::MakeXYWH(0, 0, 150, 80); | ||
| auto solidLayerRect = solidLayer->getBounds(); | ||
| ASSERT_TRUE(solidLayerRect == bounds); |
There was a problem hiding this comment.
用EXPECT_TRUE，不要用ASSERT，会导致程序整个退出
domchen
reviewed
Oct 31, 2024
src/layers/contents/SolidContent.cpp
Outdated
|
|
||
| void SolidContent::draw(Canvas* canvas, const Paint& paint) const { | ||
| auto solidPaint = paint; | ||
| solidPaint.setColor(_color); |
There was a problem hiding this comment.
不能直接setColor，会覆盖掉原本的alpha，要把alpha取出来乘以当前的color。参考一下TextContent
domchen
reviewed
Oct 31, 2024
src/layers/contents/SolidContent.h
Outdated
| public: | ||
| SolidContent(const RRect& rRect, const Color& color); | ||
|
|
||
| tgfx::Rect getBounds() const override { |
domchen
reviewed
Oct 31, 2024
| } | ||
|
|
||
| std::unique_ptr<LayerContent> SolidLayer::onUpdateContent() { | ||
| RRect rRect = {}; |
domchen
reviewed
Oct 31, 2024
include/tgfx/layers/SolidLayer.h
Outdated
| } | ||
|
|
||
| /** | ||
| * Returns the width of the solid layer. |
There was a problem hiding this comment.
The default value is 0. 把其他几个属性的注释也补充一下。
domchen
approved these changes
Oct 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.