diff options
| author | 杨宇千 <crupest@outlook.com> | 2018-11-10 16:03:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-10 16:03:17 +0800 |
| commit | fbcc63667fcfe1e107ee8666b319420af89f0686 (patch) | |
| tree | fdd8ac836b266044de380fea26e8f5fc80a5d9d9 /src/ui/border_property.hpp | |
| parent | ac4b0f8d438e7a7c2ecd836af8332b5da1e035c9 (diff) | |
| parent | 8d5a08e8d054e9504ca31e0bfbfff7a1018c23c0 (diff) | |
| download | cru-fbcc63667fcfe1e107ee8666b319420af89f0686.tar.gz cru-fbcc63667fcfe1e107ee8666b319420af89f0686.tar.bz2 cru-fbcc63667fcfe1e107ee8666b319420af89f0686.zip | |
Merge pull request #6 from crupest/predefine
Refactor predefine resources. Add check for dead recursion in singleton.
Diffstat (limited to 'src/ui/border_property.hpp')
| -rw-r--r-- | src/ui/border_property.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/border_property.hpp b/src/ui/border_property.hpp index a280fe44..7766f5a3 100644 --- a/src/ui/border_property.hpp +++ b/src/ui/border_property.hpp @@ -12,6 +12,7 @@ namespace cru::ui public: BorderProperty(); explicit BorderProperty(Microsoft::WRL::ComPtr<ID2D1Brush> brush); + BorderProperty(Microsoft::WRL::ComPtr<ID2D1Brush> brush, float width, float radius_x, float radius_y, Microsoft::WRL::ComPtr<ID2D1StrokeStyle> stroke_style = nullptr); BorderProperty(const BorderProperty& other) = default; BorderProperty(BorderProperty&& other) = default; BorderProperty& operator=(const BorderProperty& other) = default; @@ -76,8 +77,8 @@ namespace cru::ui private: Microsoft::WRL::ComPtr<ID2D1Brush> brush_; float stroke_width_ = 1.0f; - Microsoft::WRL::ComPtr<ID2D1StrokeStyle> stroke_style_ = nullptr; float radius_x_ = 0.0f; float radius_y_ = 0.0f; + Microsoft::WRL::ComPtr<ID2D1StrokeStyle> stroke_style_ = nullptr; }; } |