You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/10/30 01:51:34 UTC
[5/6] git commit: [flex-asjs] [refs/heads/develop] - try this sizing
logic
try this sizing logic
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/46f7af5a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/46f7af5a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/46f7af5a
Branch: refs/heads/develop
Commit: 46f7af5a14a1ef2758b5d9ad27295674fdf4e0a8
Parents: 22cf44d
Author: Alex Harui <ah...@apache.org>
Authored: Wed Oct 29 17:50:50 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Oct 29 17:50:50 2014 -0700
----------------------------------------------------------------------
.../FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/46f7af5a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
index 5ef80a9..839420b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/TextFieldViewBase.as
@@ -259,7 +259,7 @@ package org.apache.flex.html.beads
public function get viewHeight():Number
{
// textfields with autosize collapse if no text
- if (_textField.text == "" && _textField.autoSize != "none")
+ if (_textField.text == "" && autoHeight)
return ValuesManager.valuesImpl.getValue(_strand, "fontSize") + 4;
return _textField.height;
@@ -276,7 +276,7 @@ package org.apache.flex.html.beads
public function get viewWidth():Number
{
// textfields with autosize collapse if no text
- if (_textField.text == "" && _textField.autoSize != "none")
+ if (_textField.text == "" && autoWidth)
return 0;
return _textField.width;