Repository: flex-asjs Updated Branches: refs/heads/develop cd207341b -> 4f0890233
Fixed positioning of the DateField's pop-up DateChooser. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4f089023 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4f089023 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4f089023 Branch: refs/heads/develop Commit: 4f08902330ce876ca037b2cd618805423c9158ba Parents: cd20734 Author: Peter Ent <[email protected]> Authored: Fri Jul 31 11:55:01 2015 -0400 Committer: Peter Ent <[email protected]> Committed: Fri Jul 31 11:55:01 2015 -0400 ---------------------------------------------------------------------- .../asjs/src/org/apache/flex/html/beads/DateFieldView.as | 10 ++++++++-- .../html/beads/controllers/DateFieldMouseController.as | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f089023/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DateFieldView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DateFieldView.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DateFieldView.as index 2254d6e..f709a1f 100644 --- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DateFieldView.as +++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DateFieldView.as @@ -30,6 +30,8 @@ package org.apache.flex.html.beads import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.utils.UIUtils; + import org.apache.flex.utils.PointUtils; + import org.apache.flex.geom.Point; import org.apache.flex.html.DateChooser; import org.apache.flex.html.TextButton; import org.apache.flex.html.TextInput; @@ -166,14 +168,18 @@ package org.apache.flex.html.beads _popUp = new DateChooser(); _popUp.width = 210; _popUp.height = 220; - _popUp.x = UIBase(_strand).x; - _popUp.y = UIBase(_strand).y + 30; } var model:IDateChooserModel = _strand.getBeadByType(IDateChooserModel) as IDateChooserModel; _popUp.selectedDate = model.selectedDate; var host:IPopUpHost = UIUtils.findPopUpHost(UIBase(_strand)); + var point:Point = new Point(_button.x, _button.y+_button.height); + var p2:Point = PointUtils.localToGlobal(point, _strand); + var p3:Point = PointUtils.globalToLocal(p2, host); + _popUp.x = p3.x; + _popUp.y = p3.y; + host.addElement(_popUp); } else http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f089023/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as index d1213cb..05b852d 100644 --- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as +++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/controllers/DateFieldMouseController.as @@ -75,8 +75,6 @@ package org.apache.flex.html.beads.controllers { var viewBead:DateFieldView = _strand.getBeadByType(DateFieldView) as DateFieldView; viewBead.popUpVisible = true; - UIBase(viewBead.popUp).x = UIBase(_strand).x + UIBase(_strand).width - 20; - UIBase(viewBead.popUp).y = UIBase(_strand).y + UIBase(_strand).height; IEventDispatcher(viewBead.popUp).addEventListener("change", changeHandler); }
