From e920fd3c9c2b156365e0490b705a63ec0eaa3114 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 1 Mar 2018 19:04:34 +0100 Subject: [PATCH] CCButtonSelect: unfify bg color parameter order with related base methode Order was different between setSelectedButton() and setSelectedItem() --- src/gui/components/cc_button_select.cpp | 16 ++++++++-------- src/gui/components/cc_button_select.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gui/components/cc_button_select.cpp b/src/gui/components/cc_button_select.cpp index c0d8491c8..f965e3478 100644 --- a/src/gui/components/cc_button_select.cpp +++ b/src/gui/components/cc_button_select.cpp @@ -49,14 +49,14 @@ int CCButtonSelect::getSelectedButton() } void CCButtonSelect::setSelectedButton( size_t item_id, - const fb_pixel_t& sel_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& text_col, - const fb_pixel_t& sel_text_col, - const int& frame_width, - const int& sel_frame_width) + const fb_pixel_t& sel_fr_col, + const fb_pixel_t& fr_col, + const fb_pixel_t& sel_bg_col, + const fb_pixel_t& bg_col, + const fb_pixel_t& text_col, + const fb_pixel_t& sel_text_col, + const int& frame_width, + const int& sel_frame_width) { CComponentsButton *btn = NULL; if (btn_container){ diff --git a/src/gui/components/cc_button_select.h b/src/gui/components/cc_button_select.h index 4fccc8279..fa3579128 100644 --- a/src/gui/components/cc_button_select.h +++ b/src/gui/components/cc_button_select.h @@ -54,10 +54,10 @@ class CCButtonSelect * @li optional: expects type fb_pixel_t, as selected frame color * @param[in] fr_col * @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 * @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 * @li optional: expects type fb_pixel_t, as default text color * @param[in] sel_text_col @@ -70,8 +70,8 @@ class CCButtonSelect void setSelectedButton(size_t item_id, 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& bg_col = COL_MENUCONTENT_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& sel_text_col = COL_MENUCONTENTSELECTED_TEXT, const int& frame_width = 1,