From de8c3cb6778c3ebf829fab988897107c8071644c Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 2 Jul 2019 21:26:36 -0700 Subject: [PATCH] app: Use gtk_window_present for activation GTK 3.24.7 has fixed the gtk_window_present() not working in Wayland issue described here: https://gitlab.gnome.org/GNOME/gtk/issues/624. Since this has been fixed update our minimum GTK version and use the present() function. Signed-off-by: Alistair Francis --- fractal-gtk/src/app/mod.rs | 5 +---- meson.build | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fractal-gtk/src/app/mod.rs b/fractal-gtk/src/app/mod.rs index 885e5640..ba378b62 100644 --- a/fractal-gtk/src/app/mod.rs +++ b/fractal-gtk/src/app/mod.rs @@ -249,10 +249,7 @@ impl App { fn on_activate(&self) { self.main_window.show(); - // FIXME: present() dosen't work currently on wayland because of - // https://gitlab.gnome.org/GNOME/gtk/issues/624 - self.main_window - .present_with_time((glib::get_monotonic_time() / 1000) as u32) + self.main_window.present() } fn on_shutdown(self) { diff --git a/meson.build b/meson.build index cb028799..d2544ca8 100644 --- a/meson.build +++ b/meson.build @@ -11,7 +11,7 @@ dependency('glib-2.0', version: '>= 2.56') dependency('gio-2.0', version: '>= 2.56') dependency('cairo', version: '>= 1.16') dependency('gdk-pixbuf-2.0') -dependency('gtk+-3.0', version: '>= 3.22') +dependency('gtk+-3.0', version: '>= 3.24.7') dependency('libhandy-0.0', version: '>= 0.0.9') dependency('gtksourceview-3.0', version: '>= 3.22') dependency('gspell-1', version: '>= 1.8')