From 3d4c1d84b7cd2ca23e3fda446a30b55a1d4878d9 Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Sat, 9 Mar 2013 16:42:48 +0100
Subject: Restructured setup menu

---
 displaymenu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'displaymenu.c')

diff --git a/displaymenu.c b/displaymenu.c
index 4b8f274..d4ef064 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -44,7 +44,7 @@ cNopacityDisplayMenu::~cNopacityDisplayMenu() {
         delete detailView;
     }
     timers.Clear();
-    for (int i=0; i<12; i++)
+    for (int i=0; i<14; i++)
         cOsdProvider::DropImage(handleBackgrounds[i]);
     for (int i=0; i<4; i++)
         cOsdProvider::DropImage(handleButtons[i]);
@@ -530,8 +530,9 @@ void cNopacityDisplayMenu::SetItem(const char *Text, int Index, bool Current, bo
             cNopacityMenuItem *item;
             cPoint itemSize;
             if (((MenuCategory() == mcMain)&&(config.narrowMainMenu)) || ((MenuCategory() == mcSetup)&&(config.narrowSetupMenu))){
-                item = new cNopacityMainMenuItem(osd, Text, Selectable);
-                menuView->GetMenuItemSize(mcMain, &itemSize);
+                bool isSetup = (MenuCategory() == mcSetup)?true:false;
+                item = new cNopacityMainMenuItem(osd, Text, Selectable, isSetup);
+                menuView->GetMenuItemSize(MenuCategory(), &itemSize);
                 item->SetFont(menuView->GetMenuItemFont(mcMain));
                 if (config.useMenuIcons)
                     hasIcons = true;
-- 
cgit v1.2.3