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

CComponentsItem: fix changeing color on select switching of frames

Browse Source 
expand select mode methodes with paremters for frame properties
This should make variables col_frame_sel and fr_thickness_sel superfluous.
This commit is contained in:
Thilo Graf
2016-08-20 20:42:40 +02:00
parent 1888189fb3
commit 3477e28cd7
8 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,10 +40,8 @@ CCDraw::CCDraw() : COSDFader(g_settings.theme.menu_Content_alpha)
col_body = col_body_old = COL_MENUCONTENT_PLUS_0;
col_shadow = col_shadow_old = COL_SHADOW_PLUS_0;
col_frame = col_frame_old = COL_FRAME_PLUS_0;
col_frame_sel = col_frame_sel_old = COL_MENUCONTENTSELECTED_PLUS_0;
fr_thickness = fr_thickness_old = 0;
fr_thickness_sel = fr_thickness_sel_old = 3;
corner_type = corner_type_old = CORNER_ALL;
corner_rad = corner_rad_old = 0;
@@ -116,11 +114,6 @@ inline bool CCDraw::applyDimChanges()
fr_thickness_old = fr_thickness;
ret = true;
}
if (fr_thickness_sel != fr_thickness_sel_old){
dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], dim changes fr_thickness_sel %d != fr_thickness_sel_old %d...\033[0m\n", __func__, __LINE__, fr_thickness_sel, fr_thickness_sel_old);
fr_thickness_old = fr_thickness;
ret = true;
}
if (shadow_w != shadow_w_old){
dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], dim changes shadow_w_sel %d != shadow_w_old %d...\033[0m\n", __func__, __LINE__, shadow_w, shadow_w_old);
shadow_w_old = shadow_w;
@@ -158,11 +151,6 @@ inline bool CCDraw::applyColChanges()
col_frame_old = col_frame;
ret = true;
}
if (col_frame_sel != col_frame_sel_old){
dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], col changes col_frame_sel %d != col_frame_sel_old %d...\033[0m\n", __func__, __LINE__, col_frame_sel, col_frame_sel_old);
col_frame_old = col_frame;
ret = true;
}
if (cc_body_gradient_enable != cc_body_gradient_enable_old){
dprintf(DEBUG_INFO, "\033[33m[CCDraw]\t[%s - %d], col changes cc_body_gradient_enable %d != cc_body_gradient_enable_old %d...\033[0m\n", __func__, __LINE__, cc_body_gradient_enable, cc_body_gradient_enable_old);
cc_body_gradient_enable_old = cc_body_gradient_enable;
@@ -218,13 +206,10 @@ inline void CCDraw::setWidth(const int& w)
width = w;
}
void CCDraw::setFrameThickness(const int& thickness, const int& thickness_sel)
void CCDraw::setFrameThickness(const int& thickness)
{
fr_thickness = thickness;
if (fr_thickness_sel != thickness_sel)
fr_thickness_sel = thickness_sel;
//ensure enabled frame if frame width > 0
cc_enable_frame = false;
if (fr_thickness)