diff options
| -rw-r--r-- | displaychannelview.c | 5 | ||||
| -rw-r--r-- | displaymenuview.c | 4 | ||||
| -rw-r--r-- | textwindow.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/displaychannelview.c b/displaychannelview.c index aa3f13a..a3f5ed1 100644 --- a/displaychannelview.c +++ b/displaychannelview.c @@ -575,8 +575,9 @@ void cNopacityDisplayChannelView::DrawPoster(const cEvent *event, bool initial) config.GetValue("channelBorderBottom"), mediaWidth + 2 * border, mediaHeight + 2 * border)); - if (initial && config.GetValue("channelFadeTime")) + if (initial && config.GetValue("animation") && config.GetValue("channelFadeTime")) { pixmapPoster->SetAlpha(0); + } cImageLoader imgLoader; if (imgLoader.LoadPoster(mediaPath.c_str(), mediaWidth, mediaHeight)) { pixmapPoster->Fill(Theme.Color(clrChannelBackground)); @@ -629,7 +630,7 @@ void cNopacityDisplayChannelView::DrawSignalMeter(void) { pixmapSignalQuality->Fill(Theme.Color(clrProgressBarBack)); pixmapSignalMeter->Fill(clrTransparent); pixmapSignalLabel->Fill(clrTransparent); - if (config.GetValue("channelFadeTime")) { + if (config.GetValue("animation") && config.GetValue("channelFadeTime")) { pixmapSignalStrength->SetAlpha(0); pixmapSignalQuality->SetAlpha(0); pixmapSignalMeter->SetAlpha(0); diff --git a/displaymenuview.c b/displaymenuview.c index 45804a7..0a7e4ee 100644 --- a/displaymenuview.c +++ b/displaymenuview.c @@ -438,7 +438,7 @@ int cNopacityDisplayMenuView::DrawHeaderIcon(eMenuCategory menuCat, bool initial int iconX = (menuAdjustLeft) ? 0 : (geoManager->osdWidth - geoManager->menuHeaderHeight); pixmapHeaderIcon = osd->CreatePixmap(2, cRect(iconX, 2, iconSize, iconSize)); pixmapHeaderIcon->Fill(clrTransparent); - if (initial && config.GetValue("menuFadeTime")) { + if (initial && config.GetValue("animation") && config.GetValue("menuFadeTime")) { pixmapHeaderIcon->SetAlpha(0); } cImage *imgIcon = imgCache->GetSkinIcon(*icon); @@ -461,7 +461,7 @@ int cNopacityDisplayMenuView::ShowHeaderIconChannelLogo(const char *Title, bool int iconX = (menuAdjustLeft) ? 0 : (geoManager->osdWidth - logoWidth); pixmapHeaderIcon = osd->CreatePixmap(2, cRect(iconX, 2, logoWidth, logoHeight)); pixmapHeaderIcon->Fill(clrTransparent); - if (initial && config.GetValue("menuFadeTime")) { + if (initial && config.GetValue("animation") && config.GetValue("menuFadeTime")) { pixmapHeaderIcon->SetAlpha(0); } std::string channel = Title; diff --git a/textwindow.c b/textwindow.c index 4ca3b9d..9cc3e34 100644 --- a/textwindow.c +++ b/textwindow.c @@ -172,7 +172,7 @@ void cNopacityTextWindow::CreatePixmap(void) { pixmapBackground->Fill(Theme.Color(clrMenuBorder)); pixmapBackground->DrawRectangle(cRect(1, 1, geometry->Width(), geometry->Height()), clrBlack); pixmap->Fill(Theme.Color(clrMenuBack)); - if (config.GetValue("menuEPGWindowFadeTime")) + if (config.GetValue("animation") && config.GetValue("menuEPGWindowFadeTime")) SetAlpha(); cPixmap::Unlock(); } |