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

osdWindow: Fix level bar width

Browse Source 
Commit 9b07ce1d0d changed the OSD window's level bar to be a regular
actor instead of a custom drawn bar. The bar actor's width depends on
both the configured level (e.g. 40%) and the available width, however
the width is currently only updated when the configured level changes.
Fix that by properly considering changes to the parent's width as well.

https://bugzilla.gnome.org/show_bug.cgi?id=768317
This commit is contained in:
Florian Müllner 2016-06-04 01:29:07 +02:00
parent 99b5e10acf
commit 775187b2e4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/osdWindow.js
View File

@ -27,6 +27,8 @@ const LevelBar = new Lang.Class({
this._bar = new St.Widget({ style_class: 'level-bar' }); this._bar = new St.Widget({ style_class: 'level-bar' });
this.actor.set_child(this._bar); this.actor.set_child(this._bar);
this.actor.connect('notify::width', () => { this.level = this.level; });
}, },
get level() { get level() {
@ -34,14 +36,12 @@ const LevelBar = new Lang.Class({
}, },
set level(value) { set level(value) {
let newValue = Math.max(0, Math.min(value, 100)); this._level = Math.max(0, Math.min(value, 100));
if (newValue == this._level)
return;
this._level = newValue;
let width = this.actor.width; let alloc = this.actor.get_allocation_box();
width *= (this._level / 100.); let newWidth = (alloc.x2 - alloc.x1) * this._level / 100;
this._bar.width = width; if (newWidth != this._bar.width)
this._bar.width = newWidth;
} }
}); });