mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
This commit is contained in:
vanhofen
2017-03-13 12:45:30 +01:00
parent 8c65bc5cf0 9c009ade29
commit 30fd965086
21 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/upnpbrowser.cpp
View File

@@ -150,8 +150,8 @@ void CUpnpBrowserGui::Init()
footer.enableShadow(CC_SHADOW_ON, -1, true);
m_x=getScreenStartX(m_width);
if (m_x < ConnectLineBox_Width) // shouldn't happen
m_x = ConnectLineBox_Width;
if (m_x < DETAILSLINE_WIDTH) // shouldn't happen
m_x = DETAILSLINE_WIDTH;
m_y=getScreenStartY(m_height);
// calc positions
@@ -1241,14 +1241,14 @@ void CUpnpBrowserGui::paintItem2DetailsLine(int pos)
if (pos < 0)
return;
int xpos = m_x - ConnectLineBox_Width;
int xpos = m_x - DETAILSLINE_WIDTH;
int ypos1 = m_item_y + pos*m_item_height;
int ypos2 = infobox.getYPos() + infobox.getHeight() - infobox.getHeight()/2;
int ypos1a = ypos1 + (m_item_height/2);
if (!dline)
dline = new CComponentsDetailLine();
dline = new CComponentsDetailsLine();
dline->setDimensionsAll(xpos, ypos1a, ypos2, m_item_height/2, infobox.getHeight() - RADIUS_LARGE*2);
dline->paint();
}