mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/pu-cc' into master

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-04-13 17:17:30 +02:00
parent fa87c27dfe 4b624f88bd
commit 61bf95f552
15 changed files with 123 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/audioplayer.cpp
View File

@@ -1526,8 +1526,8 @@ void CAudioPlayerGui::hide()
// printf("hide(){\n");
if (m_visible)
{
m_frameBuffer->paintBackgroundBoxRel(m_x - ConnectLineBox_Width-1, m_y + m_title_height - 1,
m_width + ConnectLineBox_Width+2, m_height + 2 - m_title_height);
m_frameBuffer->paintBackgroundBoxRel(m_x - ConnectLineBox_Width, m_y + m_title_height,
m_width + ConnectLineBox_Width, m_height - m_title_height);
clearItemID3DetailsLine();
m_frameBuffer->paintBackgroundBoxRel(m_x, m_y, m_width, m_title_height);
m_frameBuffer->blit();
@@ -1800,13 +1800,13 @@ void CAudioPlayerGui::paintInfo()
if (!m_show_playlist)
{
// no playlist -> smaller Info-Box
m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, m_title_height - 10 - m_fheight,2, COL_MENUCONTENT_PLUS_6, c_rad_mid);
m_frameBuffer->paintBoxRel(m_x + 2, m_y + 2 , m_width - 4, m_title_height - 14 - m_fheight, COL_MENUCONTENTSELECTED_PLUS_0, c_rad_mid);
m_frameBuffer->paintBoxRel(m_x + 1, m_y + 1 , m_width - 2, m_title_height - 12 - m_fheight, COL_MENUCONTENTSELECTED_PLUS_0, c_rad_mid);
m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, m_title_height - 10 - m_fheight, 2, COL_MENUCONTENT_PLUS_6, c_rad_mid);
}
else
{
m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, m_title_height - 10,2, COL_MENUCONTENT_PLUS_6, c_rad_mid);
m_frameBuffer->paintBoxRel(m_x + 2, m_y + 2 , m_width - 4, m_title_height - 14, COL_MENUCONTENTSELECTED_PLUS_0, c_rad_mid);
m_frameBuffer->paintBoxRel(m_x + 1, m_y + 1 , m_width - 2, m_title_height - 12, COL_MENUCONTENTSELECTED_PLUS_0, c_rad_mid);
m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, m_title_height - 10, 2, COL_MENUCONTENT_PLUS_6, c_rad_mid);
}
// first line (Track number)