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

network: Make NMWirelessDialogItem a subclass of St.BoxLayout

Browse Source 
In commit 41dd744b74 this item was
confused with a popup menu item. To fix this, make NMWirelessDialogItem
inherit from St.BoxLayout instead of adding the item.actor variable back
again.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/551
This commit is contained in:
Jonas Dreßler 2019-05-22 18:27:15 +02:00 committed by Florian Müllner
parent 0ada312748
commit 9ca8433170
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/ui/status/network.js
View File

@ -613,31 +613,36 @@ var NMDeviceBluetooth = class extends NMConnectionDevice {
} }
}; };
var NMWirelessDialogItem = class { var NMWirelessDialogItem = GObject.registerClass({
constructor(network) { Signals: {
'selected': {},
}
}, class NMWirelessDialogItem extends St.BoxLayout {
_init(network) {
this._network = network; this._network = network;
this._ap = network.accessPoints[0]; this._ap = network.accessPoints[0];
this.actor = new St.BoxLayout({ style_class: 'nm-dialog-item', super._init({ style_class: 'nm-dialog-item',
can_focus: true, can_focus: true,
reactive: true }); reactive: true });
this.actor.connect('key-focus-in', () => { this.emit('selected'); });
this.connect('key-focus-in', () => { this.emit('selected'); });
let action = new Clutter.ClickAction(); let action = new Clutter.ClickAction();
action.connect('clicked', () => { this.actor.grab_key_focus(); }); action.connect('clicked', () => { this.grab_key_focus(); });
this.actor.add_action(action); this.add_action(action);
let title = ssidToLabel(this._ap.get_ssid()); let title = ssidToLabel(this._ap.get_ssid());
this._label = new St.Label({ text: title }); this._label = new St.Label({ text: title });
this.actor.label_actor = this._label; this.label_actor = this._label;
this.actor.add(this._label, { x_align: St.Align.START }); this.add(this._label, { x_align: St.Align.START });
this._selectedIcon = new St.Icon({ style_class: 'nm-dialog-icon', this._selectedIcon = new St.Icon({ style_class: 'nm-dialog-icon',
icon_name: 'object-select-symbolic' }); icon_name: 'object-select-symbolic' });
this.actor.add(this._selectedIcon); this.add(this._selectedIcon);
this._icons = new St.BoxLayout({ style_class: 'nm-dialog-icons' }); this._icons = new St.BoxLayout({ style_class: 'nm-dialog-icons' });
this.actor.add(this._icons, { expand: true, x_fill: false, x_align: St.Align.END }); this.add(this._icons, { expand: true, x_fill: false, x_align: St.Align.END });
this._secureIcon = new St.Icon({ style_class: 'nm-dialog-icon' }); this._secureIcon = new St.Icon({ style_class: 'nm-dialog-icon' });
if (this._ap._secType != NMAccessPointSecurity.NONE) if (this._ap._secType != NMAccessPointSecurity.NONE)
@ -669,8 +674,7 @@ var NMWirelessDialogItem = class {
else else
return 'network-wireless-signal-' + signalToIcon(this._ap.strength) + '-symbolic'; return 'network-wireless-signal-' + signalToIcon(this._ap.strength) + '-symbolic';
} }
}; });
Signals.addSignalMethods(NMWirelessDialogItem.prototype);
var NMWirelessDialog = class extends ModalDialog.ModalDialog { var NMWirelessDialog = class extends ModalDialog.ModalDialog {
constructor(client, device) { constructor(client, device) {