3 files changed, 37 insertions, 11 deletions
diff --git a/src/platform/graphics/cairo/PangoTextLayout.cpp b/src/platform/graphics/cairo/PangoTextLayout.cpp
index 9d301031..25d9f85d 100644
--- a/src/platform/graphics/cairo/PangoTextLayout.cpp
+++ b/src/platform/graphics/cairo/PangoTextLayout.cpp
@@ -160,7 +160,19 @@ TextHitTestResult PangoTextLayout::HitTest(const Point& point) {
   auto inside_text =
       pango_layout_xy_to_index(pango_layout_, point.x * PANGO_SCALE,
                                point.y * PANGO_SCALE, &index, &trailing);
-  return TextHitTestResult{index, trailing != 0, inside_text != 0};
+
+  TextHitTestResult result{index, trailing != 0, inside_text != 0};
+
+  if (result.trailing) {
+    Index position_with_trailing;
+    string::Utf8NextCodePoint(text_.data(), text_.size(), result.position,
+                              &position_with_trailing);
+    result.position_with_trailing = position_with_trailing;
+  } else {
+    result.position_with_trailing = result.position;
+  }
+
+  return result;
 }
 
 }  // namespace cru::platform::graphics::cairo
diff --git a/src/platform/graphics/direct2d/TextLayout.cpp b/src/platform/graphics/direct2d/TextLayout.cpp
index d347e0f7..be9d75ff 100644
--- a/src/platform/graphics/direct2d/TextLayout.cpp
+++ b/src/platform/graphics/direct2d/TextLayout.cpp
@@ -154,8 +154,8 @@ Rect DWriteTextLayout::TextSinglePoint(Index position, bool trailing) {
   FLOAT left;
   FLOAT top;
   CheckHResult(text_layout_->HitTestTextPosition(static_cast<UINT32>(position),
-                                                  static_cast<BOOL>(trailing),
-                                                  &left, &top, &metrics));
+                                                 static_cast<BOOL>(trailing),
+                                                 &left, &top, &metrics));
   return Rect{left, top, 0, GetFont()->GetFontSize()};
 }
 
@@ -165,7 +165,7 @@ TextHitTestResult DWriteTextLayout::HitTest(const Point& point) {
   DWRITE_HIT_TEST_METRICS metrics;
 
   CheckHResult(text_layout_->HitTestPoint(point.x, point.y, &trailing, &inside,
-                                           &metrics));
+                                          &metrics));
 
   TextHitTestResult result;
   result.position = string::Utf8IndexCodePointToCodeUnit(
@@ -174,6 +174,16 @@ TextHitTestResult DWriteTextLayout::HitTest(const Point& point) {
           reinterpret_cast<const char16_t*>(utf16_text_.data()),
           utf16_text_.size(), metrics.textPosition));
   result.trailing = trailing != 0;
+
+  if (result.trailing) {
+    Index position_with_trailing;
+    string::Utf8NextCodePoint(text_.data(), text_.size(), result.position,
+                              &position_with_trailing);
+    result.position_with_trailing = position_with_trailing;
+  } else {
+    result.position_with_trailing = result.position;
+  }
+
   return result;
 }
 }  // namespace cru::platform::graphics::direct2d
diff --git a/src/platform/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp
index f98cff3a..4793a19c 100644
--- a/src/platform/graphics/quartz/TextLayout.cpp
+++ b/src/platform/graphics/quartz/TextLayout.cpp
@@ -180,11 +180,11 @@ Rect OsxCTTextLayout::TextSinglePoint(Index position, bool trailing) {
 TextHitTestResult OsxCTTextLayout::HitTest(const Point& point) {
   if (point.y < head_empty_line_count_ * font_->GetFontSize()) {
     if (point.y < 0) {
-      return {0, false, false};
+      return {0, false, false, 0};
     } else {
       for (int i = 1; i <= head_empty_line_count_; ++i) {
         if (point.y < i * font_->GetFontSize()) {
-          return {i - 1, false, false};
+          return {i - 1, false, false, i - 1};
         }
       }
     }
@@ -197,11 +197,14 @@ TextHitTestResult OsxCTTextLayout::HitTest(const Point& point) {
   if (point.y >= th) {
     for (int i = 1; i <= tail_empty_line_count_; ++i) {
       if (point.y < th + i * font_->GetFontSize()) {
-        return {static_cast<Index>(text_.size() - (tail_empty_line_count_ - i)),
-                false, false};
+        return {
+            static_cast<Index>(text_.size() - (tail_empty_line_count_ - i)),
+            false, false,
+            static_cast<Index>(text_.size() - (tail_empty_line_count_ - i))};
       }
     }
-    return {static_cast<Index>(text_.size()), false, false};
+    return {static_cast<Index>(text_.size()), false, false,
+            static_cast<Index>(text_.size())};
   }
 
   auto p = point;
@@ -261,11 +264,12 @@ TextHitTestResult OsxCTTextLayout::HitTest(const Point& point) {
         --po;
       }
 
-      return {po + head_empty_line_count_, false, inside_text};
+      return {po + head_empty_line_count_, false, inside_text,
+              po + head_empty_line_count_};
     }
   }
 
-  return TextHitTestResult{0, false, false};
+  return TextHitTestResult{0, false, false, 0};
 }
 
 void OsxCTTextLayout::ReleaseResource() {