From 41a9339469c83f7b21854edeb1cf4da0312a5bde Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 11 Nov 2016 00:48:37 +0100 Subject: [PATCH 1/2] CMenuWidget: move signal before render methodes At start of methode, unusual behavior could occur. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/30f231c8010fafa235e154a618ee906a0d8d762f Author: Thilo Graf Date: 2016-11-11 (Fri, 11 Nov 2016) --- 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); From 269dd731f7ffc9111f3a614f7a0206b8fe87caed Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 11 Nov 2016 00:51:32 +0100 Subject: [PATCH 2/2] eventlist: allow windows size changes w/o neutrino restart Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e3306076de75587af637a69d140c27baef9fd34e Author: vanhofen Date: 2016-11-11 (Fri, 11 Nov 2016) Origin message was: ------------------ - eventlist: allow windows size changes w/o neutrino restart --- src/gui/eventlist.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 0902ff472..79366cec2 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -849,8 +849,9 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE; if (!header) - header = new CComponentsFrmChain(x, y, full_width, theight); + header = new CComponentsFrmChain(); + header->setDimensionsAll(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->clear();