From 64a4f336298ea2ff0812f95676633d6ae86baf74 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 10 Nov 2016 20:52:58 +0100 Subject: [PATCH 1/4] src/gui/epgview.cpp reset header height to single size Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e3136b888c9f52ff93214f6cb193af40ca2de04b Author: Jacek Jendrzej Date: 2016-11-10 (Thu, 10 Nov 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index bcbb693cb..68577b029 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -991,6 +991,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start case CRCInput::RC_left: if ((prev_id != 0) && !call_fromfollowlist && !mp_info) { + toph = topboxheight; show(channel_id, prev_id, &prev_zeit, false); showPos=0; } @@ -998,6 +999,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start case CRCInput::RC_right: if ((next_id != 0) && !call_fromfollowlist && !mp_info) { + toph = topboxheight; show(channel_id, next_id, &next_zeit, false); showPos=0; } From b1d2a19a42985c227ff28a90787074fea4ba0f65 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 11 Nov 2016 00:18:43 +0100 Subject: [PATCH 2/4] eventlist: fix right textbox in header; last char was not displayed Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/00ad1ecd1cfae1c9deb280dab9367f7799af09dd Author: vanhofen Date: 2016-11-11 (Fri, 11 Nov 2016) Origin message was: ------------------ - eventlist: fix right textbox in header; last char was not displayed ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/eventlist.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index c6f879092..35414a19d 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -885,9 +885,8 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s } if (!_channelname_next.empty()) { - int name_w = std::min(g_Font[font_lr]->getRenderWidth(_channelname_next), side_width); - int x_pos = full_width - name_w - x_off; - CComponentsText *rText = new CComponentsText(x_pos, CC_CENTERED, name_w, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr], CComponentsText::FONT_STYLE_REGULAR, header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); + int x_pos = full_width - side_width - x_off; + CComponentsText *rText = new CComponentsText(x_pos, CC_CENTERED, side_width, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK | CTextBox::RIGHT, g_Font[font_lr], CComponentsText::FONT_STYLE_REGULAR, header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); rText->doPaintBg(false); } From f2eb47b9fcfd221d9075253597644bf1208d791d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 11 Nov 2016 00:25:25 +0100 Subject: [PATCH 3/4] eventlist: allow gradient/radius changes w/o neutrino restart Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c056b56d1242b376924c8875f161406c8ff1a2ca Author: vanhofen Date: 2016-11-11 (Fri, 11 Nov 2016) Origin message was: ------------------ - eventlist: allow gradient/radius changes w/o neutrino restart ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/eventlist.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 35414a19d..0902ff472 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -848,11 +848,11 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s int font_mid = SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE; int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE; - if (!header){ + if (!header) header = new CComponentsFrmChain(x, y, full_width, theight); - header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction); - header->setCorner(RADIUS_LARGE, CORNER_TOP); - } + + header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction); + header->setCorner(RADIUS_LARGE, CORNER_TOP); header->clear(); int x_off = OFFSET_INNER_MID; From b13d1966d29a6c6bebaced6027656462d0bb3132 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 11 Nov 2016 00:48:37 +0100 Subject: [PATCH 4/4] CMenuWidget: move signal before render methodes At start of methode, unusual behavior could occur. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/30f231c8010fafa235e154a618ee906a0d8d762f Author: Thilo Graf Date: 2016-11-11 (Fri, 11 Nov 2016) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index c80a8ebb4..25b9cc6eb 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1228,7 +1228,6 @@ void CMenuWidget::initSelectable() void CMenuWidget::paint() { - OnBeforePaint(); if (header){ if ((bool)header->getCornerRadius() != (bool)g_settings.rounded_corners) //ensure reset if corner mode was changed ResetModules(); @@ -1239,6 +1238,8 @@ void CMenuWidget::paint() calcSize(); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, nameString.c_str()*/); + OnBeforePaint(); + // paint head if (header == NULL){ header = new CComponentsHeader(x, y, width + sb_width, hheight, getName(), iconfile);