You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/04/16 06:49:10 UTC

[36/50] [abbrv] git commit: [flex-sdk] - Change ComboBox measuring to use typicalText. FLEX-33381

Change ComboBox measuring to use typicalText. FLEX-33381

git-svn-id: https://svn.apache.org/repos/asf/flex/sdk/branches/release4.9@1446989 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/156ee946
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/156ee946
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/156ee946

Branch: refs/heads/develop
Commit: 156ee94601dbe73079eb382b9158240b44f82578
Parents: 0aa08ae
Author: Alex Harui <ah...@apache.org>
Authored: Sun Feb 17 02:00:18 2013 +0000
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Feb 17 02:00:18 2013 +0000

----------------------------------------------------------------------
 .../spark/src/spark/components/ComboBox.as         |    2 +-
 .../ComboBox/Properties/ComboBox_Properties.mxml   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/156ee946/frameworks/projects/spark/src/spark/components/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/ComboBox.as b/frameworks/projects/spark/src/spark/components/ComboBox.as
index a37f52a..7e47e94 100644
--- a/frameworks/projects/spark/src/spark/components/ComboBox.as
+++ b/frameworks/projects/spark/src/spark/components/ComboBox.as
@@ -777,7 +777,7 @@ public class ComboBox extends DropDownListBase implements IIMESupport
                 if (typicalItem != null)
                 {
                     var itemString:String = LabelUtil.itemToLabel(typicalItem, labelField, labelFunction);
-                    textInput.widthInChars = itemString.length;
+                    textInput.typicalText = itemString;
                 }
                 else
                 {

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/156ee946/mustella/tests/gumbo/components/ComboBox/Properties/ComboBox_Properties.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/ComboBox/Properties/ComboBox_Properties.mxml b/mustella/tests/gumbo/components/ComboBox/Properties/ComboBox_Properties.mxml
index 3c4d32d..bb11ff0 100644
--- a/mustella/tests/gumbo/components/ComboBox/Properties/ComboBox_Properties.mxml
+++ b/mustella/tests/gumbo/components/ComboBox/Properties/ComboBox_Properties.mxml
@@ -1029,7 +1029,7 @@
                 <AssertPropertyValue target="mainGroup.myCB_array" propertyName="width" value="146"/>
                 <RunCode code="FlexGlobals.topLevelApplication.mainGroup.myCB_array.setTI_22()"/>
                 <Pause timeout="50"/>                
-                <AssertPropertyValue target="mainGroup.myCB_array" propertyName="width" value="110"/>
+                <AssertPropertyValue target="mainGroup.myCB_array" propertyName="width" value="65"/>
             </body>
         </TestCase>         
         
@@ -1041,7 +1041,7 @@
                 <AssertPropertyValue target="mainGroup.myCB_array" propertyName="width" value="146"/>
                 <RunCode code="FlexGlobals.topLevelApplication.mainGroup.myCB_array.setTI_13()"/>
                 <Pause timeout="50"/>                
-                <AssertPropertyValue target="mainGroup.myCB_array" propertyName="width" value="170"/>
+                <AssertPropertyValue target="mainGroup.myCB_array" propertyName="width" value="99"/>
             </body>
         </TestCase>