This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 33c259c96ba69fa04e5742275268353108b23734 Author: Josh Tynjala <[email protected]> AuthorDate: Thu Apr 17 09:44:11 2025 -0700 ASDoc: various Lists and DataContainers should have variable row heights so that text for descriptions and parameters and things don't overlap --- .../ASDoc/src/main/royale/ASDocMainView.mxml | 50 ++++++++++++++++++---- .../ASDoc/src/main/royale/EventDetailRenderer.mxml | 10 +++-- .../src/main/royale/MethodDetailRenderer.mxml | 10 +++-- .../src/main/royale/PropertyDetailRenderer.mxml | 10 +++-- 4 files changed, 62 insertions(+), 18 deletions(-) diff --git a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml index 9798c592a7..512db4c9e8 100644 --- a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml +++ b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml @@ -20,7 +20,7 @@ limitations under the License. <rs:DocPage xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:js="library://ns.apache.org/royale/basic" xmlns:rs="library://ns.apache.org/royale/site" - xmlns:local="*" + xmlns:local="*" xmlns:models="org.apache.royale.html.beads.models.*" width="100%" height="100%" initComplete="applicationModel.addEventListener('packageListChanged', packagesReadyHandler)" > @@ -494,29 +494,61 @@ limitations under the License. </js:List> </js:Group> <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocModel(applicationModel).attributes}" - itemRenderer="AttributeRenderer" width="100%"/> + itemRenderer="AttributeRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> <js:MultilineLabel id="description" className="description" html="{ASDocModel(applicationModel).description}" width="100%"/> <js:Label text="Public Properties" className="sectionLabel"/> <js:List className="summaryList" id="publicPropertyList" dataProvider="{ASDocModel(applicationModel).publicProperties}" - itemRenderer="SummaryRenderer" width="100%"/> + itemRenderer="SummaryRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:List> <js:Label text="Public Methods" className="sectionLabel"/> <js:List className="summaryList" id="publicMethodList" dataProvider="{ASDocModel(applicationModel).publicMethods}" - itemRenderer="MethodSummaryRenderer" width="100%"/> + itemRenderer="MethodSummaryRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:List> <js:Label text="Events" className="sectionLabel"/> <js:List className="summaryList" id="publicEventList" dataProvider="{ASDocModel(applicationModel).publicEvents}" - itemRenderer="EventSummaryRenderer" width="100%"/> + itemRenderer="EventSummaryRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:List> <js:Label text="Property Details" className="sectionLabel"/> <js:DataContainer className="detailList" id="propertyDetails" dataProvider="{ASDocModel(applicationModel).publicProperties}" - itemRenderer="PropertyDetailRenderer" width="100%"/> + itemRenderer="PropertyDetailRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> <js:Label text="Constructor Details" className="sectionLabel"/> <js:DataContainer className="detailList" id="constructorDetails" dataProvider="{ASDocModel(applicationModel).constructorList}" - itemRenderer="MethodDetailRenderer" width="100%"/> + itemRenderer="MethodDetailRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> <js:Label text="Method Details" className="sectionLabel"/> <js:DataContainer className="detailList" id="MethodDetails" dataProvider="{ASDocModel(applicationModel).publicMethods}" - itemRenderer="MethodDetailRenderer" width="100%"/> + itemRenderer="MethodDetailRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> <js:Label text="Event Details" className="sectionLabel"/> <js:DataContainer className="detailList" id="EventDetails" dataProvider="{ASDocModel(applicationModel).publicEvents}" - itemRenderer="EventDetailRenderer" width="100%"/> + itemRenderer="EventDetailRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> </js:Group> </js:Container> </js:Group> diff --git a/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml b/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml index 4f07056c5f..887d9fcf03 100644 --- a/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/EventDetailRenderer.mxml @@ -19,7 +19,7 @@ limitations under the License. --> <js:MXMLItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:js="library://ns.apache.org/royale/basic" - xmlns:html="library://ns.apache.org/royale/html" + xmlns:html="library://ns.apache.org/royale/html" xmlns:models="org.apache.royale.html.beads.models.*" className="property" width="100%"> <fx:Script> @@ -74,7 +74,11 @@ limitations under the License. <js:Label id="label" className="eventType" text="{ASDocClassEvents(data).type}" /> <html:A id="link" className="eventTypeLink" text="{ASDocClassEvents(data).type}" href="{ASDocClassEvents(data).typehref}" /> </js:Group> - <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassEvents(data).attributes}" - itemRenderer="AttributeRenderer" width="100%"/> + <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassEvents(data).attributes}" + itemRenderer="AttributeRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> <js:MultilineLabel id="description" width="100%" text="{obj.description}"/> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml b/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml index f96d01202d..275f922256 100644 --- a/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/MethodDetailRenderer.mxml @@ -19,7 +19,7 @@ limitations under the License. --> <js:MXMLItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:js="library://ns.apache.org/royale/basic" - xmlns:html="library://ns.apache.org/royale/html" + xmlns:html="library://ns.apache.org/royale/html" xmlns:models="org.apache.royale.html.beads.models.*" className="property" width="100%"> <fx:Script> @@ -85,7 +85,11 @@ limitations under the License. <js:Label id="label" className="propertyType" text="{ASDocClassMembers(data).return}" /> <html:A id="link" className="propertyTypeLink" text="{ASDocClassMembers(data).return}" href="{ASDocClassMembers(data).returnhref}" /> </js:Group> - <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassMembers(data).attributes}" - itemRenderer="AttributeRenderer" width="100%"/> + <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassMembers(data).attributes}" + itemRenderer="AttributeRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> <js:MultilineLabel id="description" width="100%" text="{obj.description}"/> </js:MXMLItemRenderer> diff --git a/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml b/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml index f5ff996a30..2e45ffc0b2 100644 --- a/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml +++ b/examples/royale/ASDoc/src/main/royale/PropertyDetailRenderer.mxml @@ -19,7 +19,7 @@ limitations under the License. --> <js:MXMLItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:js="library://ns.apache.org/royale/basic" - xmlns:html="library://ns.apache.org/royale/html" + xmlns:html="library://ns.apache.org/royale/html" xmlns:models="org.apache.royale.html.beads.models.*" className="property" width="100%"> <fx:Script> @@ -74,7 +74,11 @@ limitations under the License. <js:Label id="label" className="propertyType" text="{ASDocClassMembers(data).return}" /> <html:A id="link" className="propertyTypeLink" text="{ASDocClassMembers(data).return}" href="{ASDocClassMembers(data).returnhref}" /> </js:Group> - <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassMembers(data).attributes}" - itemRenderer="AttributeRenderer" width="100%"/> + <js:DataContainer id="attributes" className="attributeList" dataProvider="{ASDocClassMembers(data).attributes}" + itemRenderer="AttributeRenderer" width="100%"> + <js:beads> + <models:ListPresentationModel rowHeight="NaN"/> + </js:beads> + </js:DataContainer> <js:MultilineLabel id="description" width="100%" text="{obj.description}"/> </js:MXMLItemRenderer>
