MainWindow: Use EventControllerKey (#716)

Author: danirabbit

src/MainWindow.vala

@@ -37,12 +37,13 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
 
     private bool installer_mode = false;
 
+    private Gtk.EventControllerKey key_controller;
+
     private const uint[] NAVIGATION_KEYS = {
         Gdk.Key.Up,
         Gdk.Key.Down,
         Gdk.Key.Left,
         Gdk.Key.Right,
-        Gdk.Key.Return,
         Gdk.Key.Tab
     };
 
@@ -178,11 +179,16 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
         manual_card.do_connect_username.connect (do_connect_username);
         manual_card.do_connect.connect (do_connect);
 
-        key_press_event.connect ((event) => {
-            if (!(event.keyval in NAVIGATION_KEYS)) {
+        key_controller = new Gtk.EventControllerKey (this) {
+            propagation_phase = CAPTURE
+        };
+        key_controller.key_pressed.connect ((keyval, keycode, state) => {
+            var mods = state & Gtk.accelerator_get_default_mod_mask ();
+
+            if (!(keyval in NAVIGATION_KEYS)) {
                 // Don't focus if it is a modifier or if search_box is already focused
                 unowned var current_focus = get_focus ();
-                if ((event.is_modifier == 0) && (current_focus == null || !current_focus.is_ancestor (current_card))) {
+                if ((mods == 0) && (current_focus == null || !current_focus.is_ancestor (current_card))) {
                     current_card.grab_focus ();
                 }
 
@@ -194,15 +200,15 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
                 unowned var focused_entry = (Gtk.Entry) get_focus ();
                 if (focused_entry != null && focused_entry.is_ancestor (current_card)) {
                     if (focused_entry.text == "") {
-                        if (event.keyval == Gdk.Key.Left) {
-                            if (get_style_context ().direction == LTR) {
+                        if (keyval == Gdk.Key.Left) {
+                            if (Gtk.StateFlags.DIR_LTR in get_state_flags ()) {
                                 go_previous ();
                             } else {
                                 go_next ();
                             }
                             return Gdk.EVENT_STOP;
-                        } else if (event.keyval == Gdk.Key.Right) {
-                            if (get_style_context ().direction == LTR) {
+                        } else if (keyval == Gdk.Key.Right) {
+                            if (Gtk.StateFlags.DIR_LTR in get_state_flags ()) {
                                 go_next ();
                             } else {
                                 go_previous ();
@@ -212,8 +218,6 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
                     }
                 }
             }
-
-            return Gdk.EVENT_PROPAGATE;
         });
 
         carousel.page_changed.connect ((index) => {
@@ -497,15 +501,15 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
         });
 
         user_card.go_left.connect (() => {
-            if (get_style_context ().direction == LTR) {
+            if (Gtk.StateFlags.DIR_LTR in get_state_flags ()) {
                 go_previous ();
             } else {
                 go_next ();
             }
         });
 
         user_card.go_right.connect (() => {
-            if (get_style_context ().direction == LTR) {
+            if (Gtk.StateFlags.DIR_LTR in get_state_flags ()) {
                 go_next ();
             } else {
                 go_previous ();