mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/components: use COL_BACKGROUND_PLUS_0 instead of COL_BACKGROUND

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: be29f644f0
Author: martii <m4rtii@gmx.de>
Date: 2014-06-09 (Mon, 09 Jun 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-06-09 09:32:48 +02:00
committed by [CST] Focus
parent 4a1f16e456
commit 3cca8b1d3c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_base.cpp
View File

@@ -236,7 +236,7 @@ void CComponents::kill(const fb_pixel_t& bg_color, const int& corner_radius)
{ {
for(size_t i =0; i< v_fbdata.size() ;i++){ for(size_t i =0; i< v_fbdata.size() ;i++){
#if 0 #if 0
if (bg_color != COL_BACKGROUND) if (bg_color != COL_BACKGROUND_PLUS_0)
#endif #endif
int r = v_fbdata[i].r; int r = v_fbdata[i].r;
if (corner_radius > -1) if (corner_radius > -1)

6
src/gui/components/cc_base.h
View File

@@ -203,8 +203,8 @@ class CComponents : public COSDFader
virtual void hide(); virtual void hide();
///erase or paint over rendered objects without restore of background, it's similar to paintBackgroundBoxRel() known ///erase or paint over rendered objects without restore of background, it's similar to paintBackgroundBoxRel() known
///from CFrameBuffer but with possiblity to define color, default color is COL_BACKGROUND (empty background) ///from CFrameBuffer but with possiblity to define color, default color is COL_BACKGROUND_PLUS_0 (empty background)
virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND, const int& corner_radius = -1); virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, const int& corner_radius = -1);
///returns paint mode, true=item was painted ///returns paint mode, true=item was painted
virtual bool isPainted(){return is_painted;} virtual bool isPainted(){return is_painted;}
@@ -271,7 +271,7 @@ class CComponentsItem : public CComponents
///erase or paint over rendered objects without restore of background, it's similar to paintBackgroundBoxRel() known ///erase or paint over rendered objects without restore of background, it's similar to paintBackgroundBoxRel() known
///from CFrameBuffer but with possiblity to define color, default color is 0 (empty background) ///from CFrameBuffer but with possiblity to define color, default color is 0 (empty background)
///NOTE: Items with parent binding use the parent background color as default! Set parameter 'ignore_parent=true' to ignore parent background color! ///NOTE: Items with parent binding use the parent background color as default! Set parameter 'ignore_parent=true' to ignore parent background color!
virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND, bool ignore_parent = false); virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, bool ignore_parent = false);
///get the current item type, see attribute cc_item_type above ///get the current item type, see attribute cc_item_type above
virtual int getItemType(); virtual int getItemType();

2
src/gui/components/cc_item_tvpic.h
View File

@@ -53,7 +53,7 @@ class CComponentsPIP : public CComponentsItem
CComponentsPIP( const int x_pos = 0, const int y_pos = 0, const int percent = 30, CComponentsPIP( const int x_pos = 0, const int y_pos = 0, const int percent = 30,
CComponentsForm *parent = NULL, CComponentsForm *parent = NULL,
bool has_shadow = CC_SHADOW_OFF, bool has_shadow = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_BLACK, fb_pixel_t color_body = COL_BACKGROUND, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0); fb_pixel_t color_frame = COL_BLACK, fb_pixel_t color_body = COL_BACKGROUND_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
~CComponentsPIP(); ~CComponentsPIP();
///set property: width of tv box in pixel ///set property: width of tv box in pixel