From 9110574bb51e9e2959842a7641f598d34c3cd847 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 13 Dec 2019 01:02:47 +0800 Subject: ... --- src/ui/controls/text_block.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/ui/controls/text_block.cpp') diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp index 71903981..333b44c8 100644 --- a/src/ui/controls/text_block.cpp +++ b/src/ui/controls/text_block.cpp @@ -9,20 +9,22 @@ using render::TextRenderObject; TextBlock::TextBlock() { const auto predefined_resources = UiManager::GetInstance()->GetPredefineResources(); - render_object_.reset( - new TextRenderObject(predefined_resources->text_block_text_brush, - predefined_resources->text_block_font, - predefined_resources->text_block_selection_brush)); + render_object_ = std::make_unique( + predefined_resources->text_block_text_brush, + predefined_resources->text_block_font, + predefined_resources->text_block_selection_brush); render_object_->SetAttachedControl(this); } +TextBlock::~TextBlock() = default; + render::RenderObject* TextBlock::GetRenderObject() const { return render_object_.get(); } -std::wstring TextBlock::GetText() const { return render_object_->GetText(); } +std::string TextBlock::GetText() const { return render_object_->GetText(); } -void TextBlock::SetText(std::wstring text) { +void TextBlock::SetText(std::string text) { render_object_->SetText(std::move(text)); } } // namespace cru::ui::controls -- cgit v1.2.3