mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 01:11:12 +02:00
*neutrino moviebrowser: remove redundant calls of info_hdd_level()-function
It's only useful to call this function, if we paint title bar. This should also prevent overlaps during painting or hide windows. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1708 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -1135,14 +1135,14 @@ int CMovieBrowser::paint(void)
|
|||||||
//onSetGUIWindow(m_settings.gui);
|
//onSetGUIWindow(m_settings.gui);
|
||||||
//refreshTitle();
|
//refreshTitle();
|
||||||
//refreshFoot();
|
//refreshFoot();
|
||||||
refreshLCD();
|
//refreshLCD();
|
||||||
//refresh();
|
refresh();
|
||||||
return (true);
|
return (true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMovieBrowser::refresh(void)
|
void CMovieBrowser::refresh(void)
|
||||||
{
|
{
|
||||||
//TRACE("[mb]->refresh\r\n");
|
TRACE("[mb]->refresh\r\n");
|
||||||
|
|
||||||
refreshTitle();
|
refreshTitle();
|
||||||
if (m_pcBrowser != NULL && m_showBrowserFiles == true )
|
if (m_pcBrowser != NULL && m_showBrowserFiles == true )
|
||||||
@@ -1159,7 +1159,6 @@ void CMovieBrowser::refresh(void)
|
|||||||
|
|
||||||
refreshFoot();
|
refreshFoot();
|
||||||
refreshLCD();
|
refreshLCD();
|
||||||
info_hdd_level();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CMovieBrowser::getCurrentDir(void)
|
std::string CMovieBrowser::getCurrentDir(void)
|
||||||
@@ -1533,12 +1532,13 @@ void CMovieBrowser::refreshBookmarkList(void) // P3
|
|||||||
void CMovieBrowser::refreshTitle(void)
|
void CMovieBrowser::refreshTitle(void)
|
||||||
{
|
{
|
||||||
//Paint Text Background
|
//Paint Text Background
|
||||||
//TRACE("[mb]->refreshTitle : %s\r\n",m_textTitle.c_str());
|
TRACE("[mb]->refreshTitle : %s\r\n",m_textTitle.c_str());
|
||||||
const short text_border_width = 8;
|
const short text_border_width = 8;
|
||||||
m_pcWindow->paintBoxRel(m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX, m_cBoxFrame.iY+ m_cBoxFrameTitleRel.iY,
|
m_pcWindow->paintBoxRel(m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX, m_cBoxFrame.iY+ m_cBoxFrameTitleRel.iY,
|
||||||
m_cBoxFrameTitleRel.iWidth, m_cBoxFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR, RADIUS_LARGE, CORNER_TOP);
|
m_cBoxFrameTitleRel.iWidth, m_cBoxFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR, RADIUS_LARGE, CORNER_TOP);
|
||||||
|
|
||||||
m_pcFontTitle->RenderString(m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX + text_border_width, m_cBoxFrame.iY+m_cBoxFrameTitleRel.iY + m_cBoxFrameTitleRel.iHeight, m_cBoxFrameTitleRel.iWidth - (text_border_width << 1), m_textTitle.c_str(), TITLE_FONT_COLOR, 0, true); // UTF-8
|
m_pcFontTitle->RenderString(m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX + text_border_width, m_cBoxFrame.iY+m_cBoxFrameTitleRel.iY + m_cBoxFrameTitleRel.iHeight, m_cBoxFrameTitleRel.iWidth - (text_border_width << 1), m_textTitle.c_str(), TITLE_FONT_COLOR, 0, true); // UTF-8
|
||||||
|
info_hdd_level();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMovieBrowser::refreshFoot(void)
|
void CMovieBrowser::refreshFoot(void)
|
||||||
@@ -2571,10 +2571,8 @@ void CMovieBrowser::updateMovieSelection(void)
|
|||||||
if(m_currentBrowserSelection != old_movie_selection)
|
if(m_currentBrowserSelection != old_movie_selection)
|
||||||
new_selection = true;
|
new_selection = true;
|
||||||
|
|
||||||
if(m_currentBrowserSelection < m_vHandleBrowserList.size()){
|
if(m_currentBrowserSelection < m_vHandleBrowserList.size())
|
||||||
m_movieSelectionHandler = m_vHandleBrowserList[m_currentBrowserSelection];
|
m_movieSelectionHandler = m_vHandleBrowserList[m_currentBrowserSelection];
|
||||||
info_hdd_level();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(m_windowFocus == MB_FOCUS_LAST_PLAY)
|
else if(m_windowFocus == MB_FOCUS_LAST_PLAY)
|
||||||
@@ -2594,10 +2592,8 @@ void CMovieBrowser::updateMovieSelection(void)
|
|||||||
if(m_currentPlaySelection != old_movie_selection)
|
if(m_currentPlaySelection != old_movie_selection)
|
||||||
new_selection = true;
|
new_selection = true;
|
||||||
|
|
||||||
if(m_currentPlaySelection < m_vHandlePlayList.size()){
|
if(m_currentPlaySelection < m_vHandlePlayList.size())
|
||||||
m_movieSelectionHandler = m_vHandlePlayList[m_currentPlaySelection];
|
m_movieSelectionHandler = m_vHandlePlayList[m_currentPlaySelection];
|
||||||
info_hdd_level();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(m_windowFocus == MB_FOCUS_LAST_RECORD)
|
else if(m_windowFocus == MB_FOCUS_LAST_RECORD)
|
||||||
@@ -2617,10 +2613,8 @@ void CMovieBrowser::updateMovieSelection(void)
|
|||||||
if(m_currentRecordSelection != old_movie_selection)
|
if(m_currentRecordSelection != old_movie_selection)
|
||||||
new_selection = true;
|
new_selection = true;
|
||||||
|
|
||||||
if(m_currentRecordSelection < m_vHandleRecordList.size()){
|
if(m_currentRecordSelection < m_vHandleRecordList.size())
|
||||||
m_movieSelectionHandler = m_vHandleRecordList[m_currentRecordSelection];
|
m_movieSelectionHandler = m_vHandleRecordList[m_currentRecordSelection];
|
||||||
info_hdd_level();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user