Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: d7044490de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

src/gui/channellist.cpp

@@ -100,7 +100,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;
 
@@ -130,7 +129,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;
@@ -970,11 +968,6 @@ void CChannelList::hide()
 	}
 	if(header)
 		header->kill();
-	if (CChannelLogo){
-		CChannelLogo->kill();
-		delete CChannelLogo;
-		CChannelLogo = NULL;
-	}
 
 	frameBuffer->paintBackground(); //NI clear whole screen
 	clearItem2DetailsLine();
@@ -2145,6 +2138,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);
@@ -2155,11 +2149,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())
@@ -2206,10 +2195,6 @@ void CChannelList::ResetModules()
 		delete 	cc_minitv;
 		cc_minitv = NULL;
 	}
-	if (CChannelLogo) {
-		delete CChannelLogo;
-		CChannelLogo = NULL;
-	}
 }
 
 void CChannelList::paintBody()

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);
@@ -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)
+		if (cch_logo.Align == CC_LOGO_CENTER){
-			x_logo = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2;
+			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);

src/gui/upnpbrowser.cpp

@@ -947,6 +947,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();
 }
@@ -997,7 +998,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
@@ -1018,6 +1019,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
@@ -1154,6 +1156,7 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry)
 		}
 	}
 
+	topbox.setCorner(RADIUS_LARGE);
 	topbox.setText(tmp, CTextBox::AUTO_WIDTH);
 	topbox.paint0();
 }
@@ -1203,7 +1206,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){