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

audioplayer: fix topbox colors; ...

Browse Source 
we're using header colors as in upnpbrowser too


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3bccfd5835
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)

Origin message was:
------------------
- audioplayer: fix topbox colors; ...

we're using header colors as in upnpbrowser too


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-31 20:38:46 +01:00
parent 5b4e8952fa
commit de8f28b111
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/audioplayer.cpp
View File

@@ -1755,7 +1755,7 @@ void CAudioPlayerGui::paintInfo()
if (xstart < 10) if (xstart < 10)
xstart = 10; xstart = 10;
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + xstart, m_y + 4 + 1*m_fheight, m_width - 20, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + xstart, m_y + 4 + 1*m_fheight, m_width - 20,
tmp, COL_MENUCONTENTSELECTED_TEXT); tmp, COL_MENUHEAD_TEXT); //NI
// second line (Artist/Title...) // second line (Artist/Title...)
GetMetaData(m_curr_audiofile); GetMetaData(m_curr_audiofile);
@@ -1780,7 +1780,7 @@ void CAudioPlayerGui::paintInfo()
xstart=(m_width-w)/2; xstart=(m_width-w)/2;
if (xstart < 10) if (xstart < 10)
xstart=10; xstart=10;
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x+xstart, m_y +4+ 2*m_fheight, m_width- 20, tmp, COL_MENUCONTENTSELECTED_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x+xstart, m_y +4+ 2*m_fheight, m_width- 20, tmp, COL_MENUHEAD_TEXT); //NI
// reset so fields get painted always // reset so fields get painted always
m_metainfo.clear(); m_metainfo.clear();
@@ -2119,7 +2119,7 @@ void CAudioPlayerGui::updateMetaData()
int xstart = ((m_width - 20 - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(m_metainfo))/2)+10; int xstart = ((m_width - 20 - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(m_metainfo))/2)+10;
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL] g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]
->RenderString(m_x + xstart, m_y + 4 + 2*m_fheight + m_sheight, ->RenderString(m_x + xstart, m_y + 4 + 2*m_fheight + m_sheight,
m_width- 2*xstart, m_metainfo, COL_MENUCONTENTSELECTED_TEXT); m_width- 2*xstart, m_metainfo, COL_MENUHEAD_TEXT); //NI
} }
} }
@@ -2164,7 +2164,7 @@ void CAudioPlayerGui::updateTimes(const bool force)
m_fheight, COL_MENUHEAD_PLUS_0); //NI m_fheight, COL_MENUHEAD_PLUS_0); //NI
if (m_time_total > 0) if (m_time_total > 0)
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + m_width - w1 - 10, m_y + 4 + m_fheight, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + m_width - w1 - 10, m_y + 4 + m_fheight,
w1, tot_time, COL_MENUCONTENTSELECTED_TEXT); w1, tot_time, COL_MENUHEAD_TEXT); //NI
} }
if (updatePlayed || (m_state == CAudioPlayerGui::PAUSE)) if (updatePlayed || (m_state == CAudioPlayerGui::PAUSE))
{ {
@@ -2176,7 +2176,7 @@ void CAudioPlayerGui::updateTimes(const bool force)
if ((m_state != CAudioPlayerGui::PAUSE) || (tv.tv_sec & 1)) if ((m_state != CAudioPlayerGui::PAUSE) || (tv.tv_sec & 1))
{ {
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + m_width - w1 - w2 - 11, m_y + 4 + m_fheight, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + m_width - w1 - w2 - 11, m_y + 4 + m_fheight,
w2+4, play_time, COL_MENUCONTENTSELECTED_TEXT); w2+4, play_time, COL_MENUHEAD_TEXT); //NI
} }
} }
} }