This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new bcc72de jewe-combobox: some little updates to view
bcc72de is described below
commit bcc72de2ccf7be59c4fba01d0ca28cb9a4c79ec2
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Jan 25 18:45:15 2020 +0100
jewe-combobox: some little updates to view
---
.../src/main/royale/ComboBoxPlayGround.mxml | 18 ++----------------
.../apache/royale/jewel/beads/views/ComboBoxView.as | 16 ++++++++--------
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git
a/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml
b/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml
index dd6a259..7dea43e 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ComboBoxPlayGround.mxml
@@ -133,10 +133,7 @@ limitations under the License.
</j:Grid>
</j:Card>
</j:GridCell>
- </j:Grid>
-
- <j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
-
+
<j:GridCell desktopNumerator="1" desktopDenominator="1"
tabletNumerator="1" tabletDenominator="1" phoneNumerator="1"
phoneDenominator="1">
<j:Card>
@@ -152,9 +149,6 @@ limitations under the License.
</j:Card>
</j:GridCell>
- </j:Grid>
-
- <j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="1"
tabletNumerator="1" tabletDenominator="1" phoneNumerator="1"
phoneDenominator="1">
<j:Card>
<html:H3 text="Jewel ComboBox selectedIndex:
{cmb1.selectedIndex}"/>
@@ -164,9 +158,7 @@ limitations under the License.
</j:HGroup>
</j:Card>
</j:GridCell>
- </j:Grid>
- <j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="1"
tabletNumerator="1" tabletDenominator="1" phoneNumerator="1"
phoneDenominator="1">
<j:Card>
<html:H3 text="Jewel ComboBox selectedItem"/>
@@ -178,9 +170,7 @@ limitations under the License.
<j:Button text="Deselect"
click="cmb2.selectedIndex = -1"/>
</j:Card>
</j:GridCell>
- </j:Grid>
- <j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="1"
tabletNumerator="1" tabletDenominator="1" phoneNumerator="1"
phoneDenominator="1">
<j:Card>
<html:H3 text="Jewel ComboBox with Search
Filter"/>
@@ -194,9 +184,7 @@ limitations under the License.
</j:HGroup>
</j:Card>
</j:GridCell>
- </j:Grid>
- <j:Grid gap="true">
<j:GridCell desktopNumerator="1" desktopDenominator="1"
tabletNumerator="1" tabletDenominator="1" phoneNumerator="1"
phoneDenominator="1">
<j:Card>
<html:H3 text="Reposition popup"/>
@@ -209,9 +197,7 @@ limitations under the License.
</j:PopUp>
</j:Card>
</j:GridCell>
- </j:Grid>
-
- <j:Grid gap="true">
+
<j:GridCell desktopNumerator="1" desktopDenominator="1"
tabletNumerator="1" tabletDenominator="1" phoneNumerator="1"
phoneDenominator="1">
<j:Card>
<html:H3 text="Jewel ComboBox Disabled"/>
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
index 393ffbe..a8968cc 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
@@ -31,9 +31,8 @@ package org.apache.royale.jewel.beads.views
}
import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IComboBoxModel;
- import org.apache.royale.core.IPopUpHost;
+ import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IUIBase;
import org.apache.royale.core.StyledUIBase;
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
@@ -124,7 +123,7 @@ package org.apache.royale.jewel.beads.views
{
super.strand = value;
- var host:StyledUIBase = _strand as StyledUIBase;
+ var parent:IParent = _strand as StyledUIBase;
_textinput = new TextInput();
/*COMPILE::JS {
@@ -139,8 +138,8 @@ package org.apache.royale.jewel.beads.views
initSize();
- host.addElement(_textinput);
- host.addElement(_button);
+ parent.addElement(_textinput);
+ parent.addElement(_button);
model = _strand.getBeadByType(IComboBoxModel) as
IComboBoxModel;
@@ -153,7 +152,7 @@ package org.apache.royale.jewel.beads.views
model.addEventListener("selectionChanged",
handleItemChange);
model.addEventListener("dataProviderChanged",
itemChangeAction);
-
IEventDispatcher(_strand).addEventListener("sizeChanged", handleSizeChange);
+ listenOnStrand("sizeChanged", handleSizeChange);
}
private var model:IComboBoxModel;
@@ -188,8 +187,9 @@ package org.apache.royale.jewel.beads.views
_comboPopUp = new _popUpClass() as ComboBoxPopUp;
_comboPopUp.model = model;
- var popupHost:IPopUpHost = UIUtils.findPopUpHost(_strand
as IUIBase);
- popupHost.popUpParent.addElement(_comboPopUp);
+ UIUtils.addPopUp(_comboPopUp, host);
+ // var popupHost:IPopUpHost =
UIUtils.findPopUpHost(_strand as IUIBase);
+ // popupHost.popUpParent.addElement(_comboPopUp);
// popup is ComboBoxPopUp that fills 100% of browser
window-> We want the internal List inside its view to adjust height
_list = (_comboPopUp.view as ComboBoxPopUpView).list;
