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/10/18 21:43:39 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33779 Label
would RTE when truncating when set to multiline and there wasn't enough width
Updated Branches:
refs/heads/develop debea17e6 -> 24c1d8f01
FLEX-33779 Label would RTE when truncating when set to multiline and there wasn't enough width
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e1a65493
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e1a65493
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e1a65493
Branch: refs/heads/develop
Commit: e1a654937e810c1688ab75eda1e3e6a654808b6e
Parents: debea17
Author: Alex Harui <ah...@apache.org>
Authored: Fri Oct 18 12:40:06 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Oct 18 12:40:06 2013 -0700
----------------------------------------------------------------------
frameworks/projects/spark/src/spark/components/Label.as | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e1a65493/frameworks/projects/spark/src/spark/components/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Label.as b/frameworks/projects/spark/src/spark/components/Label.as
index 087d8a9..b8d4ff3 100644
--- a/frameworks/projects/spark/src/spark/components/Label.as
+++ b/frameworks/projects/spark/src/spark/components/Label.as
@@ -1379,6 +1379,11 @@ public class Label extends TextBase
if (truncateAtCharPosition == 0)
break;
+ // sometimes the player decides there isn't enough
+ // room to render anything so bail
+ if (textLines.length == 0)
+ break;
+
// Try again by truncating at the beginning of the
// preceding atom.
var oldCharPosition:int = truncateAtCharPosition;
[3/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33830
HScrollbar should defer some work to the validation methods otherwise it will
get incorrect metrics
Posted by ah...@apache.org.
FLEX-33830 HScrollbar should defer some work to the validation methods otherwise it will get incorrect metrics
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/24c1d8f0
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/24c1d8f0
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/24c1d8f0
Branch: refs/heads/develop
Commit: 24c1d8f019974841aaf5558ce423dcdb5752b708
Parents: 3e752d9
Author: Alex Harui <ah...@apache.org>
Authored: Fri Oct 18 12:43:26 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Oct 18 12:43:26 2013 -0700
----------------------------------------------------------------------
.../spark/src/spark/components/HScrollBar.as | 22 +++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/24c1d8f0/frameworks/projects/spark/src/spark/components/HScrollBar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/HScrollBar.as b/frameworks/projects/spark/src/spark/components/HScrollBar.as
index 90d3aa3..ca8d456 100644
--- a/frameworks/projects/spark/src/spark/components/HScrollBar.as
+++ b/frameworks/projects/spark/src/spark/components/HScrollBar.as
@@ -160,6 +160,8 @@ public class HScrollBar extends ScrollBarBase
//
//--------------------------------------------------------------------------
+ private var maxAndPageSizeInvalid:Boolean = false;
+
private function updateMaximumAndPageSize():void
{
var hsp:Number = viewport.horizontalScrollPosition;
@@ -532,11 +534,29 @@ public class HScrollBar extends ScrollBarBase
if (allStyles || styleName == "interactionMode")
{
if (viewport)
- updateMaximumAndPageSize();
+ {
+ // Some of the information needed
+ // is calculated in measure() on a child
+ maxAndPageSizeInvalid = true;
+ invalidateSize();
+ }
}
}
/**
+ * @private
+ */
+ override protected function measure():void
+ {
+ super.measure();
+ if (maxAndPageSizeInvalid)
+ {
+ maxAndPageSizeInvalid = false;
+ updateMaximumAndPageSize();
+ }
+ }
+
+ /**
* @private
* Scroll horizontally by event.delta "steps". This listener is added to the viewport
* at a lower priority then the vertical scrollbar mouse wheel listener, so that vertical
[2/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-33824 DG's
nestlevel trick would fail in certain situations. Force validation before
mucking with nestLevel
Posted by ah...@apache.org.
FLEX-33824 DG's nestlevel trick would fail in certain situations. Force validation before mucking with nestLevel
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3e752d9c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3e752d9c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3e752d9c
Branch: refs/heads/develop
Commit: 3e752d9c63682fbe48cc58b27fdc73260376be74
Parents: e1a6549
Author: Alex Harui <ah...@apache.org>
Authored: Fri Oct 18 12:42:13 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Oct 18 12:42:13 2013 -0700
----------------------------------------------------------------------
frameworks/projects/spark/src/spark/components/DataGrid.as | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3e752d9c/frameworks/projects/spark/src/spark/components/DataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/DataGrid.as b/frameworks/projects/spark/src/spark/components/DataGrid.as
index 3ee69f0..32358f8 100644
--- a/frameworks/projects/spark/src/spark/components/DataGrid.as
+++ b/frameworks/projects/spark/src/spark/components/DataGrid.as
@@ -3427,7 +3427,10 @@ public class DataGrid extends SkinnableContainerBase
elt.dataGrid = this;
if (elt.nestLevel <= grid.nestLevel)
+ {
+ elt.validateNow();
elt.nestLevel = grid.nestLevel + 1;
+ }
}
/**