From 3378ddff5773f5a36b597574fa8fed6b25b169eb Mon Sep 17 00:00:00 2001
From: Xun Gong <hyouuu@gmail.com>
Date: Wed, 1 Sep 2021 18:54:22 -0700
Subject: [PATCH] Revert caret position change which breaks its position

---
 lib/src/widgets/cursor.dart | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/src/widgets/cursor.dart b/lib/src/widgets/cursor.dart
index 2d13aff0..427158d2 100644
--- a/lib/src/widgets/cursor.dart
+++ b/lib/src/widgets/cursor.dart
@@ -246,18 +246,8 @@ class CursorPainter {
   /// [offset] is global top left (x, y) of text line
   /// [position] is relative (x) in text line
   void paint(Canvas canvas, Offset offset, TextPosition position) {
-    // relative (x, y) to global offset
-    var relativeCaretOffset = editable!.getOffsetForCaret(position, prototype);
-    if (relativeCaretOffset == Offset.zero) {
-      relativeCaretOffset = editable!.getOffsetForCaret(
-          TextPosition(
-              offset: position.offset - 1, affinity: position.affinity),
-          prototype);
-      // Hardcoded 6 as estimate of the width of a character
-      relativeCaretOffset =
-          Offset(relativeCaretOffset.dx + 6, relativeCaretOffset.dy);
-    }
-    final caretOffset = relativeCaretOffset + offset;
+    final caretOffset =
+        editable!.getOffsetForCaret(position, prototype) + offset;;
     var caretRect = prototype.shift(caretOffset);
     if (style.offset != null) {
       caretRect = caretRect.shift(style.offset!);