From 3d805054f4897ccd24aafc3fc611b5361acb6140 Mon Sep 17 00:00:00 2001 From: "M. Liebmann" Date: Sat, 28 Jun 2014 15:27:26 +0200 Subject: [PATCH] CComponentsChannelLogo: disable paint of logo background, it's not required here - Fix calculation of logo width & height --- src/gui/components/cc_item_picture.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index c34905f94..eaad21253 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -139,8 +139,11 @@ void CComponentsPicture::initCCItem() //resize/scale image if required, if no icon mode detected, use real image size if (!is_icon){ - if (width != w_pic || height != h_pic) + if (width != w_pic || height != h_pic) { g_PicViewer->rescaleImageDimensions(&w_pic, &h_pic, width, height); + width = w_pic; + height = h_pic; + } } } @@ -248,11 +251,13 @@ void CComponentsChannelLogo::setChannel(const uint64_t& channelId, const std::st { channel_id = channelId; channel_name = channelName; + int dummy; - has_logo = g_PicViewer->GetLogoName(channel_id, channel_name, pic_name, &width, &height); + has_logo = g_PicViewer->GetLogoName(channel_id, channel_name, pic_name, &dummy, &dummy); if (!has_logo) pic_name = alt_pic_name; initCCItem(); + doPaintBg(false); }