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

Merge branch 'master' into pu/msgbox

Browse Source
This commit is contained in:
Thilo Graf
2016-10-28 21:19:09 +02:00
parent 9b9d2542e6 682b6f578e
commit fa9e34fcca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/osd_setup.cpp
View File

@@ -1389,7 +1389,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
CMenuWidget * menu_chanlist = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width); CMenuWidget * menu_chanlist = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
//using native callback to ensure stop header clock in parent channellist before paint this menu window //using native callback to ensure stop header clock in parent channellist before paint this menu window
if (parent_channellist && g_settings.menu_pos == CMenuWidget::MENU_POS_TOP_RIGHT) if (parent_channellist)
menu_chanlist->OnBeforePaint.connect(sigc::mem_fun(parent_channellist->getHeaderObject()->getClockObject(), &CComponentsFrmClock::block)); menu_chanlist->OnBeforePaint.connect(sigc::mem_fun(parent_channellist->getHeaderObject()->getClockObject(), &CComponentsFrmClock::block));
menu_chanlist->enableSaveScreen(true); menu_chanlist->enableSaveScreen(true);

2
src/gui/widget/textbox.cpp
View File

@@ -587,7 +587,7 @@ void CTextBox::refreshText(void)
//bg variables //bg variables
int ax = m_cFrameTextRel.iX+m_cFrame.iX; int ax = m_cFrameTextRel.iX+m_cFrame.iX;
int ay = m_cFrameTextRel.iY+m_cFrame.iY; int ay = m_cFrameTextRel.iY+m_cFrame.iY;
int dx = m_old_cText != m_cText || m_nNrOfPages>1 ? m_cFrameTextRel.iWidth : m_nMaxTextWidth; int dx = m_old_cText != m_cText || m_nNrOfPages>1 ? m_cFrameTextRel.iWidth : m_nMaxTextWidth - m_nBgRadius;
int dy = m_cFrameTextRel.iHeight; int dy = m_cFrameTextRel.iHeight;
//avoid artefacts in transparent cornes //avoid artefacts in transparent cornes