This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-datefield-year-month
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to
refs/heads/feature/jewel-datefield-year-month by this push:
new 9a58e40 jewel datechooser: adapt expandColumns as we change view state
9a58e40 is described below
commit 9a58e403c22c187fc49f9200ba59efda13ce8c3a
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Mar 22 12:38:50 2019 +0100
jewel datechooser: adapt expandColumns as we change view state
---
.../royale/org/apache/royale/jewel/beads/views/DateChooserView.as | 5 +++++
1 file changed, 5 insertions(+)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
index 2558f37..6cff6a9 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
@@ -180,6 +180,7 @@ package org.apache.royale.jewel.beads.views
}
private var buttonsRow:TableRow;
+ private var viewSelectorTableHeaderCell:TableHeaderCell;
private function createButtonsRow():void
{
@@ -191,6 +192,7 @@ package org.apache.royale.jewel.beads.views
tableHeader.addElement(_viewSelector);
tableHeader.expandColumns = 5;
buttonsRow.addElement(tableHeader);
+ viewSelectorTableHeaderCell = tableHeader; // to change
colspan at a later time
tableHeader= new TableHeaderCell();
tableHeader.className = "buttonsRow";
@@ -231,14 +233,17 @@ package org.apache.royale.jewel.beads.views
{
// display "FEB 2019"
_viewSelector.text =
model.monthNames[model.displayedMonth] + " " + String(model.displayedYear);
+ viewSelectorTableHeaderCell.expandColumns = 5;
} else if(model.viewState == 1)
{
// display "2016-2039"
_viewSelector.text = String(model.displayedYear
- 10) + "-" + String(model.displayedYear + 10);
+ viewSelectorTableHeaderCell.expandColumns = 2;
} else
{
// display "2017"
_viewSelector.text =
String(model.displayedYear);
+ viewSelectorTableHeaderCell.expandColumns = 2;
}
}