summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--displaychannel.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index aa6b775..0e2d218 100644
--- a/HISTORY
+++ b/HISTORY
@@ -145,3 +145,5 @@ Version 0.0.7:
- Usage of menu icons in main and setup menu configurable
- "nOpacity mirrored": narrow menus can be adjusted on the right side via
plugin setup
+- trying to load channel separator icon. It has to be named as the channel
+ separator in low letters. If no icon is found, a generic icon is used.
diff --git a/displaychannel.c b/displaychannel.c
index 4bd063d..eb050ca 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -372,7 +372,9 @@ void cNopacityDisplayChannel::SetChannel(const cChannel *Channel, int Number) {
pixmapChannelInfo->DrawText(cPoint(channelInfoHeight/2, (channelInfoHeight-fontHeader->Height())/2), channelString, Theme.Color(clrChannelHead), clrTransparent, fontHeader);
}
cImageLoader imgLoader;
- if (imgLoader.LoadIcon("Channelseparator", config.logoHeight)) {
+ if (imgLoader.LoadLogo(*ChannelName)) {
+ pixmapLogo->DrawImage(cPoint(config.logoBorder, (height-config.logoHeight)/2), imgLoader.GetImage());
+ } else if (imgLoader.LoadIcon("Channelseparator", config.logoHeight)) {
pixmapLogo->DrawImage(cPoint(config.logoBorder + (config.logoWidth - config.logoHeight)/2, (height-config.logoHeight)/2), imgLoader.GetImage());
}
}