From 1dadbd0cbb6a96fc0408ac159279de232bc9c15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 8 Aug 2019 17:27:40 +0200 Subject: [PATCH] appDisplay: Always animate our own new window and discrete gpu actions For the "New Window" entry we add to the AppIcons popup menu we should always animate the app icon if the menu entry is activated as it was intended by commit 62786c09a8. For the "Launch using Dedicated Graphics Card" entry we can also always show the animation if the entry is activated since the entry should only be visible if the app is stopped. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/673 --- js/ui/appDisplay.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index fc6c1290e..dbb112104 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -2034,9 +2034,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu { !actions.includes('new-window')) { this._newWindowMenuItem = this._appendMenuItem(_("New Window")); this._newWindowMenuItem.connect('activate', () => { - if (this._source.app.state == Shell.AppState.STOPPED) - this._source.animateLaunch(); - + this._source.animateLaunch(); this._source.app.open_new_window(-1); this.emit('activate-window', null); }); @@ -2048,9 +2046,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu { !actions.includes('activate-discrete-gpu')) { this._onDiscreteGpuMenuItem = this._appendMenuItem(_("Launch using Dedicated Graphics Card")); this._onDiscreteGpuMenuItem.connect('activate', () => { - if (this._source.app.state == Shell.AppState.STOPPED) - this._source.animateLaunch(); - + this._source.animateLaunch(); this._source.app.launch(0, -1, true); this.emit('activate-window', null); }); @@ -2060,8 +2056,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu { let action = actions[i]; let item = this._appendMenuItem(appInfo.get_action_name(action)); item.connect('activate', (emitter, event) => { - if (action == 'new-window' && - this._source.app.state == Shell.AppState.STOPPED) + if (action == 'new-window') this._source.animateLaunch(); this._source.app.launch_action(action, event.get_time(), -1);