From cf52d02803d186bae853f35b5cf48facebc55e03 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 22 Feb 2008 01:56:22 +0000 Subject: [PATCH] fixed amb1468 - renderer marked disabled items as valid selections --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401879 --- core/MenuManager.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/core/MenuManager.cpp b/core/MenuManager.cpp index c68fe454..c7b64c1d 100644 --- a/core/MenuManager.cpp +++ b/core/MenuManager.cpp @@ -448,7 +448,14 @@ skip_search: if (position != 0) { slots[position].item = drawItems[i].position; - slots[position].type = ItemSel_Item; + if ((dr.style & ITEMDRAW_DISABLED) == ITEMDRAW_DISABLED) + { + slots[position].type = ItemSel_None; + } + else + { + slots[position].type = ItemSel_Item; + } } } } @@ -469,7 +476,14 @@ skip_search: if (position != 0) { slots[position].item = drawItems[i].position; - slots[position].type = ItemSel_Item; + if ((dr.style & ITEMDRAW_DISABLED) == ITEMDRAW_DISABLED) + { + slots[position].type = ItemSel_None; + } + else + { + slots[position].type = ItemSel_Item; + } } } }