fix wrapping for delete, etc.

haliphax · Feb 27, 2021 · 4c0c3c9 · 4c0c3c9
1 parent f17ab21
commit 4c0c3c9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/xthulu/ui/editors.py b/xthulu/ui/editors.py
@@ -218,10 +218,13 @@ def process_keystroke(self, ks):
             after = after[1:]
             self.value[self.pos[1]] = before + after
             after = after[:min(len(after), self.columns - self.cursor[0])]
+
+            if self.cursor[0] + len(after) <= self.columns - 1:
+                after += ' '
+
             log.debug(f'delete "{self.value[self.pos[1]]}"')
 
-            return self._color(after + ' ' +
-                               self.term.move_x(self.cursor[0] + 1))
+            return self._color(after + self.term.move_left(len(after)))
 
         elif ks.code == self.term.KEY_LEFT:
             if self.cursor[0] <= 0 and self.pos[0] <= 0:
@@ -293,7 +296,7 @@ def process_keystroke(self, ks):
                 log.debug('shifting visible area right')
 
             prev = self.cursor[0]
-            self.cursor[0] = min(strlen, self.columns - 1)
+            self.cursor[0] = min(strlen - self.pos[0], self.columns - 1)
             log.debug(f'end {self.pos}')
 
             return self.redraw(anchor=True) if shift \