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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-05-05 13:27:14 +02:00
parent 4ae57d1567 17958da28f
commit 0b2f2afe01
8 changed files with 263 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/components/cc_frm_header.cpp
View File

@@ -144,8 +144,6 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
cch_cl_sec_format = cch_cl_format;
cch_cl_enable_run = false;
cch_text_max_w = width;
addContextButton(buttons);
initCCItems();
initParent(parent);
@@ -279,10 +277,13 @@ void CComponentsHeader::initLogo()
int h_logo = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_MIN : cch_logo.dy_max;
if(!cch_logo_obj)
cch_logo_obj = new CComponentsChannelLogoScalable(width/2, height/2 - h_logo/2, cch_logo.Name, cch_logo.Id, this);
cch_logo_obj = new CComponentsChannelLogoScalable(1, height/2 - h_logo/2, cch_logo.Name, cch_logo.Id, this);
else
cch_logo_obj->setChannel(cch_logo.Id, cch_logo.Name);
// use value 1 as initial value for logo width, ensures downscale with stupid available logo space
cch_logo_obj->setHeight(1, true);
//ensure logo is not larger than original size if in auto mode
if (cch_logo.dy_max == -1){
int dx_orig = 0, dy_orig = 0 ;
@@ -291,6 +292,7 @@ void CComponentsHeader::initLogo()
h_logo = dy_orig;
}
//cch_logo_obj->setWidth(1, true);
if (cch_logo_obj->hasLogo()){
cch_logo_obj->setHeight(h_logo, true);
@@ -535,7 +537,7 @@ void CComponentsHeader::initCaption()
cch_btn_obj->setXPos(width - buttons_w);
//set required width of caption object
cc_text_w -= (buttons_w + cch_offset);
cc_text_w -= buttons_w;
}
//clock
@@ -550,7 +552,7 @@ void CComponentsHeader::initCaption()
cch_cl_obj->setXPos(width - buttons_w - clock_w);
//set required width of caption object
cc_text_w -= (clock_w + cch_offset);
cc_text_w -= clock_w;
//stop clock if disabled or option run is disabled and clock is running
if (cch_cl_enable){
@@ -564,7 +566,6 @@ void CComponentsHeader::initCaption()
cch_cl_obj->allowPaint(cch_cl_enable);
}
cc_text_w = min(cc_text_w,cch_text_max_w);
//create cch_text_obj and add to collection
if (cch_text_obj == NULL){

4
src/gui/components/cc_frm_header.h
View File

@@ -106,8 +106,6 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
int cch_icon_w;
///property: internal width for clock object
int cch_clock_w;
///property: internal max width for text object
int cch_text_max_w;
///property: internal x-position for caption object
int cch_text_x;
///property: internal offset of context button icons within context button object
@@ -193,8 +191,6 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
virtual Font* getCaptionFont(){return cch_font;}
///set text color for caption
virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;}
///set max width for caption
virtual void setCaptionMaxWidth(int max_width){cch_text_max_w = max_width;}
enum
{