Remove hack to ensure that focus is set.

set_focus() should do the trick according to the docs, so
let's just use that, and not go to extraordinary measures.
This commit is contained in:
Matthew Rose 2023-02-28 21:42:29 -05:00
parent 403bf540d0
commit 066acd779a
1 changed files with 3 additions and 14 deletions

View File

@ -346,22 +346,11 @@ class Terminator(Borg):
t = 0 t = 0
window.get_window().focus(t) window.get_window().focus(t)
# Awful workaround to be sure that the last focused window is actually the one focused. # Going by the docs, this should be all that's needed to ensure that the
# Don't ask, don't tell policy on this. Even this is not 100% # last_active_window is focussed.
if self.last_active_window: if self.last_active_window:
window = self.find_window_by_uuid(self.last_active_window.urn) window = self.find_window_by_uuid(self.last_active_window.urn)
count = 0 window.set_focus()
while count < 1000 and Gtk.events_pending():
count += 1
Gtk.main_iteration_do(False)
window.show()
window.grab_focus()
try:
t = GdkX11.x11_get_server_time(window.get_window())
except (NameError,TypeError, AttributeError):
t = 0
window.get_window().focus(t)
self.prelayout_windows = None self.prelayout_windows = None
def on_gtk_theme_name_notify(self, settings, prop): def on_gtk_theme_name_notify(self, settings, prop):