From 52ea1690bc59beb08874e7b4885da5688f252f78 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Apr 2017 17:02:48 +0200 Subject: [PATCH 1/8] colors: add and use missing COL_SCROLLBAR_PLUS_0 wrapper Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8e50353773b3405c373413f0b216132831568e6c Author: vanhofen Date: 2017-04-22 (Sat, 22 Apr 2017) Origin message was: ------------------ - colors: add and use missing COL_SCROLLBAR_PLUS_0 wrapper ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/color.h | 1 + src/gui/components/cc_frm_scrollbar.h | 32 +++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/gui/color.h b/src/gui/color.h index abad69330..a902ab709 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -124,6 +124,7 @@ #define COL_FRAME_PLUS_0 COL_FRAME #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_PLUS_0 COL_SCROLLBAR_ACTIVE #define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2 diff --git a/src/gui/components/cc_frm_scrollbar.h b/src/gui/components/cc_frm_scrollbar.h index 9fd1ab984..8658d5428 100644 --- a/src/gui/components/cc_frm_scrollbar.h +++ b/src/gui/components/cc_frm_scrollbar.h @@ -79,11 +79,11 @@ class CComponentsScrollBar : public CComponentsFrmChain * usual paraemters: * @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] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR - * @param[in] color_body 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_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_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE + * @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_PLUS_0 */ CComponentsScrollBar( const int &x_pos, const int &y_pos, @@ -92,11 +92,11 @@ class CComponentsScrollBar : public CComponentsFrmChain const int& count = 1, CComponentsForm *parent = NULL, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SCROLLBAR, - fb_pixel_t color_body = COL_SCROLLBAR, + fb_pixel_t color_frame = COL_SCROLLBAR_PLUS_0, + fb_pixel_t color_body = COL_SCROLLBAR_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0, - fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE, - fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE); + fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE_PLUS_0, + fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE_PLUS_0); // ~CComponentsScrollBar(); //inherited from CComponentsForm /**Set current page number @@ -158,11 +158,11 @@ class CComponentsScrollBar : public CComponentsFrmChain * usual paraemters: * @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] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0 - * @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_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_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_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE + * @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_PLUS_0 */ void paintScrollBar( const int &x_pos, const int &y_pos, @@ -171,10 +171,10 @@ void paintScrollBar( const int &x_pos, const int& count, const int& current_num, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SCROLLBAR, - fb_pixel_t color_body = COL_SCROLLBAR, + fb_pixel_t color_frame = COL_SCROLLBAR_PLUS_0, + fb_pixel_t color_body = COL_SCROLLBAR_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0, - fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE, - fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE); + fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE_PLUS_0, + fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE_PLUS_0); #endif From 53459ad6c01da56901a9fa73b2ff502baa8a775f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Apr 2017 17:02:48 +0200 Subject: [PATCH 2/8] luainstance: add missing COL_SCROLLBAR colors Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3669130b14c0dc4179e14ff930f31ffcd3e44863 Author: vanhofen Date: 2017-04-22 (Sat, 22 Apr 2017) Origin message was: ------------------ - luainstance: add missing COL_SCROLLBAR colors ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/lua/lua_api_version.h | 2 +- src/gui/lua/luainstance.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/lua/lua_api_version.h b/src/gui/lua/lua_api_version.h index 9e8343ca1..078e88ef8 100644 --- a/src/gui/lua/lua_api_version.h +++ b/src/gui/lua/lua_api_version.h @@ -4,4 +4,4 @@ * to luainstance.h changes */ #define LUA_API_VERSION_MAJOR 1 -#define LUA_API_VERSION_MINOR 72 +#define LUA_API_VERSION_MINOR 73 diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index ee304db0a..c031083ce 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -175,6 +175,7 @@ static void set_lua_variables(lua_State *L) { "MENUCONTENTINACTIVE", MAGIC_COLOR | (COL_MENUCONTENTINACTIVE) }, { "MENUFOOT", MAGIC_COLOR | (COL_MENUFOOT) }, { "FRAME", MAGIC_COLOR | (COL_FRAME) }, + { "SCROLLBAR", MAGIC_COLOR | (COL_SCROLLBAR) }, { "SCROLLBAR_ACTIVE", MAGIC_COLOR | (COL_SCROLLBAR_ACTIVE) }, { "SCROLLBAR_PASSIVE", MAGIC_COLOR | (COL_SCROLLBAR_PASSIVE) }, { "PROGRESSBAR_ACTIVE", MAGIC_COLOR | (COL_PROGRESSBAR_ACTIVE) }, @@ -226,6 +227,7 @@ static void set_lua_variables(lua_State *L) { "MENUCONTENTINACTIVE_PLUS_0", (lua_Unsigned) (COL_MENUCONTENTINACTIVE_PLUS_0) }, { "MENUFOOT_PLUS_0", (lua_Unsigned) (COL_MENUFOOT_PLUS_0) }, { "FRAME_PLUS_0", (lua_Unsigned) (COL_FRAME_PLUS_0) }, + { "SCROLLBAR_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_PLUS_0) }, { "SCROLLBAR_ACTIVE_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_ACTIVE_PLUS_0) }, { "SCROLLBAR_PASSIVE_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_PASSIVE_PLUS_0) }, { "PROGRESSBAR_ACTIVE_PLUS_0", (lua_Unsigned) (COL_PROGRESSBAR_ACTIVE_PLUS_0) }, From 5752e1e8558315eb43964887453eaabd48b07b9c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Apr 2017 17:02:48 +0200 Subject: [PATCH 3/8] color.h: just code cosmetics Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d3f27914e33cae4f584ad3426cb8f739beec330d Author: vanhofen Date: 2017-04-22 (Sat, 22 Apr 2017) Origin message was: ------------------ - color.h: just code cosmetics ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/color.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gui/color.h b/src/gui/color.h index a902ab709..bcce61d8c 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -120,20 +120,20 @@ #endif // some wrappers to get more readability -#define COL_FRAME COL_MENUCONTENT_PLUS_6 -#define COL_FRAME_PLUS_0 COL_FRAME +#define COL_FRAME COL_MENUCONTENT_PLUS_6 +#define COL_FRAME_PLUS_0 COL_FRAME -#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_PLUS_0 COL_SCROLLBAR_ACTIVE -#define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2 -#define COL_SCROLLBAR_PASSIVE_PLUS_0 COL_SCROLLBAR_PASSIVE +#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_PLUS_0 COL_SCROLLBAR_ACTIVE +#define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2 +#define COL_SCROLLBAR_PASSIVE_PLUS_0 COL_SCROLLBAR_PASSIVE -#define COL_PROGRESSBAR_ACTIVE COL_MENUCONTENT_PLUS_7 -#define COL_PROGRESSBAR_ACTIVE_PLUS_0 COL_PROGRESSBAR_ACTIVE -#define COL_PROGRESSBAR_PASSIVE COL_MENUCONTENT_PLUS_1 -#define COL_PROGRESSBAR_PASSIVE_PLUS_0 COL_PROGRESSBAR_PASSIVE +#define COL_PROGRESSBAR_ACTIVE COL_MENUCONTENT_PLUS_7 +#define COL_PROGRESSBAR_ACTIVE_PLUS_0 COL_PROGRESSBAR_ACTIVE +#define COL_PROGRESSBAR_PASSIVE COL_MENUCONTENT_PLUS_1 +#define COL_PROGRESSBAR_PASSIVE_PLUS_0 COL_PROGRESSBAR_PASSIVE int convertSetupColor2RGB(unsigned char r, unsigned char g, unsigned char b); int convertSetupAlpha2Alpha(unsigned char alpha); From 3d811a3370750dbf18c7b3ba762588a04d9dbd78 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 23 Apr 2017 15:06:16 +0200 Subject: [PATCH 4/8] CChannelList/CUpnpBrowserGui: add missing reinit for corner modes Required eg. if corner settings has been changed by user on runtime. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0943c467e2a88811374d3f980f0c2df4dccab139 Author: Thilo Graf Date: 2017-04-23 (Sun, 23 Apr 2017) ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 1 + src/gui/upnpbrowser.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 2e6ad72b1..ba3cb8941 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2119,6 +2119,7 @@ void CChannelList::paintHead() } header->setDimensionsAll(x, y, full_width, theight); + header->setCorner(RADIUS_LARGE, CORNER_TOP); if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked) header->setIcon(NEUTRINO_ICON_LOCK); diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 5871a3ea2..b407d7924 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -941,6 +941,7 @@ void CUpnpBrowserGui::paintDeviceInfo() tmp += m_devices[m_selecteddevice].modelurl; topbox.setDimensionsAll(m_x, m_y, m_width, m_topbox_height); + topbox.setCorner(RADIUS_LARGE); topbox.setText(tmp, CTextBox::AUTO_WIDTH); topbox.paint0(); } @@ -991,7 +992,7 @@ void CUpnpBrowserGui::paintDevices() header.addContextButton(NEUTRINO_ICON_BUTTON_MUTE_SMALL); else header.removeContextButtons(); - //header.enableShadow(); + header.setCorner(RADIUS_LARGE, CORNER_TOP); header.paint(CC_SAVE_SCREEN_NO); // Items @@ -1012,6 +1013,7 @@ void CUpnpBrowserGui::paintDevices() m_frameBuffer->paintBoxRel(m_x + m_width, m_item_y + OFFSET_SHADOW, OFFSET_SHADOW, sb, COL_SHADOW_PLUS_0); // Foot + footer.setCorner(RADIUS_LARGE, CORNER_BOTTOM); footer.paintButtons(m_x, m_footer_y, m_width, m_footer_height, 1, &RescanButton, m_width/2); paintItem2DetailsLine(-1); // clear it @@ -1148,6 +1150,7 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry) } } + topbox.setCorner(RADIUS_LARGE); topbox.setText(tmp, CTextBox::AUTO_WIDTH); topbox.paint0(); } @@ -1197,7 +1200,9 @@ void CUpnpBrowserGui::paintDetails(UPnPEntry *entry, bool use_playing) char tmp_time[] = "000:00"; int timebox_width = timebox.getFont()->getRenderWidth(tmp_time) + OFFSET_INNER_MID*2; infobox.setDimensionsAll(m_x, m_infobox_y, m_width - OFFSET_SHADOW - OFFSET_INTER - timebox_width, m_infobox_height); + infobox.setCorner(RADIUS_LARGE); timebox.setDimensionsAll(m_x + m_width - timebox_width, infobox.getYPos(), timebox_width, m_infobox_height); + timebox.setCorner(RADIUS_LARGE); printf("paintDetails: use_playing %d shown %d\n", use_playing, m_playing_entry_is_shown); if ((!use_playing) && entry->isdir){ From d0a3315ca2f050fb7346eb8f5c0c3518e4ba6523 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 23 Apr 2017 16:45:03 +0200 Subject: [PATCH 5/8] CComponentsHeader: add fallback if title and logo are overlapping Logo is now general centered on screen, not as before between title and clock Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1413f296ae1afb786a2a5b38edcf10f3123f59b4 Author: Thilo Graf Date: 2017-04-23 (Sun, 23 Apr 2017) ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_header.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index f053e94ec..9fef1dfba 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -307,8 +307,15 @@ void CComponentsHeader::initLogo() x_logo = x_logo_right; if (cch_logo.Align == CC_LOGO_LEFT) x_logo = x_logo_left; - if (cch_logo.Align == CC_LOGO_CENTER) - x_logo = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2; + if (cch_logo.Align == CC_LOGO_CENTER){ + x_logo = width/2 - cch_logo_obj->getWidth()/2; + //fallback if previous item and logo are overlapping + if (getCCItem(prev_id)){ + int x_tmp = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2; + if (x_logo <= x_logo_left) + x_logo = x_tmp; + } + } cch_logo_obj->setXPos(x_logo); cch_logo_obj->setYPos(height/2 - cch_logo_obj->getHeight()/2); From 9570a9d36a031e0027967cdc97618c60e14c7cfa Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 23 Apr 2017 16:56:41 +0200 Subject: [PATCH 6/8] CComponentsHeader: use previous offset to fit logo Was OFFSET_INNER_MIN in older versions, not OFFSET_INNER_SMALL. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/330171c90bb02e94689529162df95fc5e855090a Author: Thilo Graf Date: 2017-04-23 (Sun, 23 Apr 2017) ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_header.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index 9fef1dfba..9161a0fe3 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -274,7 +274,7 @@ void CComponentsHeader::initIcon() void CComponentsHeader::initLogo() { - cch_logo.dy_max = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_SMALL : cch_logo.dy_max; + cch_logo.dy_max = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_MIN : cch_logo.dy_max; if(!cch_logo_obj) cch_logo_obj = new CComponentsChannelLogoScalable(width/2, height/2 - cch_logo.dy_max/2, cch_logo.Name, cch_logo.Id, this); From 000595e6b7f8d728daee41e7a76a341a614e617e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 23 Apr 2017 13:42:50 +0200 Subject: [PATCH 7/8] CChannelList: remove unused logo object Not required since 7c03858f7c852b80a9a51c004c1d6a390b1e6083: add possibility to show channellogo Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/fbe8889fa9f63850b40247e6a33488b237a7178a Author: Thilo Graf Date: 2017-04-23 (Sun, 23 Apr 2017) ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index ba3cb8941..680e09724 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -96,7 +96,6 @@ extern bool autoshift; static CComponentsPIP *cc_minitv = NULL; extern CBouquetManager *g_bouquetManager; extern int old_b_id; -static CComponentsChannelLogoScalable* CChannelLogo = NULL; static CComponentsHeader *header = NULL; extern bool timeset; @@ -126,7 +125,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl cc_minitv = NULL; logo_off = 0; minitv_is_active = false; - CChannelLogo = NULL; headerNew = true; bouquet = NULL; chanlist = &channels; @@ -955,11 +953,6 @@ void CChannelList::hide() } if(header) header->kill(); - if (CChannelLogo){ - CChannelLogo->kill(); - delete CChannelLogo; - CChannelLogo = NULL; - } frameBuffer->paintBackgroundBoxRel(x, y, full_width, height + OFFSET_INTER + info_height); clearItem2DetailsLine(); @@ -2130,11 +2123,6 @@ void CChannelList::paintHead() header->setCaption(header_txt, CTextBox::NO_AUTO_LINEBREAK, header_txt_col); - if (header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0)){ - if (CChannelLogo) - CChannelLogo->clearFbData(); - } - if (timeset) { if(!edit_state){ if (header->getContextBtnObject()) @@ -2181,10 +2169,6 @@ void CChannelList::ResetModules() delete cc_minitv; cc_minitv = NULL; } - if (CChannelLogo) { - delete CChannelLogo; - CChannelLogo = NULL; - } } void CChannelList::paintBody() From a2cab1dffa9bc953d4de71f4d26d82bc37775597 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 24 Apr 2017 12:29:52 +0200 Subject: [PATCH 8/8] scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ... ... outside of CComponentsScrollBar(). Since the color-changes in cd80e26 the non-CC scrollbars looks weird. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/fe5f84c1d08b194267b6ff11b74b8b3dca0facd7 Author: vanhofen Date: 2017-04-24 (Mon, 24 Apr 2017) Origin message was: ------------------ - scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ... ... outside of CComponentsScrollBar(). Since the color-changes in cd80e26 the non-CC scrollbars looks weird. ------------------ This commit was generated by Migit --- src/gui/audioplayer.cpp | 2 +- src/gui/bedit/bouqueteditor_bouquets.cpp | 2 +- src/gui/bedit/bouqueteditor_channels.cpp | 2 +- src/gui/bookmarkmanager.cpp | 2 +- src/gui/channellist.cpp | 2 +- src/gui/epgview.cpp | 2 +- src/gui/eventlist.cpp | 2 +- src/gui/filebrowser.cpp | 2 +- src/gui/pictureviewer.cpp | 2 +- src/gui/timerlist.cpp | 2 +- src/gui/upnpbrowser.cpp | 4 ++-- src/gui/widget/listbox.cpp | 2 +- src/gui/widget/listframe.cpp | 2 +- src/gui/widget/textbox.cpp | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 673c8103c..a95fbcdfa 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1766,7 +1766,7 @@ void CAudioPlayerGui::paint() int ypos = m_y + m_title_height + m_theight; int sb = m_fheight * m_listmaxshow; - m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_SCROLLBAR_PLUS_0); int sbc = ((m_playlist.size() - 1) / tmp_max) + 1; int sbs = (m_selected / tmp_max); diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 5e2e348c8..0109fd340 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -127,7 +127,7 @@ void CBEBouquetWidget::paint() int ypos = y+ theight; int sb = iheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); int sbc= ((Bouquets->size()- 1)/ listmaxshow)+ 1; int sbs= (selected/listmaxshow); diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 2c87de088..97a65de4c 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -161,7 +161,7 @@ void CBEChannelWidget::paint() int ypos = y+ theight; int sb = iheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); int sbc= ((Channels->size()- 1)/ listmaxshow)+ 1; if (sbc < 1) diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index f88736107..f91b47469 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -459,7 +459,7 @@ void CBookmarkManager::paint() { int ypos = y+ theight; int sb = 2*fheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); unsigned int tmp_max = listmaxshow; if(!tmp_max) tmp_max = 1; diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 680e09724..edc0e8bab 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2203,7 +2203,7 @@ void CChannelList::paintBody() const int ypos = y+ theight; const int sb = height - theight - footerHeight; // paint scrollbar over full height of main box - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); unsigned int listmaxshow_tmp = listmaxshow ? listmaxshow : 1;//avoid division by zero int sbc= (((*chanlist).size()- 1)/ listmaxshow_tmp)+ 1; const int sbs= (selected/listmaxshow_tmp); diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 078da34ae..bf6658969 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -327,7 +327,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) int sbs= (startPos+ 1)/ medlinecount; if (sbc < 1) sbc = 1; - frameBuffer->paintBoxRel(sx+ ox- 15, ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); // scrollbar bg + frameBuffer->paintBoxRel(sx+ ox- 15, ypos, 15, sb, COL_SCROLLBAR_PLUS_0); // scrollbar bg frameBuffer->paintBoxRel(sx+ ox- 13, ypos+ 2+ sbs*(sb-4)/sbc , 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0); // scrollbar } diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index f8209f6d5..2c1a859d7 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -920,7 +920,7 @@ void CEventList::paint(t_channel_id channel_id) int ypos = y+ theight; int sb = fheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); int sbc= ((evtlist.size()- 1)/ listmaxshow)+ 1; int sbs= (selected/listmaxshow); diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 7ecdcf00e..d1f725fcf 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -1454,7 +1454,7 @@ void CFileBrowser::paint() //scrollbar int ypos = y+ theight; int sb = fheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); int sbc= ((filelist.size()- 1)/ listmaxshow)+ 1; int sbs= (selected/listmaxshow); diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 97e335fa1..1dc102dca 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -750,7 +750,7 @@ void CPictureViewerGui::paint() int ypos = y+ theight; int sb = fheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); unsigned int tmp_max = listmaxshow; if(!tmp_max) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 145360ee8..fa7e7467e 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1427,7 +1427,7 @@ void CTimerList::paint() { int ypos = y+ theight; int sb = 2*fheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); unsigned int tmp_max = listmaxshow; if (!tmp_max) tmp_max = 1; diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index b407d7924..9b6bf89b1 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -1000,7 +1000,7 @@ void CUpnpBrowserGui::paintDevices() paintDevice(count); int sb = m_item_height * m_listmaxshow; - m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PLUS_0); unsigned int tmp_max = m_listmaxshow; if(!tmp_max) tmp_max = 1; @@ -1179,7 +1179,7 @@ void CUpnpBrowserGui::paintItems(std::vector *entry, unsigned int sel paintItem(entry, count, selected); int sb = m_item_height * m_listmaxshow; - m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PLUS_0); unsigned int tmp = m_listmaxshow ? m_listmaxshow : 1;//avoid division by zero int sbc = ((max + offset - 1) / tmp) + 1; int sbs = ((selected + offset) / tmp); diff --git a/src/gui/widget/listbox.cpp b/src/gui/widget/listbox.cpp index 6443e028f..1edcc681f 100644 --- a/src/gui/widget/listbox.cpp +++ b/src/gui/widget/listbox.cpp @@ -69,7 +69,7 @@ void CListBox::paint() int ypos = y+ theight; int sb = fheight* listmaxshow; - frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); + frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); int sbc= ((getItemCount()- 1)/ listmaxshow)+ 1; if (sbc < 1) diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp index 3d17d46fb..33f76ea43 100644 --- a/src/gui/widget/listframe.cpp +++ b/src/gui/widget/listframe.cpp @@ -385,7 +385,7 @@ void CListFrame::refreshScroll(void) if (m_nNrOfPages > 1) { frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY, - m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_SCROLLBAR_PASSIVE_PLUS_0, RADIUS_MIN); + m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_SCROLLBAR_PLUS_0, RADIUS_MIN); unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*OFFSET_INNER_MIN) / m_nNrOfPages; frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + OFFSET_INNER_MIN+m_cFrame.iX, m_cFrameScrollRel.iY + OFFSET_INNER_MIN + m_nCurrentPage * marker_size +m_cFrame.iY, diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp index 82195ae5a..34b0a941e 100644 --- a/src/gui/widget/textbox.cpp +++ b/src/gui/widget/textbox.cpp @@ -527,7 +527,7 @@ void CTextBox::refreshScroll(void) { frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY, m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, - COL_SCROLLBAR_PASSIVE_PLUS_0, RADIUS_MIN); + COL_SCROLLBAR_PLUS_0, RADIUS_MIN); unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*SCROLL_MARKER_BORDER) / m_nNrOfPages; frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + SCROLL_MARKER_BORDER + m_cFrame.iX, m_cFrameScrollRel.iY + SCROLL_MARKER_BORDER + m_nCurrentPage * marker_size + m_cFrame.iY,