From 61d43389e8f246777c215fdea6934a2915e8f993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 May 2024 10:58:30 -0700 Subject: [PATCH 1/2] PartitionBar: make sure we get click events Put the gesture in the constructor --- src/Widgets/PartitionBar.vala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Widgets/PartitionBar.vala b/src/Widgets/PartitionBar.vala index 0c99d944b..fa0193326 100644 --- a/src/Widgets/PartitionBar.vala +++ b/src/Widgets/PartitionBar.vala @@ -5,7 +5,7 @@ * Authored by: Michael Aaron Murphy */ -public class Installer.PartitionBar : Gtk.Box { +public class Installer.PartitionBar : Gtk.EventBox { public signal void decrypted (InstallerDaemon.LuksCredentials credential); public Icon? icon { get; set; default = null; } @@ -43,6 +43,9 @@ public class Installer.PartitionBar : Gtk.Box { menu.relative_to = this; menu.position = BOTTOM; + + click_gesture = new Gtk.GestureMultiPress (this); + click_gesture.released.connect (menu.popup); } class construct { @@ -64,9 +67,6 @@ public class Installer.PartitionBar : Gtk.Box { get_style_context ().add_class (Distinst.strfilesys (partition.filesystem)); - click_gesture = new Gtk.GestureMultiPress (this); - click_gesture.released.connect (menu.popup); - bind_property ("icon", image, "gicon", SYNC_CREATE); } From 0d7d53d52bb3198ccc2ad32afce5a849cb811310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 8 May 2024 11:44:46 -0700 Subject: [PATCH 2/2] KeyboardLayoutView: row only grabs focus once --- meson.build | 2 +- src/Views/KeyboardLayoutView.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index a89a27857..ef9254f97 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ gnome = import('gnome') i18n = import('i18n') distinst_dep = dependency('distinst') -glib_dep = dependency('glib-2.0') +glib_dep = dependency('glib-2.0', version: '>=2.74') gobject_dep = dependency('gobject-2.0') gtk_dep = dependency('gtk+-3.0') gee_dep = dependency('gee-0.8') diff --git a/src/Views/KeyboardLayoutView.vala b/src/Views/KeyboardLayoutView.vala index 81f7db05e..dc82bce06 100644 --- a/src/Views/KeyboardLayoutView.vala +++ b/src/Views/KeyboardLayoutView.vala @@ -186,7 +186,7 @@ public class KeyboardLayoutView : AbstractInstallerView { show_all (); - Idle.add (() => { + Idle.add_once (() => { string? country = Configuration.get_default ().country; if (country != null) { string default_layout = country.down ();