mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/components/cc_frm_clock: fix label widths for non-standard fonts

Browse Source
This commit is contained in:
martii
2013-11-29 17:16:22 +01:00
committed by M. Liebmann
parent caced88719
commit c88ad39c67
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/components/cc_frm_clock.cpp
View File

@@ -151,7 +151,21 @@ void CComponentsFrmClock::initCCLockItems()
} }
} }
//modifie available lable items with current segment chars int minNumWidth = 0, w_tmp;
char b[2];
b[1] = 0;
for (int i = 0; i < 10; i++) {
b[0] = '0' + i;
w_tmp = (*getClockFont())->getRenderWidth(b, true);
if (w_tmp > minNumWidth)
minNumWidth = w_tmp;
}
int minSepWidth = (*getClockFont())->getRenderWidth(":", true);
w_tmp = (*getClockFont())->getRenderWidth(".", true);
if (w_tmp > minSepWidth)
minSepWidth = w_tmp;
//modify available label items with current segment chars
for (size_t i = 0; i < v_cc_items.size(); i++) for (size_t i = 0; i < v_cc_items.size(); i++)
{ {
//v_cc_items are only available as CComponent-items here, so we must cast them before //v_cc_items are only available as CComponent-items here, so we must cast them before
@@ -171,7 +185,20 @@ void CComponentsFrmClock::initCCLockItems()
string stmp = s_time.substr(i, 1); string stmp = s_time.substr(i, 1);
//get width of current segment //get width of current segment
int wtmp = (*getClockFont())->getRenderWidth(stmp, true); int wtmp;
char c = stmp.at(0);
switch (c) {
case '0' ... '9':
wtmp = minNumWidth;
break;
case '.':
case ':':
wtmp = minSepWidth;
break;
default:
b[0] = c;
wtmp = (*getClockFont())->getRenderWidth(stmp, true);
}
//set size, text, color of current item //set size, text, color of current item
lbl->setDimensionsAll(cl_x, cl_y, wtmp, cl_h); lbl->setDimensionsAll(cl_x, cl_y, wtmp, cl_h);