diff options
Diffstat (limited to 'src/ui/controls/text_control.cpp')
| -rw-r--r-- | src/ui/controls/text_control.cpp | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/src/ui/controls/text_control.cpp b/src/ui/controls/text_control.cpp index e53d3c69..fcfcb90c 100644 --- a/src/ui/controls/text_control.cpp +++ b/src/ui/controls/text_control.cpp @@ -19,28 +19,7 @@ namespace cru::ui::controls return is_trailing == 0 ? metrics.textPosition : metrics.textPosition + 1; } - void DrawSelectionRect(ID2D1DeviceContext* device_context, IDWriteTextLayout* layout, ID2D1Brush* brush, const std::optional<TextRange> range) - { - if (range.has_value()) - { - DWRITE_TEXT_METRICS text_metrics{}; - ThrowIfFailed(layout->GetMetrics(&text_metrics)); - const auto metrics_count = text_metrics.lineCount * text_metrics.maxBidiReorderingDepth; - - std::vector<DWRITE_HIT_TEST_METRICS> hit_test_metrics(metrics_count); - UINT32 actual_count; - layout->HitTestTextRange( - range.value().position, range.value().count, - 0, 0, - hit_test_metrics.data(), metrics_count, &actual_count - ); - - hit_test_metrics.erase(hit_test_metrics.cbegin() + actual_count, hit_test_metrics.cend()); - - for (const auto& metrics : hit_test_metrics) - device_context->FillRoundedRectangle(D2D1::RoundedRect(D2D1::RectF(metrics.left, metrics.top, metrics.left + metrics.width, metrics.top + metrics.height), 3, 3), brush); - } - } + } TextControl::TextControl(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format, @@ -58,9 +37,6 @@ namespace cru::ui::controls draw_content_event.AddHandler([this](events::DrawEventArgs& args) { - const auto device_context = args.GetDeviceContext(); - DrawSelectionRect(device_context, text_layout_.Get(), selection_brush_.Get(), selected_range_); - device_context->DrawTextLayout(D2D1::Point2F(), text_layout_.Get(), brush_.Get()); }); mouse_down_event.bubble.AddHandler([this](events::MouseButtonEventArgs& args) @@ -169,19 +145,7 @@ namespace cru::ui::controls } } - Size TextControl::OnMeasureContent(const Size& available_size, const AdditionalMeasureInfo&) - { - ThrowIfFailed(text_layout_->SetMaxWidth(available_size.width)); - ThrowIfFailed(text_layout_->SetMaxHeight(available_size.height)); - - DWRITE_TEXT_METRICS metrics{}; - ThrowIfFailed(text_layout_->GetMetrics(&metrics)); - - const Size measure_result(metrics.width, metrics.height); - - return measure_result; - } void TextControl::RequestChangeCaretPosition(unsigned position) { @@ -202,24 +166,6 @@ namespace cru::ui::controls InvalidateDraw(); } - void TextControl::RecreateTextLayout() - { - assert(text_format_ != nullptr); - - text_layout_ = nullptr; - - const auto dwrite_factory = graph::GraphManager::GetInstance()->GetDWriteFactory(); - - const auto&& size = GetSize(); - - ThrowIfFailed(dwrite_factory->CreateTextLayout( - text_.c_str(), static_cast<UINT32>(text_.size()), - text_format_.Get(), - size.width, size.height, - &text_layout_ - )); - } - void TextControl::UpdateCursor(const std::optional<Point>& point) { if (!is_selectable_) |