From a4dc972774650f128bc1d521a3dd06b20a86381b Mon Sep 17 00:00:00 2001 From: "M. Liebmann" Date: Tue, 10 Dec 2013 20:48:30 +0100 Subject: [PATCH] CInfoClock: Fix size & position calculation --- src/gui/volumebar.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp index 1a264f139..3e9b95e36 100644 --- a/src/gui/volumebar.cpp +++ b/src/gui/volumebar.cpp @@ -124,7 +124,7 @@ void CVolumeBar::initVolumeBarPosition() if ((neutrino->isMuted()) && (!g_settings.mode_clock)) x_corr = mute_dx + h_spacer; if (g_settings.mode_clock) - y = clock_y + clock_height + v_spacer; + y = clock_y + clock_height + v_spacer + SHADOW_OFFSET; } x = sw - width - x_corr; break; @@ -298,7 +298,10 @@ void CVolumeHelper::initInfoClock(Font** font) int t1 = (*clock_font)->getMaxDigitWidth(); int t2 = (*clock_font)->getRenderWidth(":"); clock_dy = digit_h + (int)((float)digit_offset * 1.3); - clock_dx = t1*7 + t2*2; + if (g_settings.infoClockSeconds) + clock_dx = t1*7 + t2*2; + else + clock_dx = t1*5 + t2*1; clock_ax = sw - clock_dx; clock_ay = y; vol_ay = y;