diff options
| author | louis <louis.braun@gmx.de> | 2013-09-18 11:44:04 +0200 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2013-09-18 11:44:04 +0200 |
| commit | fdbdcb6efcbb3b9dc5c0a549646764f9cf8a9565 (patch) | |
| tree | 5f4f082702b3eaa9936d8205d260eef5d3e074b9 /displaychannel.c | |
| parent | 09d3149e01805ccf67f88eabed06d21fef19560c (diff) | |
| download | skin-nopacity-fdbdcb6efcbb3b9dc5c0a549646764f9cf8a9565.tar.gz skin-nopacity-fdbdcb6efcbb3b9dc5c0a549646764f9cf8a9565.tar.bz2 | |
made blending effect in displayChannel and displayReplay optional
Diffstat (limited to 'displaychannel.c')
| -rw-r--r-- | displaychannel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/displaychannel.c b/displaychannel.c index 4c70546..f908300 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -192,7 +192,7 @@ void cNopacityDisplayChannel::CreateFonts(void) { } void cNopacityDisplayChannel::DrawBackground(void){ - if (config.doBlending) { + if (config.doBlending && (Theme.Color(clrChannelBackground) != Theme.Color(clrChannelBackBlend))) { DrawBlendedBackground(pixmapBackgroundTop, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), true); DrawBlendedBackground(pixmapBackgroundBottom, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), false); } else { @@ -204,7 +204,7 @@ void cNopacityDisplayChannel::DrawBackground(void){ if ((config.backgroundStyle == bsFull) && withInfo) { pixmapLogoBackground->Fill(Theme.Color(clrChannelBackground)); - if (config.doBlending) { + if (config.doBlending && (Theme.Color(clrChannelBackground) != Theme.Color(clrChannelBackBlend))) { DrawBlendedBackground(pixmapLogoBackgroundTop, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), true); DrawBlendedBackground(pixmapLogoBackgroundBottom, Theme.Color(clrChannelBackground), Theme.Color(clrChannelBackBlend), false); } else { @@ -777,7 +777,7 @@ void cNopacityDisplayChannel::DrawProgressBar(int Current, int Total) { if ((Current < currentLast + 3) && !channelChange) return; currentLast = Current; - if ((Current > 0) || (Total > 0)) { + if (((Current > 0) || (Total > 0)) && (Total >= Current)) { int barHeight = pixmapProgressBar->ViewPort().Height()-8; if (barHeight%2 != 0) barHeight++; |