2 files changed, 28 insertions, 51 deletions

diff --git a/CruUI/ui/controls/text_block.cpp b/CruUI/ui/controls/text_block.cpp
index f0ef41d9..4ecbb672 100644
--- a/CruUI/ui/controls/text_block.cpp
+++ b/CruUI/ui/controls/text_block.cpp
@@ -20,12 +20,11 @@ namespace cru
             TextBlock::TextBlock(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format,
                 const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush) : Control(false)
             {
-                text_format_ = init_text_format;
+                text_format_ = init_text_format == nullptr ? graph::CreateDefaultTextFormat() : init_text_format;
 
-                if (init_brush == nullptr)
-                    brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Black));
-                else
-                    brush_ = init_brush;
+                RecreateTextLayout();
+
+                brush_ = init_brush == nullptr ? CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Black)) : init_brush;
 
                 selection_brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::LightSkyBlue));
             }
@@ -126,15 +125,18 @@ namespace cru
                 }
             }
 
-            std::optional<unsigned> TextLayoutHitTest(IDWriteTextLayout* text_layout, const Point& point, bool test_inside = true)
+            namespace
             {
-                BOOL is_trailing, is_inside;
-                DWRITE_HIT_TEST_METRICS metrics{};
-                text_layout->HitTestPoint(point.x, point.y, &is_trailing, &is_inside, &metrics);
-                if (!test_inside || is_inside)
-                    return is_trailing == 0 ? metrics.textPosition : metrics.textPosition + 1;
-                else
-                    return std::nullopt;
+                std::optional<unsigned> TextLayoutHitTest(IDWriteTextLayout* text_layout, const Point& point, const bool test_inside = true)
+                {
+                    BOOL is_trailing, is_inside;
+                    DWRITE_HIT_TEST_METRICS metrics{};
+                    text_layout->HitTestPoint(point.x, point.y, &is_trailing, &is_inside, &metrics);
+                    if (!test_inside || is_inside)
+                        return is_trailing == 0 ? metrics.textPosition : metrics.textPosition + 1;
+                    else
+                        return std::nullopt;
+                }
             }
 
             void TextBlock::OnMouseDownCore(events::MouseButtonEventArgs& args)
@@ -264,17 +266,10 @@ namespace cru
 
             void TextBlock::RecreateTextLayout()
             {
-                if (text_.empty())
-                {
-                    text_layout_ = nullptr;
-                    return;
-                }
+                assert(text_format_ != nullptr);
 
                 const auto dwrite_factory = GetDWriteFactory();
 
-                if (text_format_ == nullptr)
-                    text_format_ = graph::CreateDefaultTextFormat();
-
                 const auto&& size = GetSize();
 
                 ThrowIfFailed(dwrite_factory->CreateTextLayout(
diff --git a/CruUI/ui/controls/text_box.cpp b/CruUI/ui/controls/text_box.cpp
index ce834ef6..586bc017 100644
--- a/CruUI/ui/controls/text_box.cpp
+++ b/CruUI/ui/controls/text_box.cpp
@@ -65,40 +65,22 @@ namespace cru::ui::controls
         Control::OnDraw(device_context);
         if (text_layout_ != nullptr)
         {
-            //if (selected_range_.has_value())
-            //{
-            //    DWRITE_TEXT_METRICS text_metrics{};
-            //    ThrowIfFailed(text_layout_->GetMetrics(&text_metrics));
-            //    const auto metrics_count = text_metrics.lineCount * text_metrics.maxBidiReorderingDepth;
-
-            //    Vector<DWRITE_HIT_TEST_METRICS> hit_test_metrics(metrics_count);
-            //    UINT32 actual_count;
-            //    text_layout_->HitTestTextRange(
-            //        selected_range_.value().position, selected_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), selection_brush_.Get());
-            //    }
-            //}
             device_context->DrawTextLayout(D2D1::Point2F(), text_layout_.Get(), brush_.Get());
         }
     }
 
-    std::optional<unsigned> TextLayoutHitTest(IDWriteTextLayout* text_layout, const Point& point, bool test_inside = true)
+    namespace
     {
-        BOOL is_trailing, is_inside;
-        DWRITE_HIT_TEST_METRICS metrics{};
-        text_layout->HitTestPoint(point.x, point.y, &is_trailing, &is_inside, &metrics);
-        if (!test_inside || is_inside)
-            return is_trailing == 0 ? metrics.textPosition : metrics.textPosition + 1;
-        else
-            return std::nullopt;
+        std::optional<unsigned> TextLayoutHitTest(IDWriteTextLayout* text_layout, const Point& point, bool test_inside = true)
+        {
+            BOOL is_trailing, is_inside;
+            DWRITE_HIT_TEST_METRICS metrics{};
+            text_layout->HitTestPoint(point.x, point.y, &is_trailing, &is_inside, &metrics);
+            if (!test_inside || is_inside)
+                return is_trailing == 0 ? metrics.textPosition : metrics.textPosition + 1;
+            else
+                return std::nullopt;
+        }
     }
 
     void TextBox::OnMouseDownCore(events::MouseButtonEventArgs& args)
@@ -107,7 +89,7 @@ namespace cru::ui::controls
         if (args.GetMouseButton() == MouseButton::Left)
         {
             position_ = TextLayoutHitTest(text_layout_.Get(), args.GetPoint(this), false).value();
-            
+
             Repaint();
         }
     }