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

appDisplay: Explicitly highlight selected app icon

Browse Source 
While the menu is popped up, we artificially keep the icon highlighted
by ensuring it's hovered, and muting events on the app icon until the
menu is popped down.

This is somewhat convoluted and won't work with Clutter.grab(), where
it will be the menu itself that is the owner of input events while
shown, so cut some corners and explicitly tell the app icon to be
highlighted.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2045>
This commit is contained in:
Carlos Garnacho 2021-11-18 00:25:48 +01:00
parent 876765dbe1
commit 49b9ae08d8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/appDisplay.js
View File

@ -1933,7 +1933,7 @@ class AppViewItem extends St.Button {
label.disconnect(id); label.disconnect(id);
}); });
const expand = this.hover || this.has_key_focus(); const expand = this._forcedHighlight || this.hover || this.has_key_focus();
label.save_easing_state(); label.save_easing_state();
label.set_easing_duration(expand label.set_easing_duration(expand
? APP_ICON_TITLE_EXPAND_TIME ? APP_ICON_TITLE_EXPAND_TIME
@ -2081,6 +2081,14 @@ class AppViewItem extends St.Button {
get name() { get name() {
return this._name; return this._name;
} }
setForcedHighlight(highlighted) {
this._forcedHighlight = highlighted;
this.set({
track_hover: !highlighted,
hover: highlighted,
});
}
}); });
var FolderGrid = GObject.registerClass( var FolderGrid = GObject.registerClass(
@ -3143,6 +3151,7 @@ var AppIcon = GObject.registerClass({
} }
popupMenu(side = St.Side.LEFT) { popupMenu(side = St.Side.LEFT) {
this.setForcedHighlight(true);
this._removeMenuTimeout(); this._removeMenuTimeout();
this.fake_release(); this.fake_release();
@ -3163,16 +3172,12 @@ var AppIcon = GObject.registerClass({
Main.overview.disconnect(id); Main.overview.disconnect(id);
}); });
// We want to keep the item hovered while the menu is up
this._menu.blockSourceEvents = true;
Main.uiGroup.add_actor(this._menu.actor); Main.uiGroup.add_actor(this._menu.actor);
this._menuManager.addMenu(this._menu); this._menuManager.addMenu(this._menu);
} }
this.emit('menu-state-changed', true); this.emit('menu-state-changed', true);
this.set_hover(true);
this._menu.open(BoxPointer.PopupAnimation.FULL); this._menu.open(BoxPointer.PopupAnimation.FULL);
this._menuManager.ignoreRelease(); this._menuManager.ignoreRelease();
this.emit('sync-tooltip'); this.emit('sync-tooltip');
@ -3181,7 +3186,7 @@ var AppIcon = GObject.registerClass({
} }
_onMenuPoppedDown() { _onMenuPoppedDown() {
this.sync_hover(); this.setForcedHighlight(false);
this.emit('menu-state-changed', false); this.emit('menu-state-changed', false);
} }