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

Merge remote-tracking branch 'cst-next'

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-08 19:52:41 +01:00
parent f99c3ebc37 11e480b6e8
commit b53fbaf327
25 changed files with 194 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/components/cc_draw.cpp
View File

@@ -76,7 +76,6 @@ CCDraw::CCDraw() : COSDFader(g_settings.theme.menu_Content_alpha)
CCDraw::~CCDraw()
{
hide();
clearFbData();
}

6
src/gui/components/cc_frm_button.cpp
View File

@@ -102,8 +102,8 @@ void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const
shadow = shadow_mode;
shadow_w = SHADOW_OFFSET;
cc_body_gradient_enable = false/*g_settings.gradiant*/; //gradient is prepared for use but disabled at the moment till some other parts of gui parts are provide gradient
setColBodyGradient(CColorGradient::gradientLight2Dark, CFrameBuffer::gradientVertical, CColorGradient::light);
cc_body_gradient_enable = CC_COLGRAD_OFF/*g_settings.gradiant*/; //gradient is prepared for use but disabled at the moment till some other parts of gui parts are provide gradient
setColBodyGradient(cc_body_gradient_enable/*CColorGradient::gradientLight2Dark*/, CFrameBuffer::gradientVertical, CColorGradient::light);
col_frame = color_frame;
col_body = cc_body_gradient_enable? COL_DARK_GRAY : color_body;
col_shadow = color_shadow;
@@ -150,7 +150,7 @@ void CComponentsButton::initIcon()
cc_btn_icon = frameBuffer->getIconBasePath() + "/" + cc_btn_icon + ".png";
cc_btn_icon_obj = new CComponentsPictureScalable(fr_thickness, y_icon, cc_btn_icon, this);
cc_btn_icon_obj->SetTransparent(CFrameBuffer::TM_BLACK);
int h_icon = cc_btn_icon_obj->getHeight();
//get required icon height

1
src/gui/components/cc_item.cpp
View File

@@ -135,6 +135,7 @@ void CComponentsItem::kill(const fb_pixel_t& bg_color, bool ignore_parent)
else
CComponents::kill(cc_parent->getColorBody(), cc_parent->getCornerRadius());
}
clearScreenBuffer();
}
//synchronize colors for forms

11
src/gui/components/cc_item_picture.h
View File

@@ -93,10 +93,6 @@ class CComponentsPicture : public CComponentsItem
///paint image
void paintPicture();
// t = CFrameBuffer::TM_BLACK : Transparency when black content ('pseudo' transparency)
// t = CFrameBuffer::TM_NONE : No 'pseudo' transparency
void SetTransparent(int t){ image_transparent = t; }
public:
/*!
Constructor for image objects: use this for scaled images.
@@ -160,6 +156,13 @@ class CComponentsPicture : public CComponentsItem
///return paint mode of internal image, true=image was painted, please do not to confuse with isPainted()! isPainted() is related to item itself.
virtual inline bool isPicPainted(){return is_image_painted;};
/**sets transparency mode if icons
* @param[in] t Transparency mode
* @li t = CFrameBuffer::TM_BLACK : Transparency when black content ('pseudo' transparency)
* @li t = CFrameBuffer::TM_NONE : No 'pseudo' transparency
*/
void SetTransparent(int t){ image_transparent = t; }
///paint item
virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
///hide item, see also CComponents::hide();