diff data/conf/guiDemo.mtt @ 133:9fd705793568

Fixed menu popup bug, improved recursion detection. Menu popups can now determine whether or not they are sub-menus. Recursion detection can now also check content (if not the same, there's not a risk of infinite recursion).
author Diggory Hardy <diggory.hardy@gmail.com>
date Fri, 23 Jan 2009 16:05:05 +0000
parents 264028f4115a
children 9f035cd139c6
line wrap: on
line diff
--- a/data/conf/guiDemo.mtt	Fri Jan 23 14:59:05 2009 +0000
+++ b/data/conf/guiDemo.mtt	Fri Jan 23 16:05:05 2009 +0000
@@ -8,12 +8,9 @@
 <WidgetData|blank={0:[0x2]}>
 
 <WidgetData|menuContent={0:[0x2031],1:["imde.menus","menus"]}>
-<WidgetData|menus={0:[0xC110,8]    ,1:["menuPopup"]}>
+<WidgetData|menus={0:[0x4110,12]   ,1:["menuPopup"]}>
 <WidgetData|menuPopup={0:[0x6033,0],1:["menuList"]}>
-!{Could recurse to menuPopup if it wasn't for recursion protection:}
-<WidgetData|menuList={0:[0xE030,0] ,1:["menu1Popup"]}>
-<WidgetData|menu1Popup={0:[0x6033] ,1:["menu1List"]}>
-<WidgetData|menu1List={0:[0xE030,0],1:["blank"]}>
+<WidgetData|menuList={0:[0x6030,0] ,1:["menuPopup"]}>
 
 <EnumContent|switch={0:["misc","video","font"],1:0}>
 <WidgetData|options={0:[0x2031],1:["dynamic.switch","switchL"]}>
@@ -26,12 +23,12 @@
 <WidgetData|optFont={0:[0x2031],1:["Options.FontOptions","optSec"]}>
 
 !{use optBox for no description, optDBox for descriptions under entries}
-<WidgetData|optSec={0:[0xC110,0],1:["optBox"]}>
+<WidgetData|optSec={0:[0x4110,0],1:["optBox"]}>
 <WidgetData|optDBox={0:[0x4100,1,2,1],1:["optBox","optDesc"]}>
 <WidgetData|optBox={0:[0x4100,1,1,3],1:["optName","optSep","optVal"]}>
 <WidgetData|optName={0:[0x4020, 1, 0xffffff]}>
 <WidgetData|optDesc={0:[0x4020, 2, 0x999999]}>
-<WidgetData|optVal={0:[0xE030,12],1:["optEnum"]}>
+<WidgetData|optVal={0:[0x6030,12],1:["optEnum"]}>
 <WidgetData|optEnum={0:[0x4100,0,1,2],1:["optVal","optName"]}>
 <WidgetData|optSep={0:[0x21, 0xff],1:[" = "]}>
 {Basic}