[gnome-shell/wip/carlosg/destroy-old-osk-layouts: 4/4] keyboard: Destroy old layout actors when regenerating keyboard groups
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/carlosg/destroy-old-osk-layouts: 4/4] keyboard: Destroy old layout actors when regenerating keyboard groups
- Date: Tue, 30 Apr 2019 19:44:40 +0000 (UTC)
commit ed999ce92693b8f1ab4040444a3e6e380e7b4475
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Apr 30 14:08:25 2019 +0200
keyboard: Destroy old layout actors when regenerating keyboard groups
We were cleaning up self._groups, but the actors for all previous
groups/layers/modes would remain attached to the aspect container,
simply hidden.
Under some circumstances this can really make the amount of actors
in the shell stage to quickly ramp up, it's not just a "leak" but
also has potential side effects on performance.
We should destroy all child actors of this._aspectContainer, except
the static ones (emoji and keypad).
While at it, fix this._groups re-initialization, as it's actually an
object, not an array.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/523
Closes?: https://gitlab.gnome.org/GNOME/mutter/issues/556
js/ui/keyboard.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 71ebd5596..fbba2840e 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1472,7 +1472,12 @@ var Keyboard = class Keyboard {
}
_onKeyboardGroupsChanged(keyboard) {
- this._groups = [];
+ let nonGroupActors = [this._emojiSelection.actor, this._keypad.actor];
+ this._aspectContainer.get_children().filter(c => !nonGroupActors.includes(c)).forEach(c => {
+ c.destroy();
+ });
+
+ this._groups = {};
this._onGroupChanged();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]