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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/nhttpd/web/Makefile.am
	src/nhttpd/web/Y_Blocks.txt
	src/nhttpd/web/Y_Menue.yhtm
	src/nhttpd/web/Y_Settings_yWeb.yhtm


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-01 11:54:51 +02:00
parent a47f07e7c6 ee6fe6049f
commit f6374e85e8
48 changed files with 572 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/audioplayer.cpp
View File

@@ -1860,7 +1860,7 @@ void CAudioPlayerGui::clearItemID3DetailsLine ()
void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
{
int xpos = m_x - ConnectLineBox_Width;
int ypos1 = m_y + m_title_height + m_theight+ 0 + pos*m_fheight + INFO_BOX_Y_OFFSET;
int ypos1 = m_y + m_title_height + m_theight + pos*m_fheight;
int ypos2 = m_y + (m_height - m_info_height) + INFO_BOX_Y_OFFSET;
int ypos1a = ypos1 + (m_fheight / 2);
int ypos2a = ypos2 + (m_info_height / 2);
@@ -1874,8 +1874,7 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
{
//details line
if (dline == NULL)
dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, m_fheight/2, m_fheight);
dline->setYPos(ypos1a);
dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, m_fheight/2, m_info_height-RADIUS_LARGE*2);
dline->paint(false);
// paint id3 infobox
@@ -1883,7 +1882,6 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
ibox = new CComponentsInfoBox(m_x, ypos2, m_width, m_info_height);
ibox->setFrameThickness(2);
ibox->setCorner(RADIUS_LARGE);
ibox->setYPos(ypos2);
ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0);
ibox->forceTextPaint(false);
}