aboutsummaryrefslogtreecommitdiff
path: root/CruUI/ui/controls/text_block.cpp
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2018-09-19 23:43:26 +0800
committercrupest <crupest@outlook.com>2018-09-19 23:43:26 +0800
commitdea11f34bfab5bfd5f66dec9f2fa0239abf44d89 (patch)
tree89ba9f88b86c22b25506e43277c3a2fc51a9c2c9 /CruUI/ui/controls/text_block.cpp
parent9caec47adf266946fdce290aaf5ec0c865197650 (diff)
downloadcru-dea11f34bfab5bfd5f66dec9f2fa0239abf44d89.tar.gz
cru-dea11f34bfab5bfd5f66dec9f2fa0239abf44d89.tar.bz2
cru-dea11f34bfab5bfd5f66dec9f2fa0239abf44d89.zip
Improve linear layout. Add debug border visualization.
Diffstat (limited to 'CruUI/ui/controls/text_block.cpp')
-rw-r--r--CruUI/ui/controls/text_block.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/CruUI/ui/controls/text_block.cpp b/CruUI/ui/controls/text_block.cpp
index 294c456b..8921198b 100644
--- a/CruUI/ui/controls/text_block.cpp
+++ b/CruUI/ui/controls/text_block.cpp
@@ -76,6 +76,7 @@ namespace cru
void TextBlock::OnDraw(ID2D1DeviceContext* device_context)
{
+ Control::OnDraw(device_context);
if (text_layout_ != nullptr)
{
if (selected_range_.has_value())
@@ -179,7 +180,7 @@ namespace cru
Size TextBlock::OnMeasure(const Size& available_size)
{
if (text_.empty())
- return Size::zero;
+ return Size::Zero();
const auto layout_params = GetLayoutParams();
@@ -252,6 +253,9 @@ namespace cru
24.0, L"zh-cn",
&text_format_
));
+
+ ThrowIfFailed(text_format_->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER));
+ ThrowIfFailed(text_format_->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_CENTER));
}
void TextBlock::RecreateTextLayout()