From cff464cc31aeae0e9168cf45570e6ce6ff3c79a9 Mon Sep 17 00:00:00 2001 From: Anurag Dhadse Date: Mon, 13 Nov 2023 18:48:04 +0530 Subject: [PATCH] bug fixes - remove older version of gnome from supported list - Add `ISubExtension` and `IExtension` to `global.d.ts`. --- @types/gnome-shell/extensions/global.d.ts | 8 ++++++++ extension/extension.ts | 3 ++- extension/src/altTab.ts | 1 + extension/src/forwardBack.ts | 1 + extension/src/gestures.ts | 1 + extension/src/overviewRoundTrip.ts | 1 + extension/src/pinchGestures/closeWindow.ts | 1 + extension/src/pinchGestures/showDesktop.ts | 1 + extension/src/snapWindow.ts | 1 + metadata.json | 3 --- 10 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 @types/gnome-shell/extensions/global.d.ts diff --git a/@types/gnome-shell/extensions/global.d.ts b/@types/gnome-shell/extensions/global.d.ts new file mode 100644 index 0000000..71ebc77 --- /dev/null +++ b/@types/gnome-shell/extensions/global.d.ts @@ -0,0 +1,8 @@ +export declare interface ISubExtension { + apply?(): void, + destroy(): void; +} +export declare interface IExtension { + enable(): void, + disable(): void; +} \ No newline at end of file diff --git a/extension/extension.ts b/extension/extension.ts index 80a84d4..6864e10 100644 --- a/extension/extension.ts +++ b/extension/extension.ts @@ -2,6 +2,7 @@ import GLib from '@gi-types/glib2'; import { Extension } from 'resource:///org/gnome/shell/extensions/extension'; import { AllSettingsKeys, GioSettings, PinchGestureType } from './common/settings'; import * as Constants from './constants'; +import { ISubExtension, IExtension } from 'resource:///org/gnome/shell/extensions/global'; import { AltTabConstants, ExtSettings, TouchpadConstants } from './constants'; import { AltTabGestureExtension } from './src/altTab'; import { ForwardBackGestureExtension } from './src/forwardBack'; @@ -15,7 +16,7 @@ import * as VKeyboard from './src/utils/keyboard'; const extensionObject = Extension.lookupByUUID('gestureImprovements@gestures'); -class GNOMEGestureImprovementsExtension extends Extension { +export default class GNOMEGestureImprovementsExtension extends Extension { private _extensions: ISubExtension[]; settings?: GioSettings; private _settingChangedId = 0; diff --git a/extension/src/altTab.ts b/extension/src/altTab.ts index c04c65c..79e010b 100644 --- a/extension/src/altTab.ts +++ b/extension/src/altTab.ts @@ -2,6 +2,7 @@ import Clutter from '@gi-types/clutter'; import GLib from '@gi-types/glib2'; import Shell from '@gi-types/shell'; import St from '@gi-types/st'; +import { ISubExtension } from 'resource:///org/gnome/shell/extensions/global'; import Main from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/main'; import { WindowSwitcherPopup } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/altTab'; import { __shell_private_types } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/swipeTracker'; diff --git a/extension/src/forwardBack.ts b/extension/src/forwardBack.ts index 2719d77..a601652 100644 --- a/extension/src/forwardBack.ts +++ b/extension/src/forwardBack.ts @@ -2,6 +2,7 @@ import Clutter from '@gi-types/clutter'; import Shell from '@gi-types/shell'; import Meta from '@gi-types/meta'; +import { ISubExtension } from 'resource:///org/gnome/shell/extensions/global'; import Main from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/main'; import { SwipeTracker, global } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/swipeTracker'; import { ExtSettings } from '../constants'; diff --git a/extension/src/gestures.ts b/extension/src/gestures.ts index 03a5752..e13a51e 100644 --- a/extension/src/gestures.ts +++ b/extension/src/gestures.ts @@ -1,6 +1,7 @@ import Clutter from '@gi-types/clutter'; import GObject from '@gi-types/gobject2'; import Shell from '@gi-types/shell'; +import { ISubExtension } from 'resource:///org/gnome/shell/extensions/global'; import { CustomEventType, global, __shell_private_types, SwipeTracker } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/swipeTracker'; import { OverviewAdjustment } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/overviewControlsManager'; import Main from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/main'; diff --git a/extension/src/overviewRoundTrip.ts b/extension/src/overviewRoundTrip.ts index bc68ce9..90d65a5 100644 --- a/extension/src/overviewRoundTrip.ts +++ b/extension/src/overviewRoundTrip.ts @@ -1,5 +1,6 @@ import Clutter from '@gi-types/clutter'; import Shell from '@gi-types/shell'; +import { ISubExtension } from 'resource:///org/gnome/shell/extensions/global'; import { SwipeTracker, global } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/swipeTracker'; import { OverviewControlsManager, OverviewAdjustment } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/overviewControlsManager'; import * as Main from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/main'; diff --git a/extension/src/pinchGestures/closeWindow.ts b/extension/src/pinchGestures/closeWindow.ts index 376c3b0..f87b162 100644 --- a/extension/src/pinchGestures/closeWindow.ts +++ b/extension/src/pinchGestures/closeWindow.ts @@ -3,6 +3,7 @@ import Meta from '@gi-types/meta'; import Shell from '@gi-types/shell'; import St from '@gi-types/st'; +import { ISubExtension } from 'resource:///org/gnome/shell/extensions/global'; import Main from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/main'; import { global } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/swipeTracker'; import * as Util from 'resource:///org/gnome/Shell/Extensions/js/extensions/misc/util'; diff --git a/extension/src/pinchGestures/showDesktop.ts b/extension/src/pinchGestures/showDesktop.ts index 00a8417..e3fc18c 100644 --- a/extension/src/pinchGestures/showDesktop.ts +++ b/extension/src/pinchGestures/showDesktop.ts @@ -2,6 +2,7 @@ import Clutter from '@gi-types/clutter'; import GObject from '@gi-types/gobject2'; import Meta from '@gi-types/meta'; import Shell from '@gi-types/shell'; +import { ISubExtension } from 'resource:///org/gnome/shell/extensions/global'; import { global, __shell_private_types } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/swipeTracker'; import Main from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/main'; import * as Layout from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/layout'; diff --git a/extension/src/snapWindow.ts b/extension/src/snapWindow.ts index d4e85ae..a2666af 100644 --- a/extension/src/snapWindow.ts +++ b/extension/src/snapWindow.ts @@ -2,6 +2,7 @@ import Clutter from '@gi-types/clutter'; import Meta from '@gi-types/meta'; import Shell from '@gi-types/shell'; import St from '@gi-types/st'; +import { ISubExtension } from 'resource:///org/gnome/shell/extensions/global'; import { SwipeTracker, global } from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/swipeTracker'; import * as Main from 'resource:///org/gnome/Shell/Extensions/js/extensions/ui/main'; import * as Utils from 'resource:///org/gnome/Shell/Extensions/js/extensions/misc/util'; diff --git a/metadata.json b/metadata.json index 97a2a4f..f100a5a 100644 --- a/metadata.json +++ b/metadata.json @@ -2,9 +2,6 @@ "description": "Improve touchpad gestures for Wayland/X11", "name": "Gesture Improvements", "shell-version": [ - "42", - "43", - "44", "45" ], "settings-schema": "org.gnome.shell.extensions.gestureImprovements",