fix issue with some listeners not being triggered

akiraux · Sep 2, 2020 · c0d819e · c0d819e
1 parent 4c37923
commit c0d819e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/Services/ActionManager.vala b/src/Services/ActionManager.vala
@@ -469,13 +469,11 @@ public class Akira.Services.ActionManager : Object {
         bool is_holding_shift = false;
         var color_picker = new Akira.Utils.ColorPicker ();
         color_picker.show_all ();
-        color_picker.key_press_event.connect (e => {
+        color_picker.key_pressed.connect (e => {
             is_holding_shift = e.keyval == Gdk.Key.Shift_L;
-            return true;
         });
-        color_picker.key_release_event.connect (e => {
+        color_picker.key_released.connect (e => {
             is_holding_shift = e.keyval == Gdk.Key.Shift_L;
-            return true;
         });
         color_picker.cancelled.connect (() => {
             color_picker.close ();

diff --git a/src/Utils/ColorPicker.vala b/src/Utils/ColorPicker.vala
@@ -24,6 +24,8 @@ public class Akira.Utils.ColorPicker : Gtk.Window {
     public signal void picked (Gdk.RGBA color);
     public signal void cancelled ();
     public signal void moved (Gdk.RGBA color);
+    public signal void key_pressed (Gdk.EventKey e);
+    public signal void key_released (Gdk.EventKey e);
 
     const string DARK_BORDER_COLOR_STRING = "#333333";
     private Gdk.RGBA dark_border_color = Gdk.RGBA ();
@@ -271,6 +273,14 @@ public class Akira.Utils.ColorPicker : Gtk.Window {
                 break;
         }
 
+        key_pressed (e);
+
+        return true;
+    }
+
+    public override bool key_release_event (Gdk.EventKey e) {
+        key_released (e);
+
         return true;
     }