diff options
| author | crupest <crupest@outlook.com> | 2019-12-12 19:53:17 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2019-12-12 19:53:17 +0800 |
| commit | e69911a8b161b81ce3f7b209175766da2b7b3d4b (patch) | |
| tree | 76b1f4b6f9f5ad6111578771be783ee456aeb912 /include/cru/ui | |
| parent | 154b5b838edfdcef93cd0a33c013ad7f5f9d7337 (diff) | |
| download | cru-e69911a8b161b81ce3f7b209175766da2b7b3d4b.tar.gz cru-e69911a8b161b81ce3f7b209175766da2b7b3d4b.tar.bz2 cru-e69911a8b161b81ce3f7b209175766da2b7b3d4b.zip | |
...
Diffstat (limited to 'include/cru/ui')
| -rw-r--r-- | include/cru/ui/render/border_render_object.hpp | 8 | ||||
| -rw-r--r-- | include/cru/ui/window.hpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/cru/ui/render/border_render_object.hpp b/include/cru/ui/render/border_render_object.hpp index e21ce34c..5520ab2e 100644 --- a/include/cru/ui/render/border_render_object.hpp +++ b/include/cru/ui/render/border_render_object.hpp @@ -7,7 +7,7 @@ namespace cru::platform::graph { class Brush; -class Geometry; +class IGeometry; } // namespace cru::platform::graph namespace cru::ui::render { @@ -131,11 +131,11 @@ class BorderRenderObject : public RenderObject { std::shared_ptr<platform::graph::Brush> background_brush_; // The ring. Used for painting. - std::unique_ptr<platform::graph::Geometry> geometry_; + std::unique_ptr<platform::graph::IGeometry> geometry_; // Area including inner area of the border. Used for painting foreground and // background. - std::unique_ptr<platform::graph::Geometry> border_inner_geometry_; + std::unique_ptr<platform::graph::IGeometry> border_inner_geometry_; // Area including border ring and inner area. Used for hit test. - std::unique_ptr<platform::graph::Geometry> border_outer_geometry_; + std::unique_ptr<platform::graph::IGeometry> border_outer_geometry_; }; } // namespace cru::ui::render diff --git a/include/cru/ui/window.hpp b/include/cru/ui/window.hpp index f4cdefaa..4f44fed4 100644 --- a/include/cru/ui/window.hpp +++ b/include/cru/ui/window.hpp @@ -9,7 +9,7 @@ #include <vector> namespace cru::platform::native { -class NativeWindow; +class INativeWindow; } namespace cru::ui { @@ -43,7 +43,7 @@ class Window final : public ContentControl, public SelfResolvable<Window> { render::RenderObject* GetRenderObject() const override; - platform::native::NativeWindow* GetNativeWindow() const { + platform::native::INativeWindow* GetNativeWindow() const { return native_window_; } @@ -112,7 +112,7 @@ class Window final : public ContentControl, public SelfResolvable<Window> { void UpdateCursor(); private: - platform::native::NativeWindow* native_window_; + platform::native::INativeWindow* native_window_; std::vector<EventRevokerGuard> event_revoker_guards_; std::shared_ptr<render::WindowRenderObject> render_object_; |
