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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80faa90fa1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-04-29 16:06:51 +02:00
parent 70d2aa725d 4c2d450c36
commit 3a2ceba862
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/channellist.cpp
View File

@@ -127,7 +127,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT; eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
dline = NULL; dline = NULL;
cc_minitv = NULL; cc_minitv = NULL;
logo_off = 0;
minitv_is_active = false; minitv_is_active = false;
headerNew = true; headerNew = true;
bouquet = NULL; bouquet = NULL;
@@ -2155,7 +2154,6 @@ void CChannelList::paintHead()
if (!header->getContextBtnObject()->empty()) if (!header->getContextBtnObject()->empty())
header->removeContextButtons(); header->removeContextButtons();
header->enableClock(true, "%H:%M", "%H %M", true); header->enableClock(true, "%H:%M", "%H %M", true);
logo_off = header->getClockObject()->getWidth() + OFFSET_INNER_MID;
header->getClockObject()->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT); header->getClockObject()->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
}else{ }else{
@@ -2165,8 +2163,6 @@ void CChannelList::paintHead()
} }
} }
} }
else
logo_off = OFFSET_INNER_MID;
if(g_settings.channellist_show_channellogo){ if(g_settings.channellist_show_channellogo){
//ensure to have clean background //ensure to have clean background

1
src/gui/channellist.h
View File

@@ -112,7 +112,6 @@ private:
int info_height; // the infobox below mainbox is handled outside height int info_height; // the infobox below mainbox is handled outside height
int x; int x;
int y; int y;
int logo_off;
int pig_width; int pig_width;
int pig_height; int pig_height;
int infozone_width; int infozone_width;