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

js: Stop using ClutterContainer API

Browse Source 
These have been long deprecated over in clutter, and (via several
vtables) simply forward the call to the equivalent ClutterActor methods

Save ourselves the hassle and just use ClutterActor methods directly

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3010>
This commit is contained in:
Zander Brown
2023-11-07 10:47:14 +00:00
committed by Marge Bot
parent ed3b8d093e
commit 350cd296fa
54 changed files with 263 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/popupMenu.js
View File

@ -96,7 +96,7 @@ export const PopupBaseMenuItem = GObject.registerClass({
this._delegate = this;
this._ornamentIcon = new St.Icon({style_class: 'popup-menu-ornament'});
this.add(this._ornamentIcon);
this.add_child(this._ornamentIcon);
this.setOrnament(Ornament.HIDDEN);
this._parent = null;
@ -304,7 +304,7 @@ class PopupSeparatorMenuItem extends PopupBaseMenuItem {
});
this.label = new St.Label({text: text || ''});
this.add(this.label);
this.add_child(this.label);
this.label_actor = this.label;
this.label.connect('notify::text',
@ -718,14 +718,14 @@ export class PopupMenuBase extends Signals.EventEmitter {
addMenuItem(menuItem, position) {
let beforeItem = null;
if (position === undefined) {
this.box.add(menuItem.actor);
this.box.add_child(menuItem.actor);
} else {
let items = this._getMenuItems();
if (position < items.length) {
beforeItem = items[position].actor;
this.box.insert_child_below(menuItem.actor, beforeItem);
} else {
this.box.add(menuItem.actor);
this.box.add_child(menuItem.actor);
}
}
@ -746,7 +746,7 @@ export class PopupMenuBase extends Signals.EventEmitter {
menuItem);
} else if (menuItem instanceof PopupSubMenuMenuItem) {
if (beforeItem == null)
this.box.add(menuItem.menu.actor);
this.box.add_child(menuItem.menu.actor);
else
this.box.insert_child_below(menuItem.menu.actor, beforeItem);
@ -1018,7 +1018,7 @@ export class PopupSubMenu extends PopupMenuBase {
vscrollbar_policy: St.PolicyType.NEVER,
});
this.actor.add_actor(this.box);
this.actor.add_child(this.box);
this.actor._delegate = this;
this.actor.clip_to_allocation = true;
this.actor.connect('key-press-event', this._onKeyPressEvent.bind(this));