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

PopupBaseMenuItem: Use active property for menu items

Browse Source 
Instead of using methods and flags, just use a gobject property to keep track
of the active state.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/499
This commit is contained in:
Marco Trevisan (Treviño) 2019-04-17 18:15:56 -05:00 committed by Florian Müllner
parent 58e0b80cac
commit a23391ea28
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
js/ui/popupMenu.js
View File

@ -52,9 +52,14 @@ function arrowIcon(side) {
} }
var PopupBaseMenuItem = GObject.registerClass({ var PopupBaseMenuItem = GObject.registerClass({
Properties: {
'active': GObject.ParamSpec.boolean('active', 'active', 'active',
GObject.ParamFlags.READWRITE,
GObject.TYPE_BOOLEAN,
false),
},
Signals: { Signals: {
'activate': { param_types: [Clutter.Event.$gtype] }, 'activate': { param_types: [Clutter.Event.$gtype] },
'active-changed': { param_types: [GObject.TYPE_BOOLEAN] },
'sensitive-changed': {}, 'sensitive-changed': {},
} }
}, class PopupBaseMenuItem extends St.BoxLayout { }, class PopupBaseMenuItem extends St.BoxLayout {
@ -77,7 +82,7 @@ var PopupBaseMenuItem = GObject.registerClass({
this.add(this._ornamentLabel); this.add(this._ornamentLabel);
this._parent = null; this._parent = null;
this.active = false; this._active = false;
this._activatable = params.reactive && params.activate; this._activatable = params.reactive && params.activate;
this._sensitive = true; this._sensitive = true;
@ -94,7 +99,7 @@ var PopupBaseMenuItem = GObject.registerClass({
this.connect('key-press-event', this._onKeyPressEvent.bind(this)); this.connect('key-press-event', this._onKeyPressEvent.bind(this));
} }
if (params.reactive && params.hover) if (params.reactive && params.hover)
this.connect('notify::hover', this._onHoverChanged.bind(this)); this.bind_property('hover', this, 'active', GObject.BindingFlags.SYNC_CREATE);
} }
get actor() { get actor() {
@ -160,26 +165,26 @@ var PopupBaseMenuItem = GObject.registerClass({
vfunc_key_focus_in() { vfunc_key_focus_in() {
super.vfunc_key_focus_in(); super.vfunc_key_focus_in();
this.setActive(true); this.active = true;
} }
vfunc_key_focus_out() { vfunc_key_focus_out() {
super.vfunc_key_focus_out(); super.vfunc_key_focus_out();
this.setActive(false); this.active = false;
}
_onHoverChanged(actor) {
this.setActive(actor.hover);
} }
activate(event) { activate(event) {
this.emit('activate', event); this.emit('activate', event);
} }
setActive(active) { get active() {
return this._active;
}
set active(active) {
let activeChanged = active != this.active; let activeChanged = active != this.active;
if (activeChanged) { if (activeChanged) {
this.active = active; this._active = active;
if (active) { if (active) {
this.add_style_class_name('selected'); this.add_style_class_name('selected');
if (this.can_focus) if (this.can_focus)
@ -194,7 +199,7 @@ var PopupBaseMenuItem = GObject.registerClass({
// in the container // in the container
this.remove_style_pseudo_class('active'); this.remove_style_pseudo_class('active');
} }
this.emit('active-changed', active); this.notify('active');
} }
} }
@ -518,16 +523,17 @@ var PopupMenuBase = class {
_subMenuActiveChanged(submenu, submenuItem) { _subMenuActiveChanged(submenu, submenuItem) {
if (this._activeMenuItem && this._activeMenuItem != submenuItem) if (this._activeMenuItem && this._activeMenuItem != submenuItem)
this._activeMenuItem.setActive(false); this._activeMenuItem.active = false;
this._activeMenuItem = submenuItem; this._activeMenuItem = submenuItem;
this.emit('active-changed', submenuItem); this.emit('active-changed', submenuItem);
} }
_connectItemSignals(menuItem) { _connectItemSignals(menuItem) {
menuItem._activeChangeId = menuItem.connect('active-changed', (menuItem, active) => { menuItem._activeChangeId = menuItem.connect('notify::active', (menuItem) => {
let active = menuItem.active;
if (active && this._activeMenuItem != menuItem) { if (active && this._activeMenuItem != menuItem) {
if (this._activeMenuItem) if (this._activeMenuItem)
this._activeMenuItem.setActive(false); this._activeMenuItem.active = false;
this._activeMenuItem = menuItem; this._activeMenuItem = menuItem;
this.emit('active-changed', menuItem); this.emit('active-changed', menuItem);
} else if (!active && this._activeMenuItem == menuItem) { } else if (!active && this._activeMenuItem == menuItem) {
@ -858,7 +864,7 @@ var PopupMenu = class extends PopupMenuBase {
close(animate) { close(animate) {
if (this._activeMenuItem) if (this._activeMenuItem)
this._activeMenuItem.setActive(false); this._activeMenuItem.active = false;
if (this._boxPointer.visible) { if (this._boxPointer.visible) {
this._boxPointer.close(animate, () => { this._boxPointer.close(animate, () => {
@ -997,7 +1003,7 @@ var PopupSubMenu = class extends PopupMenuBase {
this.emit('open-state-changed', false); this.emit('open-state-changed', false);
if (this._activeMenuItem) if (this._activeMenuItem)
this._activeMenuItem.setActive(false); this._activeMenuItem.active = false;
if (animate && this._needsScrollbar()) if (animate && this._needsScrollbar())
animate = false; animate = false;
@ -1029,7 +1035,7 @@ var PopupSubMenu = class extends PopupMenuBase {
if (this.isOpen && event.get_key_symbol() == Clutter.KEY_Left) { if (this.isOpen && event.get_key_symbol() == Clutter.KEY_Left) {
this.close(BoxPointer.PopupAnimation.FULL); this.close(BoxPointer.PopupAnimation.FULL);
this.sourceActor._delegate.setActive(true); this.sourceActor._delegate.active = true;
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} }