mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/gui/channellist.cpp
src/gui/components/cc_detailsline.cpp
src/gui/widget/menue.cpp
Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
This commit is contained in:
@@ -1627,12 +1627,12 @@ void CMovieBrowser::refreshDetailsLine(int pos)
|
||||
int hheight = m_pcBrowser->getHeaderListHeight();
|
||||
int theight = m_pcBrowser->getTitleHeight();
|
||||
|
||||
int xpos = m_cBoxFrameBrowserList.iX - ConnectLineBox_Width;
|
||||
int xpos = m_cBoxFrameBrowserList.iX - DETAILSLINE_WIDTH;
|
||||
int ypos1 = m_cBoxFrameBrowserList.iY + hheight + theight + OFFSET_INNER_MID + pos*fheight + (fheight/2);
|
||||
int ypos2 = m_cBoxFrameInfo1.iY + (m_cBoxFrameInfo1.iHeight/2);
|
||||
|
||||
if (m_detailsLine == NULL)
|
||||
m_detailsLine = new CComponentsDetailLine();
|
||||
m_detailsLine = new CComponentsDetailsLine();
|
||||
|
||||
m_detailsLine->setDimensionsAll(xpos, ypos1, ypos2, fheight/2, m_cBoxFrameInfo1.iHeight-2*RADIUS_LARGE);
|
||||
m_detailsLine->paint(true);
|
||||
|
Reference in New Issue
Block a user