diff options
Diffstat (limited to 'include/cru/ui/controls')
-rw-r--r-- | include/cru/ui/controls/TextBlock.hpp | 3 | ||||
-rw-r--r-- | include/cru/ui/controls/TextBox.hpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/cru/ui/controls/TextBlock.hpp b/include/cru/ui/controls/TextBlock.hpp index dd8b40b4..1b1b4a5c 100644 --- a/include/cru/ui/controls/TextBlock.hpp +++ b/include/cru/ui/controls/TextBlock.hpp @@ -28,7 +28,8 @@ class TextBlock : public NoChildControl { std::string GetText() const; void SetText(std::string text); - render::TextRenderObject* GetTextRenderObject(); + gsl::not_null<render::TextRenderObject*> GetTextRenderObject(); + render::ScrollRenderObject* GetScrollRenderObject() { return nullptr; } private: std::unique_ptr<render::TextRenderObject> text_render_object_; diff --git a/include/cru/ui/controls/TextBox.hpp b/include/cru/ui/controls/TextBox.hpp index 2f7a12b6..3d4de7c0 100644 --- a/include/cru/ui/controls/TextBox.hpp +++ b/include/cru/ui/controls/TextBox.hpp @@ -27,7 +27,8 @@ class TextBox : public NoChildControl { render::RenderObject* GetRenderObject() const override; - render::TextRenderObject* GetTextRenderObject(); + gsl::not_null<render::TextRenderObject*> GetTextRenderObject(); + render::ScrollRenderObject* GetScrollRenderObject(); const TextBoxBorderStyle& GetBorderStyle(); void SetBorderStyle(TextBoxBorderStyle border_style); @@ -40,6 +41,7 @@ class TextBox : public NoChildControl { private: std::unique_ptr<render::BorderRenderObject> border_render_object_; + std::unique_ptr<render::ScrollRenderObject> scroll_render_object_; std::unique_ptr<render::TextRenderObject> text_render_object_; TextBoxBorderStyle border_style_; |