summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--displaychannelview.c2
-rw-r--r--icons/darkblue/skinElements/channellogoback.pngbin0 -> 17074 bytes
-rw-r--r--icons/darkgrey/skinElements/channellogoback.pngbin0 -> 27916 bytes
-rw-r--r--icons/darkred/skinElements/channellogoback.pngbin0 -> 16239 bytes
-rw-r--r--icons/green/skinElements/channellogoback.pngbin0 -> 14402 bytes
-rw-r--r--imagecache.c7
7 files changed, 9 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index d462a72..6400c64 100644
--- a/HISTORY
+++ b/HISTORY
@@ -371,3 +371,4 @@ Version 0.1.4
- Added EPG Info in narrow Timers Menu
- Freestyle Theme new default theme, old default renamed to "blue"
- Changed Disc Usage Icon for default theme
+- Added logo backgrounds in displaychannel also for blended themes
diff --git a/displaychannelview.c b/displaychannelview.c
index c543c4a..8147449 100644
--- a/displaychannelview.c
+++ b/displaychannelview.c
@@ -241,7 +241,7 @@ void cNopacityDisplayChannelView::DrawBackground(void) {
}
void cNopacityDisplayChannelView::DrawChannelLogo(const cChannel *Channel) {
- if (config.GetValue("displayType") == dtGraphical) {
+ if (config.GetValue("displayType") != dtFlat) {
cImage *imgLogoBack = imgCache->GetSkinElement(seChannelLogoBack);
if (imgLogoBack)
pixmapLogoBackground->DrawImage(cPoint(0,0), *imgLogoBack);
diff --git a/icons/darkblue/skinElements/channellogoback.png b/icons/darkblue/skinElements/channellogoback.png
new file mode 100644
index 0000000..87d1f1c
--- /dev/null
+++ b/icons/darkblue/skinElements/channellogoback.png
Binary files differ
diff --git a/icons/darkgrey/skinElements/channellogoback.png b/icons/darkgrey/skinElements/channellogoback.png
new file mode 100644
index 0000000..b87e1d1
--- /dev/null
+++ b/icons/darkgrey/skinElements/channellogoback.png
Binary files differ
diff --git a/icons/darkred/skinElements/channellogoback.png b/icons/darkred/skinElements/channellogoback.png
new file mode 100644
index 0000000..9cf789d
--- /dev/null
+++ b/icons/darkred/skinElements/channellogoback.png
Binary files differ
diff --git a/icons/green/skinElements/channellogoback.png b/icons/green/skinElements/channellogoback.png
new file mode 100644
index 0000000..fd1e222
--- /dev/null
+++ b/icons/green/skinElements/channellogoback.png
Binary files differ
diff --git a/imagecache.c b/imagecache.c
index 9fb1690..52a7992 100644
--- a/imagecache.c
+++ b/imagecache.c
@@ -471,6 +471,13 @@ void cImageCache::CreateSkinElementsBlended(void) {
bool mirrorHeader = (config.GetValue("menuAdjustLeft")) ? false : true;
CreateBackground(Theme.Color(clrMenuHeaderBlend), Theme.Color(clrMenuHeader), geoManager->osdWidth, geoManager->menuHeaderHeight, mirrorHeader);
InsertIntoSkinElementCache(seMenuHeader);
+
+ //ChannelLogo Background
+ std::string imgChannelLogoBack = "skinElements/channellogoback";
+ bool success = LoadIcon(ctSkinElement, imgChannelLogoBack);
+ if (success)
+ InsertIntoSkinElementCache(seChannelLogoBack, geoManager->channelLogoWidth, geoManager->channelLogoHeight);
+
}
void cImageCache::CreateSkinElementsGraphics(void) {