isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

appDisplay: Always animate our own new window and discrete gpu actions

Browse Source 
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
This commit is contained in:
Jonas Dreßler 2019-08-08 17:27:40 +02:00 committed by Florian Müllner
parent 481490fdc7
commit 1dadbd0cbb
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/appDisplay.js
View File

@ -2034,9 +2034,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
!actions.includes('new-window')) { !actions.includes('new-window')) {
this._newWindowMenuItem = this._appendMenuItem(_("New Window")); this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
this._newWindowMenuItem.connect('activate', () => { 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._source.app.open_new_window(-1);
this.emit('activate-window', null); this.emit('activate-window', null);
}); });
@ -2048,9 +2046,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
!actions.includes('activate-discrete-gpu')) { !actions.includes('activate-discrete-gpu')) {
this._onDiscreteGpuMenuItem = this._appendMenuItem(_("Launch using Dedicated Graphics Card")); this._onDiscreteGpuMenuItem = this._appendMenuItem(_("Launch using Dedicated Graphics Card"));
this._onDiscreteGpuMenuItem.connect('activate', () => { 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._source.app.launch(0, -1, true);
this.emit('activate-window', null); this.emit('activate-window', null);
}); });
@ -2060,8 +2056,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
let action = actions[i]; let action = actions[i];
let item = this._appendMenuItem(appInfo.get_action_name(action)); let item = this._appendMenuItem(appInfo.get_action_name(action));
item.connect('activate', (emitter, event) => { item.connect('activate', (emitter, event) => {
if (action == 'new-window' && if (action == 'new-window')
this._source.app.state == Shell.AppState.STOPPED)
this._source.animateLaunch(); this._source.animateLaunch();
this._source.app.launch_action(action, event.get_time(), -1); this._source.app.launch_action(action, event.get_time(), -1);