From dbad495f79e0b2181317e8f2eef3298893221787 Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Sat, 2 Nov 2013 18:01:44 +0100
Subject: changed way of calculating number of menu items in narrow menus

---
 imagecache.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'imagecache.c')

diff --git a/imagecache.c b/imagecache.c
index 9b598bd..111cf20 100644
--- a/imagecache.c
+++ b/imagecache.c
@@ -86,8 +86,8 @@ cImage *cImageCache::GetMenuIcon(std::string name) {
     if (hit != menuIconCache.end()) {
         return (cImage*)hit->second;
     } else {
-        int iconWidth = config.GetValue("iconHeight");
-        int iconHeight = config.GetValue("iconHeight");
+        int iconWidth = geoManager->menuMainMenuIconSize;
+        int iconHeight = geoManager->menuMainMenuIconSize;
         bool success = LoadIcon(ctMenuIcon, name);
         if (success) {
             InsertIntoIconCache(ctMenuIcon, name, iconWidth, iconHeight);
@@ -239,7 +239,7 @@ std::vector<std::pair<std::string, cPoint> > cImageCache::GetMenuIcons(void) {
     mainMenuIcons.push_back("menuIcons/Miscellaneous");
     mainMenuIcons.push_back("menuIcons/Plugins");
     mainMenuIcons.push_back("menuIcons/Restart");
-    int mainMenuIconSize = config.GetValue("iconHeight") - 10;
+    int mainMenuIconSize = geoManager->menuMainMenuIconSize;
     for (int i=0; i<mainMenuIcons.size(); i++) {
         menuIcons.push_back(std::pair<std::string, cPoint>(mainMenuIcons[i], cPoint(mainMenuIconSize, mainMenuIconSize)));
     }
@@ -394,8 +394,8 @@ cPoint cImageCache::LogoSize(eCacheType type) {
             height = geoManager->channelLogoHeight;
             break;
         case ctLogoMenuItem:
-            width = config.GetValue("menuItemLogoWidth");
-            height = config.GetValue("menuItemLogoHeight");
+            width = geoManager->menuLogoWidth;
+            height = geoManager->menuLogoHeight;
             break;
         case ctLogoTimer:
             width = config.GetValue("timersLogoWidth");
-- 
cgit v1.2.3