From 426105bf4d93dee63d8cb2b0ffd69e53cefd56a5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 18 Apr 2013 18:09:32 +0200 Subject: [PATCH] channellist: remove some unneeded calculations Conflicts: src/gui/channellist.cpp Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e2bbf2aa441c6fcc7edd35cbb1d4a87f7ff308bd Author: vanhofen Date: 2013-04-18 (Thu, 18 Apr 2013) Origin message was: ------------------ - channellist: remove some unneeded calculations Conflicts: src/gui/channellist.cpp --- src/gui/channellist.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 024eba80d..65f6654eb 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -512,20 +512,6 @@ void CChannelList::calcSize() const int pic_h = 39; theight = std::max(theight, pic_h); - int icol_w, icol_h; - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h); - theight = std::max(theight, icol_h); - - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &icol_w, &icol_h); - theight = std::max(theight, icol_h); - -#if 0 - if(new_zap_mode) - { - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, &icol_w, &icol_h); - theight = std::max(theight, icol_h); - } -#endif // calculate max entrys in mainbox listmaxshow = (height - theight - footerHeight) / fheight;