Merge branch 'master' of https://github.com/crupest/CruUI

1 files changed, 17 insertions, 5 deletions

diff --git a/src/ui/controls/TextBlock.cpp b/src/ui/controls/TextBlock.cpp
index 9ce99ab6..0724edcf 100644
--- a/src/ui/controls/TextBlock.cpp
+++ b/src/ui/controls/TextBlock.cpp
@@ -1,16 +1,22 @@
 #include "cru/ui/controls/TextBlock.hpp"
 
-#include "TextControlService.hpp"
 #include "cru/ui/UiManager.hpp"
 #include "cru/ui/render/CanvasRenderObject.hpp"
 #include "cru/ui/render/StackLayoutRenderObject.hpp"
 #include "cru/ui/render/TextRenderObject.hpp"
 
 namespace cru::ui::controls {
-using render::CanvasRenderObject;
-using render::StackLayoutRenderObject;
 using render::TextRenderObject;
 
+TextBlock* TextBlock::Create() { return new TextBlock(); }
+
+TextBlock* TextBlock::Create(std::u16string text, bool selectable) {
+  auto c = new TextBlock();
+  c->SetText(text);
+  c->SetSelectable(selectable);
+  return c;
+}
+
 TextBlock::TextBlock() {
   const auto theme_resources = UiManager::GetInstance()->GetThemeResources();
 
@@ -20,8 +26,10 @@ TextBlock::TextBlock() {
 
   text_render_object_->SetAttachedControl(this);
 
-  service_ = std::make_unique<TextControlService<TextBlock>>(this);
-  service_->SetEnabled(true);
+  service_ = std::make_unique<TextHostControlService>(this);
+
+  service_->SetEnabled(false);
+  service_->SetEditable(false);
 }
 
 TextBlock::~TextBlock() = default;
@@ -36,6 +44,10 @@ void TextBlock::SetText(std::u16string text) {
   service_->SetText(std::move(text));
 }
 
+bool TextBlock::IsSelectable() const { return service_->IsEnabled(); }
+
+void TextBlock::SetSelectable(bool value) { service_->SetEnabled(value); }
+
 gsl::not_null<render::TextRenderObject*> TextBlock::GetTextRenderObject() {
   return text_render_object_.get();
 }