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

osdWindow: Allow label and level to be null

Browse Source 
Allow passing 'null' to setLevel and setLabel, so 'null' and 'undefined'
behave the same way.

Fixes a regression introduced by a42f7c23, which caused parts of old
notifications to persist into new notifications, or elements being
incorrectly made visible

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2917>
This commit is contained in:
Stuart Hayhurst 2023-08-27 19:25:42 +01:00 committed by Florian Müllner
parent 2bb64bc3c4
commit 215282a320
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/osdWindow.js
View File

@ -65,15 +65,15 @@ class OsdWindow extends Clutter.Actor {
} }
setLabel(label) { setLabel(label) {
this._label.visible = label !== undefined; this._label.visible = label != null;
if (label) if (this._label.visible)
this._label.text = label; this._label.text = label;
this._updateBoxVisibility(); this._updateBoxVisibility();
} }
setLevel(value) { setLevel(value) {
this._level.visible = value !== undefined; this._level.visible = value != null;
if (value !== undefined) { if (this._level.visible) {
if (this.visible) { if (this.visible) {
this._level.ease_property('value', value, { this._level.ease_property('value', value, {
mode: Clutter.AnimationMode.EASE_OUT_QUAD, mode: Clutter.AnimationMode.EASE_OUT_QUAD,