From 34c4627db921e88b0401cfec7b3b7951e25eb07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 18 Mar 2020 22:10:36 +0100 Subject: [PATCH] st/entry: Bind ClutterText reactivity to entry The text is part of the entry, so it is surprising that it can still be edited when the entry itself isn't reactive. Address this by setting up a binding instead of expecting all consumers to handle the case themselves. https://gitlab.gnome.org/GNOME/gnome-shell/issues/2423 --- js/ui/appDisplay.js | 1 - src/st/st-entry.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index b191d5814..a8c0cb3c2 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -691,7 +691,6 @@ var AllView = GObject.registerClass({ // Toggle search entry Main.overview.searchEntry.reactive = !isOpen; - Main.overview.searchEntry.clutter_text.reactive = !isOpen; Main.overview.searchEntry.clutter_text.editable = !isOpen; this._displayingPopup = isOpen; diff --git a/src/st/st-entry.c b/src/st/st-entry.c index a0f5cb8d0..2be524bb3 100644 --- a/src/st/st-entry.c +++ b/src/st/st-entry.c @@ -977,6 +977,10 @@ st_entry_init (StEntry *entry) "single-line-mode", TRUE, NULL); + g_object_bind_property (G_OBJECT (entry), "reactive", + priv->entry, "reactive", + G_BINDING_DEFAULT); + g_signal_connect (priv->entry, "key-focus-in", G_CALLBACK (clutter_text_focus_in_cb), entry);