Merge pull request #344 from Leleat/active-window-hint-v2

Active window hint v2
Leleat · Aug 11, 2024 · 169656a · 169656a
2 parents e0cf30c + 2dc8d58
commit 169656a
Show file tree

Hide file tree

Showing 8 changed files with 947 additions and 401 deletions.
diff --git a/tiling-assistant@leleat-on-github/extension.js b/tiling-assistant@leleat-on-github/extension.js
@@ -23,8 +23,8 @@ import MoveHandler from './src/extension/moveHandler.js';
 import ResizeHandler from './src/extension/resizeHandler.js';
 import KeybindingHandler from './src/extension/keybindingHandler.js';
 import LayoutsManager from './src/extension/layoutsManager.js';
-import ActiveWindowHint from './src/extension/activeWindowHint.js';
 import AltTabOverride from './src/extension/altTab.js';
+import FocusHintManager from './src/extension/focusHint.js';
 import { Rect } from './src/extension/utility.js';
 
 /**
@@ -160,7 +160,7 @@ export default class TilingAssistantExtension extends Extension {
         this._resizeHandler = new ResizeHandler();
         this._keybindingHandler = new KeybindingHandler();
         this._layoutsManager = new LayoutsManager();
-        this._activeWindowHintHandler = new ActiveWindowHint();
+        this._focusHintManager = new FocusHintManager();
         this._altTabOverride = new AltTabOverride();
 
         // Disable native tiling.
@@ -239,8 +239,8 @@ export default class TilingAssistantExtension extends Extension {
         this._keybindingHandler = null;
         this._layoutsManager.destroy();
         this._layoutsManager = null;
-        this._activeWindowHintHandler.destroy();
-        this._activeWindowHintHandler = null;
+        this._focusHintManager.destroy();
+        this._focusHintManager = null;
 
         this._altTabOverride.destroy();
         this._altTabOverride = null;

diff --git a/tiling-assistant@leleat-on-github/prefs.js b/tiling-assistant@leleat-on-github/prefs.js
@@ -100,8 +100,7 @@ export default class Prefs extends ExtensionPreferences {
             'screen-left-gap',
             'screen-right-gap',
             'screen-bottom-gap',
-            'active-window-hint-border-size',
-            'active-window-hint-inner-border-size',
+            'focus-hint-outline-size',
             'toggle-maximize-tophalf-timer',
             'vertical-preview-area',
             'horizontal-preview-area'
@@ -135,7 +134,7 @@ export default class Prefs extends ExtensionPreferences {
     */
     _bindColorButtons(settings, builder) {
         const switches = [
-            'active-window-hint-color'
+            'focus-hint-color'
         ];
 
         switches.forEach(key => {
@@ -170,11 +169,12 @@ export default class Prefs extends ExtensionPreferences {
                 ]
             },
             {
-                key: 'active-window-hint',
+                key: 'focus-hint',
                 rowNames: [
-                    'active_window_hint_disabled_row',
-                    'active_window_hint_minimal_row',
-                    'active_window_hint_always_row'
+                    'disabled_focus_hint_row',
+                    'animated_outline_focus_hint_row',
+                    'animated_upscale_focus_hint_row',
+                    'static_outline_focus_hint_row'
                 ]
             },
             {

diff --git a/...ssistant@leleat-on-github/schemas/org.gnome.shell.extensions.tiling-assistant.gschema.xml b/...ssistant@leleat-on-github/schemas/org.gnome.shell.extensions.tiling-assistant.gschema.xml
@@ -20,18 +20,17 @@
 			<!-- 0: Disabled, 1: Focus, 2: Tiling State, 3: Tiling State (Windows), 4: Favorite Layout -->
 			<default>0</default>
 		</key>
-		<key name="active-window-hint" type="i">
-			<!-- 0: Disabled, 1: Minimal, 2: Always -->
-			<default>1</default>
+		<key name="focus-hint" type="i">
+			<default>0</default>
 		</key>
-		<key name="active-window-hint-color" type="s">
+		<key name="focus-hint-color" type="s">
 			<default>''</default>
 		</key>
-		<key name="active-window-hint-border-size" type="i">
-			<default>5</default>
+		<key name="focus-hint-outline-border-radius" type="i">
+			<default>8</default>
 		</key>
-		<key name="active-window-hint-inner-border-size" type="i">
-			<default>0</default>
+		<key name="focus-hint-outline-size" type="i">
+			<default>8</default>
 		</key>
 		<key name="window-gap" type="i">
 			<default>0</default>

diff --git a/tiling-assistant@leleat-on-github/src/common.js b/tiling-assistant@leleat-on-github/src/common.js
@@ -154,6 +154,13 @@ export class DynamicKeybindings {
     static FAVORITE_LAYOUT = 4;
 }
 
+export const FocusHint = Object.freeze({
+    DISABLED: 0,
+    ANIMATED_OUTLINE: 1,
+    ANIMATED_UPSCALE: 2,
+    STATIC_OUTLINE: 3
+});
+
 export class MoveModes {
     // Order comes from prefs
     static EDGE_TILING = 0;

diff --git a/tiling-assistant@leleat-on-github/src/dependencies/shell.js b/tiling-assistant@leleat-on-github/src/dependencies/shell.js
@@ -3,8 +3,10 @@ export {
     gettext as _
 } from 'resource:///org/gnome/shell/extensions/extension.js';
 
+export * as AppFavorites from 'resource:///org/gnome/shell/ui/appFavorites.js';
 export * as AltTab from 'resource:///org/gnome/shell/ui/altTab.js';
 export * as Main from 'resource:///org/gnome/shell/ui/main.js';
+export * as OsdWindow from 'resource:///org/gnome/shell/ui/osdWindow.js';
 export * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
 export * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
 export * as SwitcherPopup from 'resource:///org/gnome/shell/ui/switcherPopup.js';