mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +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-04-24 21:33:15 +02:00
parent 0b2eb4bfb3 fe5f84c1d0
commit f292ba6b69
19 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,7 +274,7 @@ void CComponentsHeader::initIcon()
void CComponentsHeader::initLogo()
{
cch_logo.dy_max = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_SMALL : cch_logo.dy_max;
cch_logo.dy_max = 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 - cch_logo.dy_max/2, cch_logo.Name, cch_logo.Id, this);
@@ -307,8 +307,15 @@ void CComponentsHeader::initLogo()
x_logo = x_logo_right;
if (cch_logo.Align == CC_LOGO_LEFT)
x_logo = x_logo_left;
if (cch_logo.Align == CC_LOGO_CENTER)
x_logo = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2;
if (cch_logo.Align == CC_LOGO_CENTER){
x_logo = width/2 - cch_logo_obj->getWidth()/2;
//fallback if previous item and logo are overlapping
if (getCCItem(prev_id)){
int x_tmp = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2;
if (x_logo <= x_logo_left)
x_logo = x_tmp;
}
}
cch_logo_obj->setXPos(x_logo);
cch_logo_obj->setYPos(height/2 - cch_logo_obj->getHeight()/2);

32
src/gui/components/cc_frm_scrollbar.h
View File

@@ -79,11 +79,11 @@ class CComponentsScrollBar : public CComponentsFrmChain
* usual paraemters:
* @param[in] parent optional, exepts type pointer to a parent CComponentsForm object, default NULL
* @param[in] shadow_mode optional, exepts type int defined by shadow mode enums, default CC_SHADOW_OFF
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_shadow optional, exepts type fb_pixel_t, default COL_SHADOW_PLUS_0
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
*/
CComponentsScrollBar( const int &x_pos,
const int &y_pos,
@@ -92,11 +92,11 @@ class CComponentsScrollBar : public CComponentsFrmChain
const int& count = 1,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_SCROLLBAR,
fb_pixel_t color_body = COL_SCROLLBAR,
fb_pixel_t color_frame = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_body = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE);
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE_PLUS_0,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE_PLUS_0);
// ~CComponentsScrollBar(); //inherited from CComponentsForm
/**Set current page number
@@ -158,11 +158,11 @@ class CComponentsScrollBar : public CComponentsFrmChain
* usual paraemters:
* @param[in] parent optional, exepts type pointer to a parent CComponentsForm object, default NULL
* @param[in] shadow_mode optional, exepts type int defined by shadow mode enums, default CC_SHADOW_OFF
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_shadow optional, exepts type fb_pixel_t, default COL_SHADOW_PLUS_0
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
*/
void paintScrollBar( const int &x_pos,
const int &y_pos,
@@ -171,10 +171,10 @@ void paintScrollBar( const int &x_pos,
const int& count,
const int& current_num,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_SCROLLBAR,
fb_pixel_t color_body = COL_SCROLLBAR,
fb_pixel_t color_frame = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_body = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE);
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE_PLUS_0,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE_PLUS_0);
#endif