lint, better style

Author: leolost2605

lib/FocusController.vala

@@ -6,36 +6,32 @@
  */
 
 public class Gala.FocusController : Object {
-    public static FocusController get_default (Clutter.Stage stage) {
-        return instance.once (() => new FocusController (stage));
-    }
+    private static HashTable<Clutter.Stage, FocusController> instances;
 
-    public Clutter.Stage stage { get; construct; }
+    static construct {
+        instances = new HashTable<Clutter.Stage, FocusController> (null, null);
+    }
 
-    private bool _focus_visible = false;
-    public bool focus_visible {
-        get { return _focus_visible; }
-        private set {
-            _focus_visible = value;
-            if (stage.get_key_focus () is Focusable) {
-                ((Focusable) stage.get_key_focus ()).notify_visible_focus_changed ();
-            }
+    public static FocusController get_for_stage (Clutter.Stage stage) {
+        if (!instances.contains (stage)) {
+            instances[stage] = new FocusController (stage);
         }
+        return instances[stage];
     }
 
-    private static GLib.Once<FocusController> instance;
-
-    private Gee.List<unowned Focusable> root_focusables;
+    public Clutter.Stage stage { get; construct; }
+    public bool focus_visible { get; private set; default = false; }
 
+    private Gee.List<weak Focusable> root_focusables;
     private uint timeout_id = 0;
 
-    public FocusController (Clutter.Stage stage) {
+    private FocusController (Clutter.Stage stage) {
         Object (stage: stage);
     }
 
     construct {
         root_focusables = new Gee.LinkedList<unowned Focusable> ();
-        stage.key_press_event.connect (on_key_press_event);
+        stage.key_press_event.connect (handle_key_event);
     }
 
     public void register_root (Focusable root) {
@@ -48,15 +44,6 @@ public class Gala.FocusController : Object {
         root.weak_ref ((obj) => root_focusables.remove ((Focusable) obj));
     }
 
-    private bool on_key_press_event (Clutter.Event event) {
-        if (handle_key_event (event) == Clutter.EVENT_STOP) {
-            show_focus ();
-            return Clutter.EVENT_STOP;
-        }
-
-        return Clutter.EVENT_PROPAGATE;
-    }
-
     private bool handle_key_event (Clutter.Event event) {
         Focusable? mapped_root = null;
         foreach (var root_focusable in root_focusables) {
@@ -72,14 +59,16 @@ public class Gala.FocusController : Object {
             return Clutter.EVENT_PROPAGATE;
         }
 
-        if(!mapped_root.focus (direction)) {
+        if (!mapped_root.focus (direction)) {
 #if HAS_MUTTER47
             stage.context.get_backend ().get_default_seat ().bell_notify ();
 #else
             Clutter.get_default_backend ().get_default_seat ().bell_notify ();
 #endif
         }
 
+        show_focus ();
+
         return Clutter.EVENT_STOP;
     }
 

lib/Focusable.vala

@@ -5,7 +5,7 @@
  * Authored by: Leonhard Kargl <[email protected]>
  */
 
-public interface Gala.Focusable : Clutter.Actor{
+public interface Gala.Focusable : Clutter.Actor {
     public enum FocusDirection {
         UP,
         DOWN,
@@ -180,9 +180,11 @@ public interface Gala.Focusable : Clutter.Actor{
             return false;
         }
 
-        get_stage ().set_key_focus (this);
-        notify_visible_focus_changed ();
-        key_focus_out.connect (notify_visible_focus_changed);
+        var stage = get_stage ();
+        stage.set_key_focus (this);
+        focus_changed ();
+        key_focus_out.connect (focus_changed);
+        FocusController.get_for_stage (stage).notify["focus-visible"].connect (focus_changed);
 
         return true;
     }
@@ -191,9 +193,9 @@ public interface Gala.Focusable : Clutter.Actor{
         return false;
     }
 
-    internal void notify_visible_focus_changed () {
+    private void focus_changed () {
         var stage = get_stage ();
-        update_focus (stage?.get_key_focus () == this && FocusController.get_default (stage).focus_visible);
+        update_focus (stage?.get_key_focus () == this && FocusController.get_for_stage (stage).focus_visible);
     }
 
     protected virtual void update_focus (bool has_visible_focus) { }

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -56,7 +56,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
         reactive = true;
         clip_to_allocation = true;
 
-        FocusController.get_default (wm.stage).register_root (this);
+        FocusController.get_for_stage (wm.stage).register_root (this);
 
         opened = false;
         display = wm.get_display ();