Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 51DB318638 for ; Tue, 28 Jul 2015 18:40:28 +0000 (UTC) Received: (qmail 63879 invoked by uid 500); 28 Jul 2015 18:40:27 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 63818 invoked by uid 500); 28 Jul 2015 18:40:27 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 63486 invoked by uid 99); 28 Jul 2015 18:40:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2015 18:40:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 62B0FE35E6; Tue, 28 Jul 2015 18:40:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Tue, 28 Jul 2015 18:40:31 -0000 Message-Id: In-Reply-To: <91671132f83c4f5c8011c9daa31ec861@git.apache.org> References: <91671132f83c4f5c8011c9daa31ec861@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/36] git commit: [flex-asjs] [refs/heads/develop] - allow pseudo-state specific styles allow pseudo-state specific styles Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c9c90ffb Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c9c90ffb Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c9c90ffb Branch: refs/heads/develop Commit: c9c90ffb67dd729ffa5797bab6d3373b5a07c77c Parents: 30007f7 Author: Alex Harui Authored: Mon Jul 13 21:53:47 2015 -0700 Committer: Alex Harui Committed: Mon Jul 13 21:53:47 2015 -0700 ---------------------------------------------------------------------- .../as/src/org/apache/flex/core/CSSTextField.as | 40 +++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c9c90ffb/frameworks/projects/Core/as/src/org/apache/flex/core/CSSTextField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/CSSTextField.as b/frameworks/projects/Core/as/src/org/apache/flex/core/CSSTextField.as index a91174d..41ff87c 100644 --- a/frameworks/projects/Core/as/src/org/apache/flex/core/CSSTextField.as +++ b/frameworks/projects/Core/as/src/org/apache/flex/core/CSSTextField.as @@ -18,11 +18,11 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.core { - import flash.text.TextField; - import flash.text.TextFieldAutoSize; - import flash.text.TextFormat; - - import org.apache.flex.core.ValuesManager; + import flash.text.TextField; + import flash.text.TextFieldAutoSize; + import flash.text.TextFormat; + + import org.apache.flex.core.ValuesManager; import org.apache.flex.events.Event; import org.apache.flex.utils.CSSUtils; @@ -65,6 +65,17 @@ package org.apache.flex.core /** * @private + * The CSS pseudo-state for lookups. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public var styleState:String; + + /** + * @private * The parentDrawsBackground property is set if the CSSTextField * shouldn't draw a background * @@ -98,19 +109,19 @@ package org.apache.flex.core sp.addEventListener("classNameChanged", updateStyles); var tf: TextFormat = new TextFormat(); - tf.font = ValuesManager.valuesImpl.getValue(sp, "fontFamily") as String; - tf.size = ValuesManager.valuesImpl.getValue(sp, "fontSize"); - tf.bold = ValuesManager.valuesImpl.getValue(sp, "fontWeight") == "bold"; - tf.color = CSSUtils.toColor(ValuesManager.valuesImpl.getValue(sp, "color")); + tf.font = ValuesManager.valuesImpl.getValue(sp, "fontFamily", styleState) as String; + tf.size = ValuesManager.valuesImpl.getValue(sp, "fontSize", styleState); + tf.bold = ValuesManager.valuesImpl.getValue(sp, "fontWeight", styleState) == "bold"; + tf.color = CSSUtils.toColor(ValuesManager.valuesImpl.getValue(sp, "color", styleState)); if (!parentHandlesPadding) { - var padding:Object = ValuesManager.valuesImpl.getValue(sp, "padding"); - var paddingLeft:Object = ValuesManager.valuesImpl.getValue(sp,"padding-left"); - var paddingRight:Object = ValuesManager.valuesImpl.getValue(sp,"padding-right"); + var padding:Object = ValuesManager.valuesImpl.getValue(sp, "padding", styleState); + var paddingLeft:Object = ValuesManager.valuesImpl.getValue(sp,"padding-left", styleState); + var paddingRight:Object = ValuesManager.valuesImpl.getValue(sp,"padding-right", styleState); tf.leftMargin = CSSUtils.getLeftValue(paddingLeft, padding, width); tf.rightMargin = CSSUtils.getRightValue(paddingRight, padding, width); } - var align:Object = ValuesManager.valuesImpl.getValue(sp, "text-align"); + var align:Object = ValuesManager.valuesImpl.getValue(sp, "text-align", styleState); if (align == "center") { autoSize = TextFieldAutoSize.NONE; @@ -123,7 +134,7 @@ package org.apache.flex.core } if (!parentDrawsBackground) { - var backgroundColor:Object = ValuesManager.valuesImpl.getValue(sp, "background-color"); + var backgroundColor:Object = ValuesManager.valuesImpl.getValue(sp, "background-color", styleState); if (backgroundColor != null) { this.background = true; @@ -139,5 +150,6 @@ package org.apache.flex.core // force styles to be re-calculated this.text = text; } + } } \ No newline at end of file