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

- colors: some internal renamings

Browse Source 
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable
This commit is contained in:
svenhoefer
2016-08-14 21:55:18 +02:00
parent 55b79d26a3
commit bc39d1e14e
26 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,7 @@ void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const
append_y_offset = 0;
corner_rad = 0;
cc_btn_capt_col = cc_body_gradient_enable ? COL_BUTTON_TEXT_ENABLED : COL_INFOBAR_SHADOW_TEXT;
cc_btn_capt_col = cc_body_gradient_enable ? COL_BUTTON_TEXT_ENABLED : COL_MENUFOOT_TEXT;
cc_btn_capt_disable_col = cc_body_gradient_enable ? COL_BUTTON_TEXT_DISABLED : COL_MENUCONTENTINACTIVE_TEXT;
cc_btn_icon_obj = NULL;
cc_btn_capt_obj = NULL;

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

@@ -36,7 +36,7 @@
#include <driver/neutrinofonts.h>
#include <driver/rcinput.h>
#define COL_BUTTON_BODY COL_INFOBAR_SHADOW_PLUS_1
#define COL_BUTTON_BODY COL_SHADOW_PLUS_1
#define COL_BUTTON_TEXT_ENABLED COL_BLACK
#define COL_BUTTON_TEXT_DISABLED COL_LIGHT_GRAY

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

@@ -146,7 +146,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label_s * const cont
btn->setButtonFont(ccf_btn_font);
btn->doPaintBg(btn_contour);
btn->enableFrame(btn_contour);
btn->setButtonTextColor(COL_INFOBAR_SHADOW_TEXT);
btn->setButtonTextColor(COL_MENUFOOT_TEXT);
btn->setButtonEventMsg(content[i].btn_msg);
btn->setButtonResult(content[i].btn_result);
btn->setButtonAlias(content[i].btn_alias);

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

@@ -64,7 +64,7 @@ class CComponentsFooter : public CComponentsHeader
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_INFOBAR_SHADOW_PLUS_1,
fb_pixel_t color_body = COL_SHADOW_PLUS_1,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
///show button frame and background, default false
@@ -85,7 +85,7 @@ class CComponentsFooter : public CComponentsHeader
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_INFOBAR_SHADOW_PLUS_1,
fb_pixel_t color_body = COL_SHADOW_PLUS_1,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
///add button labels with string label type as content, count as size_t, chain_width as int, label width as int

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

@@ -155,7 +155,7 @@ void CComponentsWindow::initVarWindow( const int& x_pos, const int& y_pos, const
ccw_w_sidebar = 40;
ccw_col_head = COL_MENUHEAD_PLUS_0;
ccw_col_head_text = COL_MENUHEAD_TEXT;
ccw_col_footer = COL_INFOBAR_SHADOW_PLUS_1;
ccw_col_footer = COL_SHADOW_PLUS_1;
page_scroll_mode = PG_SCROLL_M_OFF; //permanent disabled here, only in body used!