From 84c3b32e6eb9a1bdee233a56e2408ad8847ff3ee Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 31 Oct 2012 23:21:21 +0100 Subject: [PATCH] CVolume: correctly initialize font height / width values Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/30ab06762acb94d21bb8ae677728f013d8062608 Author: Stefan Seyfried Date: 2012-10-31 (Wed, 31 Oct 2012) --- src/driver/volume.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp index 89b420553..31c3751fd 100644 --- a/src/driver/volume.cpp +++ b/src/driver/volume.cpp @@ -96,10 +96,11 @@ void CVolume::Init() sh = frameBuffer->getScreenHeight(); frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME, &icon_w, &icon_h); - vbar_h = std::max((icon_h * faktor_h) / 10, digit_h+digit_offset); progress_h = icon_h - 2*pB; progress_w = 200; vbar_w = spacer + icon_w + spacer + progress_w + spacer; + digit_h = 0; + digit_offset = 0; if (paintDigits) { digit_w = g_Font[VolumeFont]->getRenderWidth("100"); digit_offset = g_Font[VolumeFont]->getDigitOffset(); @@ -107,6 +108,7 @@ void CVolume::Init() progress_h = std::max(icon_h, digit_h) - 2*pB; vbar_w += digit_w; } + vbar_h = std::max((icon_h * faktor_h) / 10, digit_h+digit_offset); if (volscale) delete volscale; volscale = new CProgressBar(true, progress_w, progress_h, 50, 100, 80, true);