diff --git a/docking.js b/docking.js index cace0fee6..8db8028c2 100644 --- a/docking.js +++ b/docking.js @@ -15,7 +15,6 @@ import { AppDisplay, Layout, Main, - Overview, OverviewControls, PointerWatcher, Workspace, @@ -2483,37 +2482,10 @@ export class DockManager { if (!Main.overview.visible) { this.mainDock.dash.showAppsButton._fromDesktop = true; - if (this._settings.animateShowApps) { - Main.overview.show(OverviewControls.ControlsState.APP_GRID); - } else { - GLib.idle_add(GLib.PRIORITY_DEFAULT, () => { - const oldAnimationTime = OverviewControls.SIDE_CONTROLS_ANIMATION_TIME; - Overview.ANIMATION_TIME = 1; - const id = Main.overview.connect('shown', () => { - Overview.ANIMATION_TIME = oldAnimationTime; - Main.overview.disconnect(id); - }); - Main.overview.show(OverviewControls.ControlsState.APP_GRID); - return GLib.SOURCE_REMOVE; - }); - } + Main.overview.show(OverviewControls.ControlsState.APP_GRID); } else if (!checked && this.mainDock.dash.showAppsButton._fromDesktop) { - if (this._settings.animateShowApps) { - Main.overview.hide(); - this.mainDock.dash.showAppsButton._fromDesktop = false; - } else { - GLib.idle_add(GLib.PRIORITY_DEFAULT, () => { - const oldAnimationTime = Overview.ANIMATION_TIME; - Overview.ANIMATION_TIME = 1; - const id = Main.overview.connect('hidden', () => { - Overview.ANIMATION_TIME = oldAnimationTime; - Main.overview.disconnect(id); - }); - Main.overview.hide(); - this.mainDock.dash.showAppsButton._fromDesktop = false; - return GLib.SOURCE_REMOVE; - }); - } + Main.overview.hide(); + this.mainDock.dash.showAppsButton._fromDesktop = false; } else { // TODO: I'm not sure how reliable this is, we might need to move the // _onShowAppsButtonToggled logic into the extension. diff --git a/prefs.js b/prefs.js index 110a1f7e4..fae0b99b0 100644 --- a/prefs.js +++ b/prefs.js @@ -752,10 +752,6 @@ const DockSettings = GObject.registerClass({ this._builder.get_object('application_button_first_button'), 'sensitive', Gio.SettingsBindFlags.DEFAULT); - this._settings.bind('animate-show-apps', - this._builder.get_object('application_button_animation_button'), - 'active', - Gio.SettingsBindFlags.DEFAULT); this._settings.bind('show-show-apps-button', this._builder.get_object('application_button_animation_button'), 'sensitive', diff --git a/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml index 800105b59..ed2c0d424 100644 --- a/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml +++ b/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml @@ -299,11 +299,6 @@ true Show application button on the edge when using centered panel mode - - true - Animate Show Applications from the desktop - Animate Show Applications from the desktop - true Basic compatibility with bolt extensions