mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-02 18:31:22 +02:00
components: rework classes
- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h - added extra methodes for simple use of some basic components extra.cpp/h - rework clock handling: use timer class, reworked members for enable/disable clock with external timer events, tryed to fix some display issues related with infoclock and time osd clock in moviebrowser, channellist, menuus - reworked hide/kill handling, removed parameter for hide(), try to use cached backgrounds for other constallations, paint cache, image cache (all beta) - reworked shadow/frame handling, add shadow modes for left/right arrangement, TODO: repaint for existant instances required - reworked color gradient assignment (beta) ... Note: I had a data crash in my local git tree and i tryed to restore my historie, but most was lost. Therefore here the commit is large
This commit is contained in:
@@ -248,13 +248,6 @@ void CVolumeBar::paintVolScale()
|
||||
}
|
||||
|
||||
|
||||
//final paint
|
||||
void CVolumeBar::paint(bool do_save_bg)
|
||||
{
|
||||
//paint form
|
||||
paintForm(do_save_bg);
|
||||
}
|
||||
|
||||
|
||||
// CVolumeHelper ####################################################################################################
|
||||
|
||||
@@ -270,7 +263,7 @@ CVolumeHelper::CVolumeHelper()
|
||||
Init();
|
||||
}
|
||||
|
||||
void CVolumeHelper::Init(Font** font)
|
||||
void CVolumeHelper::Init(Font* font)
|
||||
{
|
||||
|
||||
x = frameBuffer->getScreenX() + h_spacer;
|
||||
@@ -283,11 +276,11 @@ void CVolumeHelper::Init(Font** font)
|
||||
initInfoClock(font);
|
||||
}
|
||||
|
||||
void CVolumeHelper::initInfoClock(Font** font)
|
||||
void CVolumeHelper::initInfoClock(Font* font)
|
||||
{
|
||||
if (clock_font == NULL){
|
||||
if (font == NULL) {
|
||||
clock_font = &g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
|
||||
clock_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
|
||||
}
|
||||
else
|
||||
clock_font = font;
|
||||
@@ -296,10 +289,10 @@ void CVolumeHelper::initInfoClock(Font** font)
|
||||
if (font != NULL)
|
||||
clock_font = font;
|
||||
}
|
||||
digit_offset = (*clock_font)->getDigitOffset();
|
||||
digit_h = (*clock_font)->getDigitHeight();
|
||||
int t1 = (*clock_font)->getMaxDigitWidth();
|
||||
int t2 = (*clock_font)->getRenderWidth(":");
|
||||
digit_offset = (clock_font)->getDigitOffset();
|
||||
digit_h = (clock_font)->getDigitHeight();
|
||||
int t1 = (clock_font)->getMaxDigitWidth();
|
||||
int t2 = (clock_font)->getRenderWidth(":");
|
||||
clock_dy = digit_h + (int)((float)digit_offset * 1.3);
|
||||
if (g_settings.infoClockSeconds)
|
||||
clock_dx = t1*7 + t2*2;
|
||||
@@ -365,7 +358,7 @@ int CVolumeHelper::getInfoClockX()
|
||||
return clock_ax;
|
||||
}
|
||||
|
||||
void CVolumeHelper::refresh(Font** font)
|
||||
void CVolumeHelper::refresh(Font* font)
|
||||
{
|
||||
Init(font);
|
||||
}
|
||||
|
Reference in New Issue
Block a user