From 4dfc1be7f326a3df5fd138b87d2d84166a23514e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 1 Mar 2018 23:35:28 +0100 Subject: [PATCH] CCButtonSelect: fix order of frame color parameters Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/094c3a8d99825c122bbe1947ce82dea364202481 Author: Thilo Graf Date: 2018-03-01 (Thu, 01 Mar 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_button_select.cpp | 4 ++-- src/gui/components/cc_button_select.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/components/cc_button_select.cpp b/src/gui/components/cc_button_select.cpp index cb396d7cb..c0d8491c8 100644 --- a/src/gui/components/cc_button_select.cpp +++ b/src/gui/components/cc_button_select.cpp @@ -48,9 +48,9 @@ int CCButtonSelect::getSelectedButton() return -1; } -void CCButtonSelect::setSelectedButton(size_t item_id, - const fb_pixel_t& fr_col, +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, diff --git a/src/gui/components/cc_button_select.h b/src/gui/components/cc_button_select.h index 928f48861..a2a64f4bf 100644 --- a/src/gui/components/cc_button_select.h +++ b/src/gui/components/cc_button_select.h @@ -49,11 +49,11 @@ class CCButtonSelect /**Select a definied button inside button chain object * @param[in] item_id - * @li optional: expects type size_t - * @param[in] fr_col - * @li optional: expects type fb_pixel_t, as default frame color + * @li expects type size_t * @param[in] sel_fr_col * @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 @@ -68,8 +68,8 @@ class CCButtonSelect * @li optional: expects type int, default = 1 */ void setSelectedButton(size_t item_id, - const fb_pixel_t& fr_col = COL_FRAME_PLUS_0, const fb_pixel_t& sel_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& text_col = COL_MENUCONTENT_TEXT,