summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2014-03-16 13:43:56 +0100
committerMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2014-03-16 13:43:56 +0100
commitd0ee88c5adcdb90f0034861ae73946673ca60892 (patch)
tree13f4e5b8226c47abeb0055bdd3350a00c427e140
parent45c9a652744338e0985ad7444520201acb4adc2c (diff)
downloadskin-flatplus-d0ee88c5adcdb90f0034861ae73946673ca60892.tar.gz
skin-flatplus-d0ee88c5adcdb90f0034861ae73946673ca60892.tar.bz2
fix do not show background logo of channel group sep in channel menu
-rw-r--r--HISTORY1
-rw-r--r--displaymenu.c12
-rw-r--r--displayreplay.c1
3 files changed, 10 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index dd5c0e16..4fac24f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ VDR Plugin 'skinflatplus' Revision History
2014-XX-XX: Version 0.2.1
- [fix] epgsearch progessbar in SetItemEvent, if start time is after now (2 minutes tolerance)
- [fix] channel logo in topbar in program menu
+- [fix] reply info background color
- [update] imagecache, pre load images after skin is loaded
menu item under general to show the amount of cached images
debug syslog message if cache is overflow
diff --git a/displaymenu.c b/displaymenu.c
index c5951410..334798f8 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -52,6 +52,8 @@ cFlatDisplayMenu::cFlatDisplayMenu(void) {
ShowRecording = false;
ShowText = false;
+ ItemEventLastChannelName = "";
+
menuWidth = osdWidth;
menuTop = topBarHeight + marginItem + Config.decorBorderTopBarSize*2 + Config.decorBorderMenuItemSize;
menuPixmap = osd->CreatePixmap(1, cRect(0, menuTop, menuWidth, scrollBarHeight ));
@@ -686,10 +688,12 @@ bool cFlatDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bool C
int imageLeft = Left;
int imageTop = Top;
- cImage *imgBG = imgLoader.LoadIcon("logo_background", imageHeight, imageHeight);
- if( imgBG ) {
- imageTop = Top + (fontHeight - imgBG->Height()) / 2;
- menuIconsBGPixmap->DrawImage( cPoint(imageLeft, imageTop), *imgBG );
+ if( !Channel->GroupSep() ) {
+ cImage *imgBG = imgLoader.LoadIcon("logo_background", imageHeight, imageHeight);
+ if( imgBG ) {
+ imageTop = Top + (fontHeight - imgBG->Height()) / 2;
+ menuIconsBGPixmap->DrawImage( cPoint(imageLeft, imageTop), *imgBG );
+ }
}
cImage *img = imgLoader.LoadLogo(Channel->Name(), imageHeight, imageHeight);
if( img ) {
diff --git a/displayreplay.c b/displayreplay.c
index 5d574457..170a715a 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -28,6 +28,7 @@ cFlatDisplayReplay::cFlatDisplayReplay(bool ModeOnly) {
labelPixmap->Fill(Theme.Color(clrReplayBg));
labelJump->Fill(clrTransparent);
+ iconsPixmap->Fill(clrTransparent);
}