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

dialog: Remove addContent function

Browse Source 
Now that child metas are removed, there's no need for a custom
`addContent` function anymore. It was only used in one place anyway...

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/886
This commit is contained in:
Jonas Dreßler 2019-12-05 08:55:16 +01:00 committed by Florian Müllner
parent 259c44395f
commit 914c6e48b1
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/closeDialog.js
View File

@ -67,7 +67,7 @@ var CloseDialog = GObject.registerClass({
this._dialog.width = windowActor.width; this._dialog.width = windowActor.width;
this._dialog.height = windowActor.height; this._dialog.height = windowActor.height;
this._dialog.addContent(this._createDialogContent()); this._dialog.contentLayout.add_child(this._createDialogContent());
this._dialog.addButton({ label: _('Force Quit'), this._dialog.addButton({ label: _('Force Quit'),
action: this._onClose.bind(this), action: this._onClose.bind(this),
default: true }); default: true });

4
js/ui/dialog.js
View File

@ -99,10 +99,6 @@ class Dialog extends St.Widget {
return this._initialKeyFocus || this; return this._initialKeyFocus || this;
} }
addContent(actor) {
this.contentLayout.add(actor, { expand: true });
}
addButton(buttonInfo) { addButton(buttonInfo) {
let { label, action, key } = buttonInfo; let { label, action, key } = buttonInfo;
let isDefault = buttonInfo['default']; let isDefault = buttonInfo['default'];