Revert "revert textinput changes"

This reverts commit 1e03f9a.

Author: johnzhou721

gtk/src/toga_gtk/widgets/textinput.py

@@ -1,20 +1,43 @@
 from travertino.size import at_least
 
+from toga.handlers import WeakrefCallable
 from toga.keys import Key
 from toga_gtk.keys import toga_key
 
-from ..libs import Gtk, gtk_text_align
+from ..libs import GTK_VERSION, Gtk, gtk_text_align
 from .base import Widget
 
 
 class TextInput(Widget):
     def create(self):
         self.native = Gtk.Entry()
 
-        self.native.connect("changed", self.gtk_on_change)
-        self.native.connect("focus-in-event", self.gtk_focus_in_event)
-        self.native.connect("focus-out-event", self.gtk_focus_out_event)
-        self.native.connect("key-press-event", self.gtk_key_press_event)
+        if GTK_VERSION < (4, 0, 0):  # pragma: no-cover-if-gtk4
+            self.native.connect("changed", self.gtk_on_change)
+            self.native.connect("focus-in-event", self.gtk_focus_in_event)
+            self.native.connect("focus-out-event", self.gtk_focus_out_event)
+            self.native.connect("key-press-event", self.gtk_key_press_event)
+        else:  # pragma: no-cover-if-gtk3
+            # Ideally we would connect to the `changed` signal, but it is
+            # emitting two events each time text is changed
+            # https://gitlab.gnome.org/GNOME/gtk/-/issues/7077
+            self.native.connect("notify::text", self.gtk_on_change)
+
+            self.focus_controller = Gtk.EventControllerFocus.new()
+            self.native.add_controller(self.focus_controller)
+
+            self.focus_controller.connect(
+                "enter", WeakrefCallable(self.gtk_focus_in_event)
+            )
+            self.focus_controller.connect(
+                "leave", WeakrefCallable(self.gtk_focus_out_event)
+            )
+
+            self.key_controller = Gtk.EventControllerKey.new()
+            self.native.add_controller(self.key_controller)
+            self.key_controller.connect(
+                "key-pressed", WeakrefCallable(self.gtk_key_pressed)
+            )
 
     def gtk_on_change(self, *_args):
         self.interface._value_changed()
@@ -25,10 +48,19 @@ def gtk_focus_in_event(self, *_args):
     def gtk_focus_out_event(self, *_args):
         self.interface.on_lose_focus()
 
-    def gtk_key_press_event(self, _entry, event):
-        key_pressed = toga_key(event.keyval, event.state)
-        if key_pressed and key_pressed["key"] in {Key.ENTER, Key.NUMPAD_ENTER}:
-            self.interface.on_confirm()
+    if GTK_VERSION < (4, 0, 0):  # pragma: no-cover-if-gtk4
+
+        def gtk_key_press_event(self, _entry, event):
+            key_pressed = toga_key(event.keyval, event.state)
+            if key_pressed and key_pressed["key"] in {Key.ENTER, Key.NUMPAD_ENTER}:
+                self.interface.on_confirm()
+
+    else:  # pragma: no-cover-if-gtk3
+
+        def gtk_key_pressed(self, _controller, keyval, _keycode, state):
+            key_pressed = toga_key(keyval, state)
+            if key_pressed and key_pressed["key"] in {Key.ENTER, Key.NUMPAD_ENTER}:
+                self.interface.on_confirm()
 
     def get_readonly(self):
         return not self.native.get_property("editable")
@@ -55,21 +87,35 @@ def set_value(self, value):
         self.native.set_text(value)
 
     def rehint(self):
-        # print(
-        #     "REHINT",
-        #     self,
-        #     self._impl.get_preferred_width(),
-        #     self._impl.get_preferred_height(),
-        #     getattr(self, "_fixed_height", False),
-        #     getattr(self, "_fixed_width", False),
-        # )
-        width = self.native.get_preferred_width()
-        height = self.native.get_preferred_height()
-
-        self.interface.intrinsic.width = at_least(
-            max(self.interface._MIN_WIDTH, width[1])
-        )
-        self.interface.intrinsic.height = height[1]
+        if GTK_VERSION < (4, 0, 0):  # pragma: no-cover-if-gtk4
+            # print(
+            #     "REHINT",
+            #     self,
+            #     self._impl.get_preferred_width(),
+            #     self._impl.get_preferred_height(),
+            #     getattr(self, "_fixed_height", False),
+            #     getattr(self, "_fixed_width", False),
+            # )
+            width = self.native.get_preferred_width()
+            height = self.native.get_preferred_height()
+
+            self.interface.intrinsic.width = at_least(
+                max(self.interface._MIN_WIDTH, width[1])
+            )
+            self.interface.intrinsic.height = height[1]
+        else:  # pragma: no-cover-if-gtk3
+            print(
+                "[DEBUG TextInput] REHINT",
+                self,
+                self.native.get_preferred_size()[1].width,
+                self.native.get_preferred_size()[1].height,
+            )
+            min_size, size = self.native.get_preferred_size()
+
+            self.interface.intrinsic.width = at_least(
+                max(min_size.width, self.interface._MIN_WIDTH)
+            )
+            self.interface.intrinsic.height = min_size.height
 
     def set_error(self, error_message):
         self.native.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "error")

gtk/tests_backend/widgets/textinput.py

@@ -1,7 +1,7 @@
 import pytest
 
 from toga.constants import JUSTIFY, LEFT
-from toga_gtk.libs import GTK_VERSION, Gtk
+from toga_gtk.libs import Gtk
 
 from .base import SimpleProbe
 from .properties import toga_x_text_align
@@ -10,9 +10,6 @@
 class TextInputProbe(SimpleProbe):
     native_class = Gtk.Entry
 
-    if GTK_VERSION >= (4, 0, 0):
-        pytest.skip("GTK4 doesn't support text input yet")
-
     @property
     def value(self):
         return (