This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch feature/jewel-datagrid in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit f4af0b14f73d7addb860d66d7b87670803ca4817 Author: Carlos Rovira <[email protected]> AuthorDate: Tue Nov 26 18:16:18 2019 +0100 jewel-datagrid: bead configuration for DataGrid --- examples/royale/DataGridExample/pom.xml | 2 + .../projects/Jewel/src/main/resources/defaults.css | 26 +++++--- .../Jewel/src/main/resources/jewel-manifest.xml | 1 + .../Jewel/src/main/sass/components/_datagrid.sass | 72 ++++++++++++++-------- 4 files changed, 69 insertions(+), 32 deletions(-) diff --git a/examples/royale/DataGridExample/pom.xml b/examples/royale/DataGridExample/pom.xml index e0f3cc5..25ebff8 100644 --- a/examples/royale/DataGridExample/pom.xml +++ b/examples/royale/DataGridExample/pom.xml @@ -45,6 +45,8 @@ <configuration> <mainClass>DataGridExample.mxml</mainClass> <targets>${royale.targets}</targets> + <debug>false</debug> + <additionalCompilerOptions>-source-map=true;</additionalCompilerOptions> </configuration> </plugin> </plugins> diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css index 60f2a67..8f064f4 100644 --- a/frameworks/projects/Jewel/src/main/resources/defaults.css +++ b/frameworks/projects/Jewel/src/main/resources/defaults.css @@ -457,16 +457,28 @@ j|ComboBoxPopUp { IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ComboBoxPopUpView"); } +.jewel.datagrid { + width: 200px; + height: 290px; +} + j|DataGrid { - IChangePropagator: ClassReference("org.apache.royale.html.beads.DataGridColumnChangePropagator"); - IDataGridPresentationModel: ClassReference("org.apache.royale.html.beads.models.DataGridPresentationModel"); - IBeadView: ClassReference("org.apache.royale.html.beads.DataGridView"); - IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridModel"); - IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.DataGridLayout"); - columnClass: ClassReference("org.apache.royale.html.supportClasses.DataGridColumnList"); + IChangePropagator: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnChangePropagator"); + IDataGridPresentationModel: ClassReference("org.apache.royale.jewel.beads.models.DataGridPresentationModel"); + IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DataGridView"); + IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridCollectionViewModel"); + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.DataGridLayout"); + columnClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnList"); columnContainerClass: ClassReference("org.apache.royale.html.DataGridButtonBar"); columnLayoutClass: ClassReference("org.apache.royale.html.beads.layouts.ButtonBarLayout"); - listAreaClass: ClassReference("org.apache.royale.html.beads.DataGridListArea"); + listAreaClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridListArea"); +} + +j|DataGridListArea { + IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView"); + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout"); + IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport"); + IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel"); } .jewel.datechooser .jewel.table { diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml index b38ee40..4ccb8df 100644 --- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml +++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml @@ -45,6 +45,7 @@ <component id="DataGrid" class="org.apache.royale.jewel.DataGrid"/> <component id="DataGridColumn" class="org.apache.royale.jewel.supportClasses.datagrid.DataGridColumn"/> + <component id="DataGridListArea" class="org.apache.royale.jewel.supportClasses.datagrid.DataGridListArea"/> <component id="SimpleButton" class="org.apache.royale.jewel.supportClasses.button.SimpleButton"/> <component id="Button" class="org.apache.royale.jewel.Button"/> diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass index 827b040..50c3853 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass @@ -22,17 +22,57 @@ // DataGrid variables .jewel.datagrid + width: 200px + height: 290px j|DataGrid - IChangePropagator: ClassReference("org.apache.royale.html.beads.DataGridColumnChangePropagator") - IDataGridPresentationModel: ClassReference("org.apache.royale.html.beads.models.DataGridPresentationModel") - IBeadView: ClassReference("org.apache.royale.html.beads.DataGridView") - IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridModel") - IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.DataGridLayout") - columnClass: ClassReference("org.apache.royale.html.supportClasses.DataGridColumnList") + IChangePropagator: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnChangePropagator") + IDataGridPresentationModel: ClassReference("org.apache.royale.jewel.beads.models.DataGridPresentationModel") + IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DataGridView") + IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridCollectionViewModel") + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.DataGridLayout") + columnClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridColumnList") columnContainerClass: ClassReference("org.apache.royale.html.DataGridButtonBar") columnLayoutClass: ClassReference("org.apache.royale.html.beads.layouts.ButtonBarLayout") - listAreaClass: ClassReference("org.apache.royale.html.beads.DataGridListArea") + listAreaClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.DataGridListArea") + +j|DataGridListArea + IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView") + IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout") + IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport") + IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel") +//align-items: flex-start +// DataGridListArea { +// background-color: #FFFFFF +// IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalLayout") +// IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport") +// IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel") +// flex-grow: 1 +// } + +// j|DataGridColumnList +// IBeadView: ClassReference("org.apache.royale.html.beads.ListView") +// IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController") +// IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout") +// IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory") +// IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer") +// IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridModel") +// IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData") +// IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport") +// IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel") + + +// DynamicDataGrid { +// IChangePropagator: ClassReference("org.apache.royale.html.beads.DataGridColumnChangePropagator") +// IDataGridPresentationModel: ClassReference("org.apache.royale.html.beads.models.DataGridPresentationModel") +// IBeadView: ClassReference("org.apache.royale.html.beads.DataGridView") +// IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridCollectionViewModel") +// IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.DataGridLayout") +// ColumnClass: ClassReference("org.apache.royale.html.supportClasses.DynamicDataGridColumnList") + +// background-color: #FFFFFF +// border: 1px solid #222222 +// } // DataGridButtonBar // { @@ -64,25 +104,7 @@ j|DataGrid // background-color: #FFFFFF // } -// DataGridListArea { -// background-color: #FFFFFF -// IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalLayout") -// IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport") -// IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel") -// flex-grow: 1 -// } - -// DynamicDataGrid { -// IChangePropagator: ClassReference("org.apache.royale.html.beads.DataGridColumnChangePropagator") -// IDataGridPresentationModel: ClassReference("org.apache.royale.html.beads.models.DataGridPresentationModel") -// IBeadView: ClassReference("org.apache.royale.html.beads.DataGridView") -// IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridCollectionViewModel") -// IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.DataGridLayout") -// ColumnClass: ClassReference("org.apache.royale.html.supportClasses.DynamicDataGridColumnList") -// background-color: #FFFFFF -// border: 1px solid #222222 -// } // DynamicDataGridColumnList { // IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataGridCollectionViewModel")
