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

CCButtonSelect: unfify bg color parameter order with related base methode

Browse Source 
Order was different between setSelectedButton() and setSelectedItem()
This commit is contained in:
Thilo Graf
2018-03-01 19:04:34 +01:00
parent 318550767f
commit e920fd3c9c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/components/cc_button_select.cpp
View File

@@ -49,14 +49,14 @@ int CCButtonSelect::getSelectedButton()
} }
void CCButtonSelect::setSelectedButton( size_t item_id, void CCButtonSelect::setSelectedButton( size_t item_id,
const fb_pixel_t& sel_fr_col, const fb_pixel_t& sel_fr_col,
const fb_pixel_t& fr_col, const fb_pixel_t& fr_col,
const fb_pixel_t& bg_col, const fb_pixel_t& sel_bg_col,
const fb_pixel_t& sel_bg_col, const fb_pixel_t& bg_col,
const fb_pixel_t& text_col, const fb_pixel_t& text_col,
const fb_pixel_t& sel_text_col, const fb_pixel_t& sel_text_col,
const int& frame_width, const int& frame_width,
const int& sel_frame_width) const int& sel_frame_width)
{ {
CComponentsButton *btn = NULL; CComponentsButton *btn = NULL;
if (btn_container){ if (btn_container){

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

@@ -54,10 +54,10 @@ class CCButtonSelect
* @li optional: expects type fb_pixel_t, as selected frame color * @li optional: expects type fb_pixel_t, as selected frame color
* @param[in] fr_col * @param[in] fr_col
* @li optional: expects type fb_pixel_t, as default frame color * @li optional: expects type fb_pixel_t, as default frame color
* @param[in] bg_col
* @li optional: expects type fb_pixel_t, as default background color
* @param[in] sel_bg_col * @param[in] sel_bg_col
* @li optional: expects type fb_pixel_t, as selected background color * @li optional: expects type fb_pixel_t, as selected background color
* @param[in] bg_col
* @li optional: expects type fb_pixel_t, as default background color
* @param[in] text_col * @param[in] text_col
* @li optional: expects type fb_pixel_t, as default text color * @li optional: expects type fb_pixel_t, as default text color
* @param[in] sel_text_col * @param[in] sel_text_col
@@ -70,8 +70,8 @@ class CCButtonSelect
void setSelectedButton(size_t item_id, void setSelectedButton(size_t item_id,
const fb_pixel_t& sel_fr_col = COL_MENUCONTENTSELECTED_PLUS_0, const fb_pixel_t& sel_fr_col = COL_MENUCONTENTSELECTED_PLUS_0,
const fb_pixel_t& fr_col = COL_FRAME_PLUS_0, const fb_pixel_t& fr_col = COL_FRAME_PLUS_0,
const fb_pixel_t& bg_col = COL_MENUCONTENT_PLUS_0,
const fb_pixel_t& sel_bg_col = COL_MENUCONTENTSELECTED_PLUS_0, const fb_pixel_t& sel_bg_col = COL_MENUCONTENTSELECTED_PLUS_0,
const fb_pixel_t& bg_col = COL_MENUCONTENT_PLUS_0,
const fb_pixel_t& text_col = COL_MENUCONTENT_TEXT, const fb_pixel_t& text_col = COL_MENUCONTENT_TEXT,
const fb_pixel_t& sel_text_col = COL_MENUCONTENTSELECTED_TEXT, const fb_pixel_t& sel_text_col = COL_MENUCONTENTSELECTED_TEXT,
const int& frame_width = 1, const int& frame_width = 1,