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

- colors: add and use missing COL_SCROLLBAR_PLUS_0 wrapper

Browse Source
This commit is contained in:
svenhoefer
2017-04-22 17:02:48 +02:00
parent e74db896bb
commit 8e50353773
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/color.h
View File

@@ -124,6 +124,7 @@
#define COL_FRAME_PLUS_0 COL_FRAME #define COL_FRAME_PLUS_0 COL_FRAME
#define COL_SCROLLBAR COL_MENUCONTENT_PLUS_1 #define COL_SCROLLBAR COL_MENUCONTENT_PLUS_1
#define COL_SCROLLBAR_PLUS_0 COL_SCROLLBAR
#define COL_SCROLLBAR_ACTIVE COL_MENUCONTENT_PLUS_3 #define COL_SCROLLBAR_ACTIVE COL_MENUCONTENT_PLUS_3
#define COL_SCROLLBAR_ACTIVE_PLUS_0 COL_SCROLLBAR_ACTIVE #define COL_SCROLLBAR_ACTIVE_PLUS_0 COL_SCROLLBAR_ACTIVE
#define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2 #define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2

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

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