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/14 06:13:26 UTC
[1/3] git commit: [flex-sdk] [refs/heads/release4.11.0] - FIX
https://issues.apache.org/jira/browse/FLEX-33813 (DataGrid goes blank when
scrolled and dataProvider is changed ) FIX minor ASDOC wording in CalloutSkin
for desktop
Updated Branches:
refs/heads/release4.11.0 fb3fe2ea1 -> ed4190e25
FIX https://issues.apache.org/jira/browse/FLEX-33813 (DataGrid goes blank when scrolled and dataProvider is changed )
FIX minor ASDOC wording in CalloutSkin for desktop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/35706c9c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/35706c9c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/35706c9c
Branch: refs/heads/release4.11.0
Commit: 35706c9c1f0d15961d7fec0f81a9cf3e779538c0
Parents: 0234ed5
Author: mamsellem <ma...@systar.com>
Authored: Mon Oct 14 02:13:41 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Mon Oct 14 02:13:41 2013 +0200
----------------------------------------------------------------------
.../projects/spark/src/spark/components/Grid.as | 24 ++++++++++++++++----
.../spark/src/spark/skins/spark/CalloutSkin.as | 3 +--
2 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/35706c9c/frameworks/projects/spark/src/spark/components/Grid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Grid.as b/frameworks/projects/spark/src/spark/components/Grid.as
index 7deb6eb..847fa1d 100644
--- a/frameworks/projects/spark/src/spark/components/Grid.as
+++ b/frameworks/projects/spark/src/spark/components/Grid.as
@@ -269,6 +269,8 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
* rowIndex of the caret after a collection refresh event.
*/
private var caretSelectedItem:Object = null;
+ private var updateCaretForDataProviderChanged:Boolean = false;
+ private var updateCaretForDataProviderChangeLastEvent:CollectionEvent;
/**
* @private
@@ -4599,7 +4601,12 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
clearInvalidateDisplayListReasons = true;
if (!variableRowHeight)
- setFixedRowHeight(gridDimensions.getRowHeight(0));
+ setFixedRowHeight(gridDimensions.getRowHeight(0));
+ if (updateCaretForDataProviderChanged){
+ updateCaretForDataProviderChanged = false;
+ updateCaretForDataProviderChange(updateCaretForDataProviderChangeLastEvent);
+ updateCaretForDataProviderChangeLastEvent = null;
+ }
}
//--------------------------------------------------------------------------
@@ -5446,7 +5453,6 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
else
{
caretRowIndex = _dataProvider.length > 0 ? 0 : -1;
- validateNow();
verticalScrollPosition = 0;
}
@@ -5620,8 +5626,18 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
invalidateSize();
invalidateDisplayList();
- if (caretRowIndex != -1)
- updateCaretForDataProviderChange(event);
+ if (caretRowIndex != -1) {
+ if (event.kind == CollectionEventKind.RESET){
+ // defer for reset events
+ updateCaretForDataProviderChanged = true;
+ updateCaretForDataProviderChangeLastEvent = event;
+ invalidateDisplayList();
+ }
+ else {
+ updateCaretForDataProviderChange(event);
+ }
+ }
+
// Trigger bindings to selectedIndex/selectedCell/selectedItem and the plurals of those.
if (selectionChanged)
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/35706c9c/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as b/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
index 6d4f91d..6b15598 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
+++ b/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
@@ -47,8 +47,7 @@ import spark.skins.spark.supportClasses.CalloutArrow;
use namespace mx_internal;
/**
- * The default skin class for the Spark Callout component in mobile
- * applications.
+ * The default skin class for the Spark Callout component in desktop applications.
*
* <p>The <code>contentGroup</code> lies above a <code>backgroundColor</code> fill
* which frames the <code>contentGroup</code>. The position and size of the frame
[3/3] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
branch 'develop' into release4.11.0 Merge
d2ccdc143a869988afeea1d3b1b443901f65d2b2 Mustella test didn't have embedded
fonts
Posted by ah...@apache.org.
Merge branch 'develop' into release4.11.0
Merge d2ccdc143a869988afeea1d3b1b443901f65d2b2
Mustella test didn't have embedded fonts
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ed4190e2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ed4190e2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ed4190e2
Branch: refs/heads/release4.11.0
Commit: ed4190e2586a78d3b2b365be19a5bc68f86f9f8b
Parents: fb3fe2e d2ccdc1
Author: Alex Harui <ah...@apache.org>
Authored: Sun Oct 13 21:10:50 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Oct 13 21:10:50 2013 -0700
----------------------------------------------------------------------
.../projects/spark/src/spark/components/Grid.as | 24 +++++++--
.../spark/src/spark/skins/spark/CalloutSkin.as | 3 +-
.../SWFs/AdvancedDataGridMain_FLEX_32848.mxml | 54 ++++++++++++++++++-
.../datagrid_textSelectedColor_singleCell.png | Bin 8961 -> 11609 bytes
.../datagrid_textSelectedColor_singleRow.png | Bin 5858 -> 7133 bytes
5 files changed, 74 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: [flex-sdk] [refs/heads/release4.11.0] - Test didn't
have embedded fonts
Posted by ah...@apache.org.
Test didn't have embedded fonts
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/d2ccdc14
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d2ccdc14
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d2ccdc14
Branch: refs/heads/release4.11.0
Commit: d2ccdc143a869988afeea1d3b1b443901f65d2b2
Parents: 35706c9
Author: Alex Harui <ah...@apache.org>
Authored: Sun Oct 13 21:07:23 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Oct 13 21:07:23 2013 -0700
----------------------------------------------------------------------
.../SWFs/AdvancedDataGridMain_FLEX_32848.mxml | 54 ++++++++++++++++++-
.../datagrid_textSelectedColor_singleCell.png | Bin 8961 -> 11609 bytes
.../datagrid_textSelectedColor_singleRow.png | Bin 5858 -> 7133 bytes
3 files changed, 53 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d2ccdc14/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
index ad71bc1..082ec37 100644
--- a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
@@ -35,7 +35,59 @@
</mx:AdvancedDataGrid>
</mx:VBox>
-<fx:Style>
+ <fx:Style>
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace mx "library://ns.adobe.com/flex/mx";
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+ fontFamily: EmbeddedVerdana;
+ embedAsCFF: false;
+ }
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Bold.ttf");
+ fontFamily: EmbeddedVerdana;
+ fontWeight: bold;
+ fontStyle: normal;
+ embedAsCFF: false;
+ }
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Italic.ttf");
+ fontFamily: EmbeddedVerdana;
+ fontWeight: normal;
+ fontStyle: italic;
+ embedAsCFF: false;
+ }
+
+ /* Used by some of the styles tests. */
+ @font-face {
+ src: url("../../../../Assets/Fonts/Cousine/Cousine-Regular.ttf");
+ fontFamily: EmbeddedArial;
+ embedAsCFF: false;
+ }
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Cousine/Cousine-Bold.ttf");
+ fontFamily: EmbeddedArial;
+ fontWeight: bold;
+ fontStyle: normal;
+ embedAsCFF: false;
+ }
+
+ mx|AdvancedDataGrid {
+ /* embed the numeric sort indicator */
+ sortFontFamily: EmbeddedVerdana;
+ }
+
+ global {
+ fontFamily: EmbeddedVerdana;
+ fontAntiAliasType: normal;
+ }
+ </fx:Style>
+
+ <fx:Style>
@namespace mx "library://ns.adobe.com/flex/mx";
mx|AdvancedDataGrid {
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d2ccdc14/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png
index 34f1d69..2c6bf6f 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d2ccdc14/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png
index f5c627b..3815c0e 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png differ