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

CComponentsFrmClock/CInfoClock: simplify font init

Browse Source
This commit is contained in:
Thilo Graf
2017-01-08 14:39:38 +01:00
parent c60accaeae
commit ffeb2d6459
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,11 +75,8 @@ CComponentsFrmClock::CComponentsFrmClock( const int& x_pos,
//init default font
cl_font = font;
cl_font_style = font_style;
if (cl_font == NULL){
int dx = 0;
int dy = 30;
setClockFont(*CNeutrinoFonts::getInstance()->getDynFont(dx, dy, cl_format_str, cl_font_style));
}
if (cl_font == NULL)
initClockFont(0, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight());
//init general clock dimensions
height = cl_font->getHeight();
@@ -114,6 +111,11 @@ CComponentsFrmClock::~CComponentsFrmClock()
delete cl_timer;
}
void CComponentsFrmClock::initClockFont(int dx, int dy)
{
setClockFont(*CNeutrinoFonts::getInstance()->getDynFont(dx, dy, cl_format_str, cl_font_style));
}
void CComponentsFrmClock::initTimeString()
{
@@ -380,15 +382,13 @@ void CComponentsFrmClock::paint(bool do_save_bg)
void CComponentsFrmClock::setClockFont(Font *font, const int& style)
{
if (cl_font != font)
cl_font = font;
if (style != -1)
cl_font_style = style;
// setHeight(cl_font->getHeight());
// setWidth(cl_font->getRenderWidth(cl_format_str));
initCCLockItems();
if (cl_font != font || (cl_font != font)){
if (cl_font != font)
cl_font = font;
if (style != -1)
cl_font_style = style;
//initCCLockItems();
}
}
Font* CComponentsFrmClock::getClockFont()