From bc41e8a2f504ceb892ba017d2acdd637523ef2d7 Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Thu, 21 Nov 2013 16:39:57 +0100
Subject: Added logo backgrounds in displaychannel also for blended themes

---
 HISTORY                                         |   1 +
 displaychannelview.c                            |   2 +-
 icons/darkblue/skinElements/channellogoback.png | Bin 0 -> 17074 bytes
 icons/darkgrey/skinElements/channellogoback.png | Bin 0 -> 27916 bytes
 icons/darkred/skinElements/channellogoback.png  | Bin 0 -> 16239 bytes
 icons/green/skinElements/channellogoback.png    | Bin 0 -> 14402 bytes
 imagecache.c                                    |   7 +++++++
 7 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 icons/darkblue/skinElements/channellogoback.png
 create mode 100644 icons/darkgrey/skinElements/channellogoback.png
 create mode 100644 icons/darkred/skinElements/channellogoback.png
 create mode 100644 icons/green/skinElements/channellogoback.png

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
Binary files /dev/null and b/icons/darkblue/skinElements/channellogoback.png differ
diff --git a/icons/darkgrey/skinElements/channellogoback.png b/icons/darkgrey/skinElements/channellogoback.png
new file mode 100644
index 0000000..b87e1d1
Binary files /dev/null and b/icons/darkgrey/skinElements/channellogoback.png differ
diff --git a/icons/darkred/skinElements/channellogoback.png b/icons/darkred/skinElements/channellogoback.png
new file mode 100644
index 0000000..9cf789d
Binary files /dev/null and b/icons/darkred/skinElements/channellogoback.png differ
diff --git a/icons/green/skinElements/channellogoback.png b/icons/green/skinElements/channellogoback.png
new file mode 100644
index 0000000..fd1e222
Binary files /dev/null and b/icons/green/skinElements/channellogoback.png 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) {
-- 
cgit v1.2.3