Fix issues with the gui schema...

...caused by me misunderstanding how that WML works
This commit is contained in:
Alexander van Gessel 2010-02-22 03:00:26 +01:00
parent ede44dba0d
commit cc48582c19

View file

@ -5,6 +5,7 @@
# for non-negative geometry
unsigned="re ^[0-9]+$"
align="enum top,bottom,left,right,center"
halign="enum left,right,center"
valign="enum top,bottom,center"
@ -14,8 +15,13 @@
# This is possibly specific to [window] [resolution] [grid] [row] [column]
[column]
border="optional align"
border_size="optional unsigned"
grow_factor="optional unsigned"
horizontal_alignment="optional halign"
horizontal_grow="optional boolean"
vertical_alignment="optional valign"
vertical_grow="optional boolean"
#TODO: possible other stuff
# A column should contain exactly one widget
@ -83,10 +89,10 @@
[label:widget]
wrap="optional boolean"
[/label:widget]
[panel:widget]
_resolution="repeated panel-resolution"
[/panel:widget]
[panel-resolution:resolution]
[panel_definition:widget]
_resolution="repeated panel_definition-resolution"
[/panel_definition:widget]
[panel_definition-resolution:resolution]
bottom_border="optional unsigned"
left_border="optional unsigned"
right_border="optional unsigned"
@ -94,7 +100,7 @@
_background="optional state_definition"
_foreground="optional state_definition"
[/panel-resolution:resolution]
[/panel_definition-resolution:resolution]
# This is possibly specific to [window] [resolution] [grid] [row]
[row]
grow_factor="optional unsigned"
@ -115,10 +121,10 @@
[state_definition]
_draw="required draw"
[/state_definition]
[window:widget]
_resolution="repeated window-resolution"
[/window:widget]
[window-resolution:panel-resolution]
[window_definition:widget]
_resolution="repeated window_definition-resolution"
[/window_definition:widget]
[window_definition-resolution:panel_definition-resolution]
_grid="optional grid" #TODO: check if it's actually required
_linked_group="repeated linked_group"
@ -135,7 +141,7 @@
window_width="optional unsigned"
x="optional string" # A formula that returns unsigned
y="optional string" # A formula that returns unsigned
[/window-resolution:panel-resolution]
[/window_definition-resolution:panel_definition-resolution]
# Base things that are only derived from
[resolution]