diff options
| author | Martin Schirrmacher <vdr.skinflat@schirrmacher.eu> | 2013-08-04 23:50:53 +0200 |
|---|---|---|
| committer | Martin Schirrmacher <vdr.skinflat@schirrmacher.eu> | 2013-08-04 23:50:53 +0200 |
| commit | 4e6f677b254f138e2f0deefea3f29553c6d4a41b (patch) | |
| tree | 60d3502b460d42e7c1cee3628c89ce6d760de458 /displayvolume.c | |
| parent | 33b71d21d4ea31a5ba79934e3341b06e8307462e (diff) | |
| download | skin-flat-4e6f677b254f138e2f0deefea3f29553c6d4a41b.tar.gz skin-flat-4e6f677b254f138e2f0deefea3f29553c6d4a41b.tar.bz2 | |
display volume, topbar fixes
Diffstat (limited to 'displayvolume.c')
| -rw-r--r-- | displayvolume.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/displayvolume.c b/displayvolume.c index ee7919a..2c9ce51 100644 --- a/displayvolume.c +++ b/displayvolume.c @@ -3,7 +3,7 @@ cFlatDisplayVolume::cFlatDisplayVolume(void) { muted = false; - labelHeight = fontHeight; + labelHeight = fontHeight + marginItem*2; CreateFullOsd(); TopBarCreate(); @@ -28,17 +28,19 @@ void cFlatDisplayVolume::SetVolume(int Current, int Total, bool Mute) { cString label = cString::sprintf("%s: %d", tr("Volume"), Current); cString maxLabel = cString::sprintf("%s: %d", tr("Volume"), 555); - int maxlabelWidth = font->Width(maxLabel); + int maxlabelWidth = font->Width(maxLabel) + marginItem; int left = osdWidth / 2 - maxlabelWidth / 2; + labelPixmap->DrawRectangle(cRect(left - marginItem, marginItem, marginItem, fontHeight), Theme.Color(clrVolumeBg)); + if (Mute) { - labelPixmap->DrawText(cPoint(left, 0), *label, Theme.Color(clrVolumeFont), Theme.Color(clrVolumeBg), - font, maxlabelWidth + marginItem*2 + labelHeight, fontHeight, taLeft); - if( imgLoader.LoadIcon("mute", labelHeight, labelHeight) ) { - muteLogoPixmap->DrawImage( cPoint(left + maxlabelWidth + marginItem, 0), imgLoader.GetImage() ); + labelPixmap->DrawText(cPoint(left, marginItem), *label, Theme.Color(clrVolumeFont), Theme.Color(clrVolumeBg), + font, maxlabelWidth + marginItem + labelHeight, fontHeight, taLeft); + if( imgLoader.LoadIcon("mute", fontHeight, fontHeight) ) { + muteLogoPixmap->DrawImage( cPoint(left + maxlabelWidth + marginItem, marginItem), imgLoader.GetImage() ); } } else { - labelPixmap->DrawText(cPoint(left, 0), *label, Theme.Color(clrVolumeFont), Theme.Color(clrVolumeBg), + labelPixmap->DrawText(cPoint(left, marginItem), *label, Theme.Color(clrVolumeFont), Theme.Color(clrVolumeBg), font, maxlabelWidth, fontHeight, taLeft); } ProgressBarDraw(Current, Total); |