Rename Focusable to Widget

Author: leolost2605

lib/Gestures/ActorTarget.vala

@@ -10,7 +10,7 @@
  * It will propagate gesture events to all direct descendants that are also {@link ActorTarget}s.
  * If a new child (or target via {@link add_target}) is added, its progress will be synced.
  */
-public class Gala.ActorTarget : Focusable, GestureTarget {
+public class Gala.ActorTarget : Clutter.Actor, GestureTarget {
     public bool animating { get { return ongoing_animations > 0; } }
 
     private double[] current_progress;

lib/Focusable/FocusController.vala lib/Widget/FocusController.valalib/Focusable/FocusController.vala renamed to lib/Widget/FocusController.vala

@@ -17,7 +17,7 @@ public class Gala.FocusController : Clutter.Action {
     }
 
     construct {
-        // In the case the key focus moves out of our focusable tree by some other means
+        // In the case the key focus moves out of our widget tree by some other means
         // make sure we can recapture it
         stage.key_press_event.connect (check_focus);
     }
@@ -27,15 +27,15 @@ public class Gala.FocusController : Clutter.Action {
     }
 
     private bool check_focus (Clutter.Event event) requires (
-        actor is Focusable && !(actor.get_parent () is Focusable) // Make sure we are only attached to root focusables
+        actor is Widget && !(actor.get_parent () is Widget) // Make sure we are only attached to root widgets
     ) {
         var direction = FocusDirection.get_for_event (event);
 
         if (direction == null) {
             return Clutter.EVENT_PROPAGATE;
         }
 
-        if (!((Focusable) actor).focus (direction)) {
+        if (!((Widget) actor).focus (direction)) {
 #if HAS_MUTTER47
             stage.context.get_backend ().get_default_seat ().bell_notify ();
 #else
@@ -68,6 +68,6 @@ public class Gala.FocusController : Clutter.Action {
 
     private void set_focus_visible (bool visible) {
         actor.set_qdata (focus_visible_quark, visible);
-        (stage.key_focus as Focusable)?.focus_changed ();
+        (stage.key_focus as Widget)?.focus_changed ();
     }
 }

lib/Focusable/FocusUtils.vala lib/Widget/FocusUtils.valalib/Focusable/FocusUtils.vala renamed to lib/Widget/FocusUtils.vala

@@ -28,16 +28,16 @@ public enum Gala.FocusDirection {
 }
 
 namespace Gala.FocusUtils {
-    public void filter_children_for_direction (Gee.List<Focusable> children, Clutter.Actor focus_actor, FocusDirection direction) {
-        Focusable? focus_child = null;
+    public void filter_children_for_direction (Gee.List<Widget> children, Clutter.Actor focus_actor, FocusDirection direction) {
+        Widget? focus_child = null;
         foreach (var child in children) {
             if (focus_actor in child) {
-                focus_child = (Focusable) child;
+                focus_child = (Widget) child;
                 break;
             }
         }
 
-        var to_retain = new Gee.LinkedList<Focusable> ();
+        var to_retain = new Gee.LinkedList<Widget> ();
         to_retain.add_all_iterator (children.filter ((c) => {
             if (focus_child == null || c == focus_child) {
                 return true;
@@ -67,7 +67,7 @@ namespace Gala.FocusUtils {
         return {(int) actor.x, (int) actor.y, (int) actor.width, (int) actor.height};
     }
 
-    public void sort_children_for_direction (Gee.List<Focusable> children, FocusDirection direction) {
+    public void sort_children_for_direction (Gee.List<Widget> children, FocusDirection direction) {
         children.sort ((a, b) => {
             if (direction == UP && a.y + a.height > b.y + b.height ||
                 direction == DOWN && a.y < b.y ||

lib/Focusable/Focusable.vala lib/Widget/Widget.valalib/Focusable/Focusable.vala renamed to lib/Widget/Widget.vala

@@ -5,7 +5,7 @@
  * Authored by: Leonhard Kargl <leo.kargl@proton.me>
  */
 
-public class Gala.Focusable : Clutter.Actor {
+public class Gala.Widget : ActorTarget {
     public bool can_focus { get; set; default = false; }
     public bool has_visible_focus { get; private set; default = false; }
 
@@ -18,9 +18,9 @@ public class Gala.Focusable : Clutter.Actor {
         has_visible_focus = has_key_focus () && get_root ().get_qdata<bool> (FocusController.focus_visible_quark);
     }
 
-    private Focusable get_root () {
+    private Widget get_root () {
         var parent = get_parent ();
-        if (parent is Focusable) {
+        if (parent is Widget) {
             return parent.get_root ();
         }
 
@@ -41,7 +41,7 @@ public class Gala.Focusable : Clutter.Actor {
 
         // A child of us (or subchild) has focus, try to move it to the next one.
         // If that doesn't work and we are moving backwards focus us
-        if (focus_actor != null && focus_actor is Focusable && focus_actor in this) {
+        if (focus_actor != null && focus_actor is Widget && focus_actor in this) {
             if (move_focus (direction)) {
                 return true;
             }
@@ -80,7 +80,7 @@ public class Gala.Focusable : Clutter.Actor {
     }
 
     protected virtual bool move_focus (FocusDirection direction) {
-        var children = get_focusable_children ();
+        var children = get_widget_children ();
 
         FocusUtils.filter_children_for_direction (children, get_stage ().key_focus, direction);
         FocusUtils.sort_children_for_direction (children, direction);
@@ -94,13 +94,13 @@ public class Gala.Focusable : Clutter.Actor {
         return false;
     }
 
-    private Gee.List<Focusable> get_focusable_children () {
-        var focusable_children = new Gee.ArrayList<Focusable> ();
+    private Gee.List<Widget> get_widget_children () {
+        var widget_children = new Gee.ArrayList<Widget> ();
         for (var child = get_first_child (); child != null; child = child.get_next_sibling ()) {
-            if (child is Focusable && child.visible) {
-                focusable_children.add ((Focusable) child);
+            if (child is Widget && child.visible) {
+                widget_children.add ((Widget) child);
             }
         }
-        return focusable_children;
+        return widget_children;
     }
 }

lib/meson.build

@@ -26,9 +26,6 @@ gala_lib_sources = files(
     'Utils.vala',
     'WindowIcon.vala',
     'WindowManager.vala',
-    'Focusable/Focusable.vala',
-    'Focusable/FocusController.vala',
-    'Focusable/FocusUtils.vala',
     'Gestures/ActorTarget.vala',
     'Gestures/Gesture.vala',
     'Gestures/GestureBackend.vala',
@@ -41,7 +38,10 @@ gala_lib_sources = files(
     'Gestures/SpringTimeline.vala',
     'Gestures/ToucheggBackend.vala',
     'Gestures/TouchpadBackend.vala',
-    'Gestures/WorkspaceHideTracker.vala'
+    'Gestures/WorkspaceHideTracker.vala',
+    'Widget/FocusController.vala',
+    'Widget/FocusUtils.vala',
+    'Widget/Widget.vala',
 ) + gala_common_enums
 
 gala_resources = gnome.compile_resources(

src/Widgets/MultitaskingView/MonitorClone.vala

@@ -11,7 +11,7 @@
  * as the WindowGroup is hidden while the view is active. Only used when
  * workspaces-only-on-primary is set to true.
  */
-public class Gala.MonitorClone : ActorTarget {
+public class Gala.MonitorClone : Widget {
     public signal void window_selected (Meta.Window window);
 
     public WindowManager wm { get; construct; }

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -20,7 +20,7 @@
  * preparing the wm, opening the components and holds containers for
  * the icon groups, the WorkspaceClones and the MonitorClones.
  */
-public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableComponent {
+public class Gala.MultitaskingView : Widget, RootTarget, ActivatableComponent {
     public const int ANIMATION_DURATION = 250;
 
     private GestureController workspaces_gesture_controller;
@@ -35,7 +35,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
 
     private List<MonitorClone> window_containers_monitors;
 
-    private ActorTarget workspaces;
+    private Widget workspaces;
     private Clutter.Actor primary_monitor_container;
     private Clutter.BrightnessContrastEffect brightness_effect;
     private BackgroundManager? blurred_bg = null;
@@ -81,7 +81,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
         // Create a child container that will be sized to fit the primary monitor, to contain the "main"
         // multitasking view UI. The Clutter.Actor of this class has to be allowed to grow to the size of the
         // stage as it contains MonitorClones for each monitor.
-        primary_monitor_container = new ActorTarget ();
+        primary_monitor_container = new Widget ();
         primary_monitor_container.add_child (workspaces);
         add_child (primary_monitor_container);
 

src/Widgets/MultitaskingView/StaticWindowClone.vala

@@ -10,7 +10,7 @@
  * windows (e.g. on all workspaces or moving) and fades out while the multitasking view
  * is being opened.
  */
-public class Gala.StaticWindowClone : ActorTarget {
+public class Gala.StaticWindowClone : Widget {
     public Meta.Window window { get; construct; }
 
     public StaticWindowClone (Meta.Window window) {

src/Widgets/MultitaskingView/StaticWindowContainer.vala

@@ -9,7 +9,7 @@
  * The window container use this to know whether a window became static (they shouldn't show it anymore)
  * or isn't static anymore (they have to show it now).
  */
-public class Gala.StaticWindowContainer : ActorTarget {
+public class Gala.StaticWindowContainer : Widget {
     private static GLib.Once<StaticWindowContainer> instance;
     public static StaticWindowContainer get_instance (Meta.Display display) {
         return instance.once (() => new StaticWindowContainer (display));

src/Widgets/MultitaskingView/WindowClone.vala

@@ -8,7 +8,7 @@
  * A container for a clone of the texture of a MetaWindow, a WindowIcon, a Tooltip with the title,
  * a close button and a shadow. Used together with the WindowCloneContainer.
  */
-public class Gala.WindowClone : ActorTarget, RootTarget {
+public class Gala.WindowClone : Widget, RootTarget {
     public enum Mode {
         MULTITASKING_VIEW,
         OVERVIEW,