comparison 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
comparison
equal deleted inserted replaced
132:264028f4115a 133:9fd705793568
6 <WidgetData|float={0:[0x4200,14],1:["options"]}> 6 <WidgetData|float={0:[0x4200,14],1:["options"]}>
7 <WidgetData|bar={0:[0x4100,14,1,2],1:["menuContent","blank"]}> 7 <WidgetData|bar={0:[0x4100,14,1,2],1:["menuContent","blank"]}>
8 <WidgetData|blank={0:[0x2]}> 8 <WidgetData|blank={0:[0x2]}>
9 9
10 <WidgetData|menuContent={0:[0x2031],1:["imde.menus","menus"]}> 10 <WidgetData|menuContent={0:[0x2031],1:["imde.menus","menus"]}>
11 <WidgetData|menus={0:[0xC110,8] ,1:["menuPopup"]}> 11 <WidgetData|menus={0:[0x4110,12] ,1:["menuPopup"]}>
12 <WidgetData|menuPopup={0:[0x6033,0],1:["menuList"]}> 12 <WidgetData|menuPopup={0:[0x6033,0],1:["menuList"]}>
13 !{Could recurse to menuPopup if it wasn't for recursion protection:} 13 <WidgetData|menuList={0:[0x6030,0] ,1:["menuPopup"]}>
14 <WidgetData|menuList={0:[0xE030,0] ,1:["menu1Popup"]}>
15 <WidgetData|menu1Popup={0:[0x6033] ,1:["menu1List"]}>
16 <WidgetData|menu1List={0:[0xE030,0],1:["blank"]}>
17 14
18 <EnumContent|switch={0:["misc","video","font"],1:0}> 15 <EnumContent|switch={0:["misc","video","font"],1:0}>
19 <WidgetData|options={0:[0x2031],1:["dynamic.switch","switchL"]}> 16 <WidgetData|options={0:[0x2031],1:["dynamic.switch","switchL"]}>
20 <WidgetData|switchL={0:[0x4100,4,2,1],1:["switchVal","switchT"]}> 17 <WidgetData|switchL={0:[0x4100,4,2,1],1:["switchVal","switchT"]}>
21 <WidgetData|switchVal={0:[0x4100,4,1,2],1:["optName","optVal"]}> 18 <WidgetData|switchVal={0:[0x4100,4,1,2],1:["optName","optVal"]}>
24 <WidgetData|optMisc={0:[0x2031],1:["Options.MiscOptions","optSec"]}> 21 <WidgetData|optMisc={0:[0x2031],1:["Options.MiscOptions","optSec"]}>
25 <WidgetData|optVideo={0:[0x2031],1:["Options.VideoOptions","optSec"]}> 22 <WidgetData|optVideo={0:[0x2031],1:["Options.VideoOptions","optSec"]}>
26 <WidgetData|optFont={0:[0x2031],1:["Options.FontOptions","optSec"]}> 23 <WidgetData|optFont={0:[0x2031],1:["Options.FontOptions","optSec"]}>
27 24
28 !{use optBox for no description, optDBox for descriptions under entries} 25 !{use optBox for no description, optDBox for descriptions under entries}
29 <WidgetData|optSec={0:[0xC110,0],1:["optBox"]}> 26 <WidgetData|optSec={0:[0x4110,0],1:["optBox"]}>
30 <WidgetData|optDBox={0:[0x4100,1,2,1],1:["optBox","optDesc"]}> 27 <WidgetData|optDBox={0:[0x4100,1,2,1],1:["optBox","optDesc"]}>
31 <WidgetData|optBox={0:[0x4100,1,1,3],1:["optName","optSep","optVal"]}> 28 <WidgetData|optBox={0:[0x4100,1,1,3],1:["optName","optSep","optVal"]}>
32 <WidgetData|optName={0:[0x4020, 1, 0xffffff]}> 29 <WidgetData|optName={0:[0x4020, 1, 0xffffff]}>
33 <WidgetData|optDesc={0:[0x4020, 2, 0x999999]}> 30 <WidgetData|optDesc={0:[0x4020, 2, 0x999999]}>
34 <WidgetData|optVal={0:[0xE030,12],1:["optEnum"]}> 31 <WidgetData|optVal={0:[0x6030,12],1:["optEnum"]}>
35 <WidgetData|optEnum={0:[0x4100,0,1,2],1:["optVal","optName"]}> 32 <WidgetData|optEnum={0:[0x4100,0,1,2],1:["optVal","optName"]}>
36 <WidgetData|optSep={0:[0x21, 0xff],1:[" = "]}> 33 <WidgetData|optSep={0:[0x21, 0xff],1:[" = "]}>
37 {Basic} 34 {Basic}
38 <WidgetData|root={0:[0x21,0x90D970],1:["A string!"]}> 35 <WidgetData|root={0:[0x21,0x90D970],1:["A string!"]}>