Changeset 754 for branches/iteration3/xinf/ony
- Timestamp:
- 11/12/07 08:44:36 (2 years ago)
- Files:
-
- branches/iteration3/xinf/ony/Crop.hx (added)
- branches/iteration3/xinf/ony/Document.hx (modified) (3 diffs)
- branches/iteration3/xinf/ony/Element.hx (modified) (2 diffs)
- branches/iteration3/xinf/ony/Model.hx (deleted)
- branches/iteration3/xinf/ony/Root.hx (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/iteration3/xinf/ony/Document.hx
r729 r754 3 3 4 4 import xinf.style.StyleSheet; 5 import xinf.style.ElementStyle; 5 6 6 7 interface Document implements Group { … … 11 12 var height(default,set_height):Float; 12 13 13 var styleSheet(default,null):StyleSheet ;14 var styleSheet(default,null):StyleSheet<ElementStyle>; 14 15 function getElementById( id:String ) :Element; 15 16 function getTypedElementById<T>( id:String, cl:Class<T> ) :T; … … 17 18 function unmarshal( xml:Xml, ?parent:Group ) :Element; 18 19 19 static function load( url:String ) :Document; 20 static function load( url:String, ?onLoad:Document->Void ) :Document; 21 static function instantiate( data:String, ?onLoad:Document->Void ) :Document; 20 22 } branches/iteration3/xinf/ony/Element.hx
r729 r754 9 9 import xinf.style.ElementStyle; 10 10 import xinf.style.Stylable; 11 import xinf.style.Selector; 11 12 import xinf.xml.Serializable; 12 13 … … 33 34 34 35 /** the element's style **/ 35 var style(default, null):ElementStyle;36 var style(default,default):ElementStyle; 36 37 37 38 function styleChanged() :Void; 38 39 function getParentStyle() :xinf.style.Style; 40 function matchSelector( s:Selector ) :Bool; 39 41 40 42 /** read element data from xml */ 41 43 function fromXml( xml:Xml ) :Void; 44 45 /** called when the document is completely loaded **/ 46 function onLoad() :Void; 42 47 43 48 /** convert the given point from global to local coordinates **/ branches/iteration3/xinf/ony/Root.hx
r743 r754 7 7 class Root { 8 8 private static var mRoot:Document; 9 10 public static var children(get_children,null) :Iterator<Element>; 11 static function get_children() :Iterator<Element> { 12 return cast mRoot.children; 13 } 9 14 10 15 private static function getRoot() :Document {
