mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

CInfoClock: Fix size & position calculation

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4dc972774
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2013-12-10 20:48:30 +01:00
parent 2dc29624ca
commit e9125a5223
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/volumebar.cpp
View File

@@ -124,7 +124,7 @@ void CVolumeBar::initVolumeBarPosition()
if ((neutrino->isMuted()) && (!g_settings.mode_clock)) if ((neutrino->isMuted()) && (!g_settings.mode_clock))
x_corr = mute_dx + h_spacer; x_corr = mute_dx + h_spacer;
if (g_settings.mode_clock) 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; x = sw - width - x_corr;
break; break;
@@ -298,7 +298,10 @@ void CVolumeHelper::initInfoClock(Font** font)
int t1 = (*clock_font)->getMaxDigitWidth(); int t1 = (*clock_font)->getMaxDigitWidth();
int t2 = (*clock_font)->getRenderWidth(":"); int t2 = (*clock_font)->getRenderWidth(":");
clock_dy = digit_h + (int)((float)digit_offset * 1.3); 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_ax = sw - clock_dx;
clock_ay = y; clock_ay = y;
vol_ay = y; vol_ay = y;