aboutsummaryrefslogtreecommitdiff
path: root/src/ui/controls/text_block.cpp
diff options
context:
space:
mode:
author杨宇千 <crupest@outlook.com>2018-11-07 21:17:30 +0800
committerGitHub <noreply@github.com>2018-11-07 21:17:30 +0800
commit634dab6ad2c9e4675beacfb77ac02b2d43cab132 (patch)
treeb44d8cd6f8f4ffbbb6451d42ba9a6b4d98828aec /src/ui/controls/text_block.cpp
parentdf0d6e1e282c75d4d8154011715f0b74547b35db (diff)
parent6f76a0ad3df99ea0d99623347d019536cc07e920 (diff)
downloadcru-634dab6ad2c9e4675beacfb77ac02b2d43cab132.tar.gz
cru-634dab6ad2c9e4675beacfb77ac02b2d43cab132.tar.bz2
cru-634dab6ad2c9e4675beacfb77ac02b2d43cab132.zip
Merge pull request #1 from crupest/minmax-layout
Min max layout support.
Diffstat (limited to 'src/ui/controls/text_block.cpp')
-rw-r--r--src/ui/controls/text_block.cpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp
index 7c52684d..e6c7fd7e 100644
--- a/src/ui/controls/text_block.cpp
+++ b/src/ui/controls/text_block.cpp
@@ -2,22 +2,16 @@
#include "ui/window.h"
-namespace cru
+namespace cru::ui::controls
{
- namespace ui
+ TextBlock::TextBlock(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format,
+ const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush) : TextControl(init_text_format, init_brush)
{
- namespace controls
- {
- TextBlock::TextBlock(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format,
- const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush) : TextControl(init_text_format, init_brush)
- {
- }
+ }
- StringView TextBlock::GetControlType() const
- {
- return control_type;
- }
- }
+ StringView TextBlock::GetControlType() const
+ {
+ return control_type;
}
}