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 2015/07/30 20:23:47 UTC
[1/5] git commit: [flex-asjs] [refs/heads/develop] - fix up flat
scrollbar
Repository: flex-asjs
Updated Branches:
refs/heads/develop a5649a568 -> 9c5d176a3
fix up flat scrollbar
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/16cbd77c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/16cbd77c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/16cbd77c
Branch: refs/heads/develop
Commit: 16cbd77cdb8272abcc4f623477e75630ad36e436
Parents: 90e7fc1
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jul 30 09:27:51 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jul 30 10:54:53 2015 -0700
----------------------------------------------------------------------
frameworks/projects/Flat/as/defaults.css | 2 +-
frameworks/projects/Flat/flat-manifest.xml | 2 +-
.../org/apache/flex/html/beads/layouts/VScrollBarLayout.as | 7 ++++++-
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16cbd77c/frameworks/projects/Flat/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/defaults.css b/frameworks/projects/Flat/as/defaults.css
index dbbdcf4..a54c912 100644
--- a/frameworks/projects/Flat/as/defaults.css
+++ b/frameworks/projects/Flat/as/defaults.css
@@ -734,7 +734,7 @@ RadioButton
background-color: #16a085;
}
-ScrollBar
+VScrollBar
{
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16cbd77c/frameworks/projects/Flat/flat-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/flat-manifest.xml b/frameworks/projects/Flat/flat-manifest.xml
index dcd2aca..253aaf6 100644
--- a/frameworks/projects/Flat/flat-manifest.xml
+++ b/frameworks/projects/Flat/flat-manifest.xml
@@ -69,7 +69,7 @@
<component id="DropDownListStringItemRenderer" class="org.apache.flex.flat.supportClasses.DropDownListStringItemRenderer" />
<component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer" lookupOnly="true" />
<component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer" lookupOnly="true" />
- <component id="ScrollBar" class="org.apache.flex.html.supportClasses.ScrollBar" lookupOnly="true" />
+ <component id="VScrollBar" class="org.apache.flex.html.supportClasses.VScrollBar" lookupOnly="true" />
<component id="CSSScrollBarView" class="org.apache.flex.flat.beads.CSSScrollBarView" />
<component id="NumericOnlyTextInputBead" class="org.apache.flex.html.accessories.NumericOnlyTextInputBead" lookupOnly="true" />
<component id="PasswordInputBead" class="org.apache.flex.html.accessories.PasswordInputBead" lookupOnly="true" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16cbd77c/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
index dddbff3..00c53b3 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as
@@ -96,7 +96,12 @@ package org.apache.flex.html.beads.layouts
increment.x = 0;
increment.y = h - increment.height - 1;
- track.x = 0;
+ if (track.width < thumb.width)
+ track.x = (thumb.width - track.width) / 2;
+ else if (track.width > thumb.width)
+ thumb.x = (track.width - thumb.width) / 2;
+ else
+ track.x = 0;
track.y = decrement.height;
track.height = increment.y - decrement.height;
thumb.height = sbModel.pageSize / (sbModel.maximum - sbModel.minimum) * track.height;
[2/5] git commit: [flex-asjs] [refs/heads/develop] - use % width to
stretch renderer across dropdown
Posted by ah...@apache.org.
use % width to stretch renderer across dropdown
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/90e7fc19
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/90e7fc19
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/90e7fc19
Branch: refs/heads/develop
Commit: 90e7fc195393bd8f928ac46ffc349bd35017878d
Parents: 2174b05
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jul 30 07:06:36 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jul 30 10:54:53 2015 -0700
----------------------------------------------------------------------
frameworks/projects/Flat/as/defaults.css | 9 ++++++---
.../flat/supportClasses/DropDownListStringItemRenderer.as | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90e7fc19/frameworks/projects/Flat/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/defaults.css b/frameworks/projects/Flat/as/defaults.css
index 95dcd1e..dbbdcf4 100644
--- a/frameworks/projects/Flat/as/defaults.css
+++ b/frameworks/projects/Flat/as/defaults.css
@@ -222,7 +222,6 @@ DateField {
.dropdown-menu {
position: absolute;
z-index: 1000;
- min-width: 220px;
padding: 0;
margin-top: 9px;
font-size: 14px;
@@ -239,16 +238,20 @@ DateField {
background-color: rgba(202, 206, 209, .5);
}
.dropdown-menu-item-renderer {
- padding: 8px 16px;
+ padding: 3px 16px;
line-height: 1.429;
+ display: block;
+ width: 100%;
font-size: inherit;
color: #606d7a;
background-color: transparent;
}
.dropdown-menu-item-renderer-selected {
- padding: 8px 16px;
+ padding: 3px 16px;
line-height: 1.875;
font-size: inherit;
+ display: block;
+ width: 100%;
color: #fff;
background-color: #1abc9c;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90e7fc19/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as b/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as
index e73eef0..3ab6a79 100644
--- a/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as
+++ b/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListStringItemRenderer.as
@@ -51,7 +51,6 @@ package org.apache.flex.flat.supportClasses
super();
className = 'dropdown-menu-item-renderer';
- percentWidth = 90;
}
/**
[3/5] git commit: [flex-asjs] [refs/heads/develop] - try to figure
out height if no text
Posted by ah...@apache.org.
try to figure out height if no text
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/67fa9502
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/67fa9502
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/67fa9502
Branch: refs/heads/develop
Commit: 67fa9502be5710d626814076aa5380e1d0b19ef9
Parents: a5649a5
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jul 29 14:17:38 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jul 30 10:54:53 2015 -0700
----------------------------------------------------------------------
.../apache/flex/html/beads/TextFieldViewBase.as | 37 ++++++++++++++++----
1 file changed, 31 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/67fa9502/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextFieldViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextFieldViewBase.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextFieldViewBase.as
index f2214e2..6318bf6 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextFieldViewBase.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextFieldViewBase.as
@@ -112,6 +112,17 @@ package org.apache.flex.html.beads
{
heightChangeHandler(null);
}
+
+ // textfield's collapse to height==4 if no text
+ if (autoHeight && _textModel.text === null)
+ {
+ var fontHeight:Number = ValuesManager.valuesImpl.getValue(_strand, "fontSize") + 4;
+ if (textField.height != fontHeight)
+ {
+ textField.autoSize = "none";
+ textField.height = fontHeight;
+ }
+ }
}
/**
@@ -150,13 +161,27 @@ package org.apache.flex.html.beads
{
var host:UIBase = UIBase(_strand);
if (autoHeight)
- {
- if (textField.height != textField.textHeight + 4)
+ {
+ if (textField.text != "")
+ {
+ if (textField.height != textField.textHeight + 4)
+ {
+ textField.height = textField.textHeight + 4;
+ inHeightChange = true;
+ host.dispatchEvent(new Event("heightChanged"));
+ inHeightChange = false;
+ }
+ }
+ else
{
- textField.height = textField.textHeight + 4;
- inHeightChange = true;
- host.dispatchEvent(new Event("heightChanged"));
- inHeightChange = false;
+ var fontHeight:Number = ValuesManager.valuesImpl.getValue(_strand, "fontSize") + 4;
+ if (textField.height != fontHeight)
+ {
+ textField.height = fontHeight;
+ inHeightChange = true;
+ host.dispatchEvent(new Event("heightChanged"));
+ inHeightChange = false;
+ }
}
}
if (autoWidth)
[5/5] git commit: [flex-asjs] [refs/heads/develop] - more fixes to
width/height handling
Posted by ah...@apache.org.
more fixes to width/height handling
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9c5d176a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9c5d176a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9c5d176a
Branch: refs/heads/develop
Commit: 9c5d176a338d7b3e2c6538a28ac8b38289e63718
Parents: 16cbd77
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jul 30 11:23:41 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jul 30 11:23:41 2015 -0700
----------------------------------------------------------------------
.../Core/as/src/org/apache/flex/core/UIBase.as | 63 +++++++-------------
1 file changed, 22 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9c5d176a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
index 4a2916f..0fde64e 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
@@ -165,14 +165,6 @@ package org.apache.flex.core
*/
public function get explicitWidth():Number
{
- if (isNaN(_explicitWidth))
- {
- var value:* = ValuesManager.valuesImpl.getValue(this, "width");
- if (value !== undefined) {
- _explicitWidth = Number(value);
- }
- }
-
return _explicitWidth;
}
@@ -206,14 +198,6 @@ package org.apache.flex.core
*/
public function get explicitHeight():Number
{
- if (isNaN(_explicitHeight))
- {
- var value:* = ValuesManager.valuesImpl.getValue(this, "height");
- if (value !== undefined) {
- _explicitHeight = Number(value);
- }
- }
-
return _explicitHeight;
}
@@ -482,9 +466,6 @@ package org.apache.flex.core
return false;
if (!isNaN(_percentWidth))
return false;
- var value:* = ValuesManager.valuesImpl.getValue(this, "width");
- if (value !== undefined)
- return false;
var left:* = ValuesManager.valuesImpl.getValue(this, "left");
var right:* = ValuesManager.valuesImpl.getValue(this, "right");
return (left === undefined || right === undefined);
@@ -505,9 +486,6 @@ package org.apache.flex.core
return false;
if (!isNaN(_percentHeight))
return false;
- var value:* = ValuesManager.valuesImpl.getValue(this, "height");
- if (value !== undefined)
- return false;
var top:* = ValuesManager.valuesImpl.getValue(this, "top");
var bottom:* = ValuesManager.valuesImpl.getValue(this, "bottom");
return (top === undefined || bottom === undefined);
@@ -895,30 +873,33 @@ package org.apache.flex.core
{
var c:Class;
- if (isNaN(_width)) {
+ if (isNaN(_width) && isNaN(_percentWidth))
+ {
var value:* = ValuesManager.valuesImpl.getValue(this,"width");
- if (value !== undefined) {
- var s:String = String(value);
- var lastChar:String = s.substr(s.length-1,s.length);
- if (lastChar == "%") {
- _percentWidth = Number(s);
- }
- else {
- _width = Number(s);
- }
+ if (value !== undefined)
+ {
+ if (value is String)
+ {
+ var s:String = String(value);
+ _percentWidth = Number(s.substring(0, s.length - 1));
+ }
+ else
+ _width = value as Number;
}
}
- if (isNaN(_height)) {
+ if (isNaN(_height) && isNaN(_percentHeight))
+ {
value = ValuesManager.valuesImpl.getValue(this,"height");
- if (value !== undefined) {
- s = String(value);
- lastChar = s.substr(s.length-1,s.length);
- if (lastChar == "%") {
- _percentHeight = Number(s);
- } else {
- _height = Number(s);
- }
+ if (value !== undefined)
+ {
+ if (value is String)
+ {
+ s = String(value);
+ _percentHeight = Number(s.substring(0, s.length - 1));
+ }
+ else
+ _height = value as Number;
}
}
[4/5] git commit: [flex-asjs] [refs/heads/develop] - let the base
class draw the background
Posted by ah...@apache.org.
let the base class draw the background
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2174b059
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2174b059
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2174b059
Branch: refs/heads/develop
Commit: 2174b05975ce366520ad8b3629ce7caed6273514
Parents: 67fa950
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jul 30 07:05:43 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jul 30 10:54:53 2015 -0700
----------------------------------------------------------------------
.../flex/html/supportClasses/StringItemRenderer.as | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2174b059/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/StringItemRenderer.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
index 8dbd73b..3540b78 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/StringItemRenderer.as
@@ -52,6 +52,7 @@ package org.apache.flex.html.supportClasses
textField.type = TextFieldType.DYNAMIC;
textField.autoSize = TextFieldAutoSize.LEFT;
textField.selectable = false;
+ textField.parentDrawsBackground = true;
}
public var textField:CSSTextField;
@@ -118,15 +119,5 @@ package org.apache.flex.html.supportClasses
else textField.text = String(value);
}
- /**
- * @private
- */
- override public function updateRenderer():void
- {
- super.updateRenderer();
-
- textField.background = (down || selected || hovered);
- textField.backgroundColor = backgroundColor;
- }
}
}