Commit: 8dc1f5210a731e03d9ab813ba581b3d3909dc749 - MekikuViewer (git)

ポータブルな Mekiku 互換ビューワ

Commit MetaInfo

• Revision: 8dc1f5210a731e03d9ab813ba581b3d3909dc749 (tree)
• Zeit: 2019-08-29 02:27:42
• Autor: TAKAHASHI Tamotsu <ttakah+osdn@gmai...>
• Commiter: TAKAHASHI Tamotsu

Log Message

delete trailing space after textedit is done

Ändern Zusammenfassung

• modified: IMETextInput.py

Diff

--- a/IMETextInput.py
+++ b/IMETextInput.py
@@ -1,29 +1,31 @@
 __all__ = ("IMETextInput", )
 
 from kivy.uix.textinput import TextInput
-from kivy.properties import StringProperty
 from kivy.base import EventLoop
 from kivy.core.text.markup import MarkupLabel
 from kivy.core.text import Label
 
 
 class IMETextInput(TextInput):
-    editing = StringProperty()
-
     def __init__(self, **kwargs):
         super(IMETextInput, self).__init__(**kwargs)
+
         EventLoop.window.bind(on_textedit=self._on_textedit)
+        self.editing = False
+        self._spacehack = False
 
     def _on_textedit(self, window, text):
-        self.editing = text
-        if len(text):
-            self.suggestion_text = "[" + text + "]"
-        else:
-            self.suggestion_text = ""
+        self.editing = True if len(text) else False
+        self.suggestion_text = text
+
+        # hack: see below for the reason
+        if not self.editing and self._spacehack:
+            self.text = self.text.rsplit(" ", 1)[0]
 
     def keyboard_on_key_down(self, window, keycode, text, modifiers):
-        if len(self.editing):
+        if self.editing:
             return True  # IME consumes it all
+
         super(IMETextInput, self).keyboard_on_key_down(
                 window, keycode, text, modifiers)
 
@@ -34,8 +36,9 @@ class IMETextInput(TextInput):
         #       even when _lines_labels is given
         if not len(self._lines) or (
                 len(self._lines) == 1 and not self._lines[0]):
-            self._set_text(" ")  # hack: when should I delete it?
+            self._set_text(" ")
             self.cursor = [0, 0]
+            self._spacehack = True
 
         cursor_row = self.cursor_row
         if cursor_row >= len(self._lines) or self.canvas is None:
@@ -52,7 +55,7 @@ class IMETextInput(TextInput):
         lbl = None
         if value:
             lbl = MarkupLabel(
-                text=pre + "[b]{}[/b]".format(value) + suf, **kw)
+                text=pre + "[u]{}[/u]".format(value) + suf, **kw)
         else:
             lbl = Label(text=txt, **kw)