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

popupMenu: Implement Switch as actor

Browse Source 
Switch is used only by menu items, and implement it extending St.Bin

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/499
This commit is contained in:
Marco Trevisan (Treviño) 2019-04-12 16:04:16 -05:00 committed by Florian Müllner
parent 30861d4800
commit 6ecb0a4546
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/popupMenu.js
View File

@ -291,9 +291,10 @@ class PopupSeparatorMenuItem extends PopupBaseMenuItem {
}
});
var Switch = class {
constructor(state) {
this.actor = new St.Bin({ style_class: 'toggle-switch',
var Switch = GObject.registerClass(
class Switch extends St.Bin {
_init(state) {
super._init({ style_class: 'toggle-switch',
accessible_role: Atk.Role.CHECK_BOX,
can_focus: true });
this.setToggleState(state);
@ -301,16 +302,16 @@ var Switch = class {
setToggleState(state) {
if (state)
this.actor.add_style_pseudo_class('checked');
this.add_style_pseudo_class('checked');
else
this.actor.remove_style_pseudo_class('checked');
this.remove_style_pseudo_class('checked');
this.state = state;
}
toggle() {
this.setToggleState(!this.state);
}
};
});
var PopupSwitchMenuItem = GObject.registerClass({
Signals: { 'toggled': { param_types: [GObject.TYPE_BOOLEAN] }, },
@ -334,7 +335,7 @@ class PopupSwitchMenuItem extends PopupBaseMenuItem {
this._statusLabel = new St.Label({ text: '',
style_class: 'popup-status-menu-item'
});
this._statusBin.child = this._switch.actor;
this._statusBin.child = this._switch;
}
setStatus(text) {
@ -344,7 +345,7 @@ class PopupSwitchMenuItem extends PopupBaseMenuItem {
this.reactive = false;
this.accessible_role = Atk.Role.MENU_ITEM;
} else {
this._statusBin.child = this._switch.actor;
this._statusBin.child = this._switch;
this.reactive = true;
this.accessible_role = Atk.Role.CHECK_MENU_ITEM;
}
@ -352,9 +353,8 @@ class PopupSwitchMenuItem extends PopupBaseMenuItem {
}
activate(event) {
if (this._switch.actor.mapped) {
if (this._switch.mapped)
this.toggle();
}
// we allow pressing space to toggle the switch
// without closing the menu