osdWindow: Ensure we setMaxLevel before setting Level itself

When maxLevel is > 100%, first OSD appearance was capping the current
level to 100%. Consecutives key press were then OK.
Ensure we setMaxLevel before setting Level itself, so that correct cap
value is applied.


(cherry picked from commit ae7dd5e2db)
This commit is contained in:
Didier Roche 2018-10-18 15:26:03 +00:00 committed by Marco Trevisan
parent 24d8066197
commit ec5db74101

View File

@ -204,8 +204,8 @@ var OsdWindow = new Lang.Class({
_reset() {
this.actor.hide();
this.setLabel(null);
this.setLevel(null);
this.setMaxLevel(null);
this.setLevel(null);
},
_relayout() {
@ -253,8 +253,8 @@ var OsdWindowManager = new Lang.Class({
_showOsdWindow(monitorIndex, icon, label, level, maxLevel) {
this._osdWindows[monitorIndex].setIcon(icon);
this._osdWindows[monitorIndex].setLabel(label);
this._osdWindows[monitorIndex].setLevel(level);
this._osdWindows[monitorIndex].setMaxLevel(maxLevel);
this._osdWindows[monitorIndex].setLevel(level);
this._osdWindows[monitorIndex].show();
},