From 0b99e46673fe98745f24ef8e9ba53e699c274f8a Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sun, 22 Jul 2012 16:14:29 +0200 Subject: [PATCH] CComponentsInfoBox: Switch parameter h and w in constructor Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a5d8bd4e13034010c69be956b60ccf44fb82f907 Author: Michael Liebmann Date: 2012-07-22 (Sun, 22 Jul 2012) Origin message was: ------------------ * CComponentsInfoBox: Switch parameter h and w in constructor ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/components.cpp | 2 +- src/gui/widget/components.h | 3 ++- src/gui/widget/menue.cpp | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/widget/components.cpp b/src/gui/widget/components.cpp index cbfdfcac8..1a1fd1aaf 100644 --- a/src/gui/widget/components.cpp +++ b/src/gui/widget/components.cpp @@ -192,7 +192,7 @@ void CComponentsDetailLine::hide() //------------------------------------------------------------------------------------------------------- //sub class CComponentsInfoBox -CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const int h, const int w, bool has_shadow, fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow) +CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const int w, const int h, bool has_shadow, fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow) { x = x_pos; y = y_pos; diff --git a/src/gui/widget/components.h b/src/gui/widget/components.h index da0dcf3e4..cc221701f 100644 --- a/src/gui/widget/components.h +++ b/src/gui/widget/components.h @@ -87,6 +87,7 @@ class CComponentsDetailLine : public CComponents void setHMarkDown(const int& h_mark_down_){h_mark_down = h_mark_down_;}; }; +#define INFO_BOX_Y_OFFSET 2 class CComponentsInfoBox : public CComponents { private: @@ -97,7 +98,7 @@ class CComponentsInfoBox : public CComponents std::vector v_infobox_val; public: - CComponentsInfoBox( const int x_pos, const int y_pos, const int h, const int w, bool has_shadow = true, + CComponentsInfoBox( const int x_pos, const int y_pos, const int w, const int h, bool has_shadow = true, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENTDARK_PLUS_0,fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0); void paint(bool do_save_bg = true); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 1800905c1..480e40cf4 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -44,7 +44,6 @@ #include #define ConnectLineBox_Width 16 -#define INFO_BOX_Y_OFFSET 2 /* the following generic menu items are integrated into multiple menus at the same time */ CMenuSeparator CGenericMenuSeparator; @@ -1097,7 +1096,7 @@ printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText details_line->paint(); if (info_box == NULL) - info_box = new CComponentsInfoBox(x, ypos2, hint_height, iwidth); + info_box = new CComponentsInfoBox(x, ypos2, iwidth, hint_height); else { info_box->setXPos(x); info_box->setYPos(ypos2);