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 2013/05/02 06:39:43 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - improve css and
default sizes
Updated Branches:
refs/heads/develop af7677eb7 -> 2b7ee0a61
improve css and default sizes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a077336a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a077336a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a077336a
Branch: refs/heads/develop
Commit: a077336ad37668151d2d425dec633205779e9788
Parents: af7677e
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 15:01:26 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 15:01:26 2013 -0700
----------------------------------------------------------------------
frameworks/as/defaults.css | 8 ++++++++
.../as/src/org/apache/flex/core/CSSTextField.as | 11 ++++++-----
frameworks/as/src/org/apache/flex/core/UIBase.as | 8 ++++++--
.../html/staticControls/beads/TextFieldBeadBase.as | 10 ++++++++++
4 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/defaults.css b/frameworks/as/defaults.css
index 64caf16..b503dd5 100644
--- a/frameworks/as/defaults.css
+++ b/frameworks/as/defaults.css
@@ -85,6 +85,12 @@ DropDownListList
ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
}
+Label
+{
+ width: 95;
+ height: 18;
+}
+
List
{
ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
@@ -104,6 +110,8 @@ TextButton
TextInput
{
ITextInputBead: ClassReference("org.apache.flex.html.staticControls.beads.TextInputWithBorderBead");
+ width: 135;
+ height: 20;
}
/* HTML5 */
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/src/org/apache/flex/core/CSSTextField.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/CSSTextField.as b/frameworks/as/src/org/apache/flex/core/CSSTextField.as
index 7ffa12b..eb2cc21 100644
--- a/frameworks/as/src/org/apache/flex/core/CSSTextField.as
+++ b/frameworks/as/src/org/apache/flex/core/CSSTextField.as
@@ -29,14 +29,15 @@ package org.apache.flex.core
{
super();
}
-
+
override public function set text(value:String):void
{
var tf: TextFormat = new TextFormat();
- tf.font = ValuesManager.valuesImpl.getValue(this, "fontFamily") as String;
- tf.size = ValuesManager.valuesImpl.getValue(this, "fontSize");
- tf.color = ValuesManager.valuesImpl.getValue(this, "color");
- var padding:Object = ValuesManager.valuesImpl.getValue(this, "padding");
+ tf.font = ValuesManager.valuesImpl.getValue(parent, "fontFamily") as String;
+ tf.size = ValuesManager.valuesImpl.getValue(parent, "fontSize");
+ tf.bold = ValuesManager.valuesImpl.getValue(parent, "fontWeight") == "bold";
+ tf.color = ValuesManager.valuesImpl.getValue(parent, "color");
+ var padding:Object = ValuesManager.valuesImpl.getValue(parent, "padding");
if (padding != null)
{
tf.leftMargin = padding;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/UIBase.as b/frameworks/as/src/org/apache/flex/core/UIBase.as
index 0d93b94..a624eca 100644
--- a/frameworks/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/as/src/org/apache/flex/core/UIBase.as
@@ -30,9 +30,11 @@ package org.apache.flex.core
super();
}
- private var _width:Number = 0;
+ private var _width:Number;
override public function get width():Number
{
+ if (isNaN(_width))
+ _width = Number(ValuesManager.valuesImpl.getValue(this, "width"));
return _width;
}
override public function set width(value:Number):void
@@ -48,9 +50,11 @@ package org.apache.flex.core
return super.width;
}
- private var _height:Number = 0;
+ private var _height:Number;
override public function get height():Number
{
+ if (isNaN(_height))
+ _height = Number(ValuesManager.valuesImpl.getValue(this, "height"));
return _height;
}
override public function set height(value:Number):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a077336a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
index 4f1c26d..1c4fb0a 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextFieldBeadBase.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.staticControls.beads
{
+ import flash.display.DisplayObject;
import flash.display.DisplayObjectContainer;
import org.apache.flex.core.CSSTextField;
@@ -56,7 +57,10 @@ package org.apache.flex.html.staticControls.beads
_textModel = value.getBeadByType(ITextModel) as ITextModel;
textModel.addEventListener("textChange", textChangeHandler);
textModel.addEventListener("htmlChange", htmlChangeHandler);
+ textModel.addEventListener("widthChanged", sizeChangeHandler);
+ textModel.addEventListener("heightChanged", sizeChangeHandler);
DisplayObjectContainer(value).addChild(_textField);
+ sizeChangeHandler(null);
if (textModel.text !== null)
text = textModel.text;
if (textModel.html !== null)
@@ -96,5 +100,11 @@ package org.apache.flex.html.staticControls.beads
{
html = textModel.html;
}
+
+ private function sizeChangeHandler(event:Event):void
+ {
+ textField.width = DisplayObject(_strand).width;
+ textField.height = DisplayObject(_strand).height;
+ }
}
}
\ No newline at end of file
[2/2] git commit: [flex-asjs] [refs/heads/develop] - tweak some colors
Posted by ah...@apache.org.
tweak some colors
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2b7ee0a6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2b7ee0a6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2b7ee0a6
Branch: refs/heads/develop
Commit: 2b7ee0a61eda480ad1aad33b265c4309214b46ca
Parents: a077336
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 1 21:31:51 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 1 21:31:51 2013 -0700
----------------------------------------------------------------------
.../html/staticControls/beads/DropDownListBead.as | 8 ++++----
.../supportClasses/TextFieldItemRenderer.as | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b7ee0a6/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
index 8ad9ff1..4020053 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as
@@ -57,9 +57,9 @@ package org.apache.flex.html.staticControls.beads
upTextField.borderColor = 0;
downTextField.borderColor = 0;
overTextField.borderColor = 0;
- upTextField.backgroundColor = 0xCCCCCC;
+ upTextField.backgroundColor = 0xEEEEEE;
downTextField.backgroundColor = 0x808080;
- overTextField.backgroundColor = 0xFFCCCC;
+ overTextField.backgroundColor = 0xFFFFFF;
upTextField.selectable = false;
upTextField.type = TextFieldType.DYNAMIC;
downTextField.selectable = false;
@@ -76,8 +76,8 @@ package org.apache.flex.html.staticControls.beads
upSprite.addChild(upArrows);
overSprite.addChild(overArrows);
downSprite.addChild(downArrows);
- drawArrows(upArrows, 0xCCCCCC);
- drawArrows(overArrows, 0xFFCCCC);
+ drawArrows(upArrows, 0xEEEEEE);
+ drawArrows(overArrows, 0xFFFFFF);
drawArrows(downArrows, 0x808080);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b7ee0a6/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
index 3ca451a..dd26e9f 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/TextFieldItemRenderer.as
@@ -34,9 +34,9 @@ package org.apache.flex.html.staticControls.supportClasses
selectable = false;
}
- public var highlightColor:uint = 0xFF0000;
- public var selectedColor:uint = 0x00FF00;
- public var downColor:uint = 0x0000FF;
+ public var highlightColor:uint = 0xCEDBEF;
+ public var selectedColor:uint = 0xA8C6EE;
+ public var downColor:uint = 0x808080;
public function get data():Object
{