mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +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
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-13 12:45:30 +01:00
parent 0a75d324ea 51c85e1c58
commit 7dcc90f09f
21 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/audioplayer.cpp
View File

@@ -272,8 +272,8 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
m_height = m_theight + m_info_height + m_title_height + 2*m_buttonHeight + m_listmaxshow * m_fheight; // recalc height
m_x = getScreenStartX( m_width );
if (m_x < ConnectLineBox_Width)
m_x = ConnectLineBox_Width;
if (m_x < DETAILSLINE_WIDTH)
m_x = DETAILSLINE_WIDTH;
m_y = getScreenStartY( m_height );
m_idletime=time(NULL);
@@ -1503,8 +1503,8 @@ void CAudioPlayerGui::hide()
// printf("hide(){\n");
if (m_visible)
{
m_frameBuffer->paintBackgroundBoxRel(m_x - ConnectLineBox_Width, m_y + m_title_height,
m_width + ConnectLineBox_Width, m_height - m_title_height);
m_frameBuffer->paintBackgroundBoxRel(m_x - DETAILSLINE_WIDTH, m_y + m_title_height,
m_width + DETAILSLINE_WIDTH, m_height - m_title_height);
clearItemID3DetailsLine();
m_frameBuffer->paintBackgroundBoxRel(m_x, m_y, m_width, m_title_height);
m_visible = false;
@@ -1824,7 +1824,7 @@ void CAudioPlayerGui::clearItemID3DetailsLine ()
void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
{
int xpos = m_x - ConnectLineBox_Width;
int xpos = m_x - DETAILSLINE_WIDTH;
int ypos1 = m_y + m_title_height + m_theight + pos*m_fheight;
int ypos2 = m_y + (m_height - m_info_height) + OFFSET_INTER;
int ypos1a = ypos1 + (m_fheight / 2);
@@ -1842,7 +1842,7 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
{
//details line
if (dline == NULL)
dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, m_fheight/2, m_info_height-RADIUS_LARGE*2);
dline = new CComponentsDetailsLine(xpos, ypos1a, ypos2a, m_fheight/2, m_info_height-RADIUS_LARGE*2);
dline->paint(false);
// paint id3 infobox