From e37d517f3ee048601e295ab112e737a898d2149b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 7 Dec 2016 16:46:24 +0100 Subject: [PATCH 1/2] bouquetlist: fix initialisation of empty sting Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8be61c876393203abfc6f54669ef3f8bb026acea Author: vanhofen Date: 2016-12-07 (Wed, 07 Dec 2016) Origin message was: ------------------ - bouquetlist: fix initialisation of empty sting --- src/gui/bouquetlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 51b61d544..884904f8c 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -690,7 +690,7 @@ void CBouquetList::paintItem(int pos) void CBouquetList::paintHead() { - std::string icon = ""; + std::string icon(""); CComponentsHeader header(x, y, width, theight, name, icon, CComponentsHeader::CC_BTN_LEFT | CComponentsHeader::CC_BTN_RIGHT | CComponentsHeader::CC_BTN_MENU); header.paint(CC_SAVE_SCREEN_NO); } From 55d28176311c7df7add081c2a6d540b2a4668e35 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 8 Dec 2016 00:36:26 +0100 Subject: [PATCH 2/2] bouquetlist: fix round corners of selected item Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/9fe560fa53ed809a79b1989c907ba79a50d3d0b5 Author: vanhofen Date: 2016-12-08 (Thu, 08 Dec 2016) Origin message was: ------------------ - bouquetlist: fix round corners of selected item --- src/gui/bouquetlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 884904f8c..f112c8d4f 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -633,7 +633,7 @@ void CBouquetList::paintItem(int pos) i_radius = RADIUS_LARGE; if (i_radius) - frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor); + frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, bgcolor, i_radius); if (npos < (int) Bouquets.size())