snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

Improve the osd update code

Browse source 
- More logical relationship between volume level and bar length
- No unnecessary drawing
- Volume bar shrinks properly even when volume is lowered very quickly
This commit is contained in:
Johannes Holmberg 2015-09-16 21:19:42 -04:00 committed by Carlos R. Mafra
parent 96ec41a88f
commit a0af850b29
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
wmix/ui_x.c
View file

@ -417,16 +417,20 @@ void update_osd(float volume, bool up)
static int bar;
if (config.osd) {
foo =
(((dockapp.osd_width / 100) * (volume * 100)) / 20) + 1;
foo = (dockapp.osd_width - 20) * volume / 20.0;
if ((foo != bar) || up) {
XClearArea(display, dockapp.osd, ((bar - 1) * 20), 30,
(foo * 20), 25, 1);
for (i = 1; i < foo; i++)
XFillRectangle(display, dockapp.osd, dockapp.osd_gc,
i * 20, 30, 5, 25);
}
if (up) {
for (i = 1; i <= foo; i++)
XFillRectangle(display, dockapp.osd, dockapp.osd_gc,
i * 20, 30, 5, 25);
} else if (foo < bar) {
XClearArea(display, dockapp.osd, ((foo+1) * 20), 30,
((bar-foo) * 20), 25, 1);
} else if (foo > bar) {
for (i = (bar > 0 ? bar : 1); i <= foo; i++)
XFillRectangle(display, dockapp.osd, dockapp.osd_gc,
i * 20, 30, 5, 25);
}
bar = foo;
}
}