From 9724ab3a8d50c5fed5a5d7e09f33b2ee70190b2a Mon Sep 17 00:00:00 2001
From: Eugenio Parodi <ceccopierangiolieugenio@googlemail.com>
Date: Wed, 23 Mar 2022 00:19:30 +0000
Subject: [PATCH] FIX, TextEdit doubleclick selection on multiline wrap with
 tabs in between

---
 TermTk/TTkWidgets/texedit.py | 6 +++---
 demo/showcase/textedit.py    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/TermTk/TTkWidgets/texedit.py b/TermTk/TTkWidgets/texedit.py
index 623c266f..e89f5832 100644
--- a/TermTk/TTkWidgets/texedit.py
+++ b/TermTk/TTkWidgets/texedit.py
@@ -241,7 +241,7 @@ class _TTkTextEditView(TTkAbstractScrollView):
         I assume the x,y position already normalized using the _cursorAlign function
         '''
         dt, (fr, to) = self._lines[y]
-        return self._dataLines[dt], self._dataLines[dt].tabCharPos(x+fr,self._tabSpaces)
+        return self._dataLines[dt], fr+self._dataLines[dt].substring(fr,to).tabCharPos(x,self._tabSpaces)
 
     def _cursorFromLinePos(self,liney,p):
         '''
@@ -258,8 +258,8 @@ class _TTkTextEditView(TTkAbstractScrollView):
             if dt1 != dt:
                 break
             if fr<=p<to:
-                s = self._dataLines[dt].substring(0,p).tab2spaces(self._tabSpaces)
-                return len(s)-fr, liney
+                s = self._dataLines[dt].substring(fr,p).tab2spaces(self._tabSpaces)
+                return len(s), liney
             liney += 1
         liney-=1
         dt, (fr, to) = self._lines[liney]
diff --git a/demo/showcase/textedit.py b/demo/showcase/textedit.py
index 85bf2587..01a55565 100755
--- a/demo/showcase/textedit.py
+++ b/demo/showcase/textedit.py
@@ -57,7 +57,7 @@ def demoTextEdit(root=None):
     # Test Tabs
     te.append(ttk.TTkString("Tabs Test\n",ttk.TTkColor.UNDERLINE+ttk.TTkColor.BOLD))
     te.append("Word\tAnother Word\tYet more words")
-    te.append("What a wonderful word\tOut of this word\tBattle of the words\n")
+    te.append("What a wonderful word\tOut of this word\tBattle of the words\tThe city of thousand words\tThe word is not enough\tJurassic word\n")
     te.append("tab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab")
     te.append("-tab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab")
     te.append("--tab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab\ttab")