You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/10/11 00:25:50 UTC
[1/4] git commit: [flex-sdk] [refs/heads/release4.11.0] - Fix
#FLEX-33654 - allow ctrl/command key presses to be recieved and acted uppon
in datagrid cells
Updated Branches:
refs/heads/release4.11.0 a2eb3eccd -> 88ed63eb3
Fix #FLEX-33654 - allow ctrl/command key presses to be recieved and acted uppon in datagrid cells
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/10ff6e41
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/10ff6e41
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/10ff6e41
Branch: refs/heads/release4.11.0
Commit: 10ff6e41b8fbd58ad68d49771df0887f7458ad16
Parents: 7639423
Author: Tom Chiverton <to...@apache.org>
Authored: Tue Oct 8 21:13:02 2013 +0100
Committer: Tom Chiverton <to...@apache.org>
Committed: Tue Oct 8 21:13:02 2013 +0100
----------------------------------------------------------------------
.../src/spark/components/gridClasses/DataGridEditor.as | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/10ff6e41/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
index c727988..2971962 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/DataGridEditor.as
@@ -1695,7 +1695,14 @@ public class DataGridEditor
// Prevent the DataGrid from processing any keystrokes that were
// received by the editor. We don't cancel the keystokes here
// because on AIR that cancels text input into the text field.
- event.stopPropagation();
+ // We need to let the copy/cut/past combinations pass through
+ // because they need to reach the NativeApplication in order to
+ // be correctly processed by the item editors.
+ // Note on Mac OS ctrlKey covers ctrl and command keys
+ if (!event.ctrlKey)
+ {
+ event.stopPropagation();
+ }
}
/**
@@ -1785,4 +1792,4 @@ public class DataGridEditor
}
}
-}
\ No newline at end of file
+}
[4/4] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
commit 'bde3a3d3c887e6748f49c8228a6305561620d927' into release4.11.0
Posted by jm...@apache.org.
Merge commit 'bde3a3d3c887e6748f49c8228a6305561620d927' into release4.11.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/88ed63eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/88ed63eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/88ed63eb
Branch: refs/heads/release4.11.0
Commit: 88ed63eb30472547112b2dda2785c251be9a3d62
Parents: a2eb3ec bde3a3d
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 11 09:24:24 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 11 09:24:24 2013 +1100
----------------------------------------------------------------------
frameworks/projects/mobiletheme/defaults.css | 2 ++
.../src/spark/skins/mobile/CalloutSkin.as | 2 +-
.../skins/mobile/supportClasses/CalloutArrow.as | 9 +++++++++
.../components/gridClasses/DataGridEditor.as | 11 +++++++++--
.../spark/src/spark/skins/spark/CalloutSkin.as | 15 +--------------
.../baselines/Callout_skin@android_240ppi.png | Bin 7581 -> 7784 bytes
.../swfs/skins/MyCalloutSkin.as | 4 ++--
7 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: [flex-sdk] [refs/heads/release4.11.0] - fix failing
SplitNavigatorView mustella tests fix baseline bitmap for android 240 ppi.
yet to update other ppi / os baseline bitmaps see
https://issues.apache.org/jira/browse/FLEX-33809
Posted by jm...@apache.org.
fix failing SplitNavigatorView mustella tests
fix baseline bitmap for android 240 ppi.
yet to update other ppi / os baseline bitmaps
see https://issues.apache.org/jira/browse/FLEX-33809
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/bde3a3d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/bde3a3d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/bde3a3d3
Branch: refs/heads/release4.11.0
Commit: bde3a3d3c887e6748f49c8228a6305561620d927
Parents: 0313215
Author: mamsellem <ma...@systar.com>
Authored: Thu Oct 10 12:31:01 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Thu Oct 10 12:31:01 2013 +0200
----------------------------------------------------------------------
.../baselines/Callout_skin@android_240ppi.png | Bin 7581 -> 7784 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/bde3a3d3/mustella/tests/mobile/SplitViewNavigator/integration/baselines/Callout_skin@android_240ppi.png
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/SplitViewNavigator/integration/baselines/Callout_skin@android_240ppi.png b/mustella/tests/mobile/SplitViewNavigator/integration/baselines/Callout_skin@android_240ppi.png
index 9dc3824..b8ba4f8 100644
Binary files a/mustella/tests/mobile/SplitViewNavigator/integration/baselines/Callout_skin@android_240ppi.png and b/mustella/tests/mobile/SplitViewNavigator/integration/baselines/Callout_skin@android_240ppi.png differ
[2/4] git commit: [flex-sdk] [refs/heads/release4.11.0] - partly fix
failing SplitNavigatorView mustella tests 5 out of 6 fails are fixed. The
remaining fail is due to incorrect Callout skin implementation: see
https://issues.apache.org/jira/browse/FLEX-
Posted by jm...@apache.org.
partly fix failing SplitNavigatorView mustella tests
5 out of 6 fails are fixed.
The remaining fail is due to incorrect Callout skin implementation:
see https://issues.apache.org/jira/browse/FLEX-33809
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/03132154
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/03132154
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/03132154
Branch: refs/heads/release4.11.0
Commit: 03132154c0d39cf296cbbee042741a8e609aa8c2
Parents: 10ff6e4
Author: mamsellem <ma...@systar.com>
Authored: Thu Oct 10 12:21:18 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Thu Oct 10 12:21:18 2013 +0200
----------------------------------------------------------------------
frameworks/projects/mobiletheme/defaults.css | 2 ++
.../src/spark/skins/mobile/CalloutSkin.as | 2 +-
.../skins/mobile/supportClasses/CalloutArrow.as | 9 +++++++++
.../spark/src/spark/skins/spark/CalloutSkin.as | 15 +--------------
.../SplitViewNavigator/swfs/skins/MyCalloutSkin.as | 4 ++--
5 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index d47035c..850b296 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -132,6 +132,8 @@ Callout
contentBackgroundColor: #FFFFFF;
gap: 12;
skinClass: ClassReference("spark.skins.mobile.CalloutSkin");
+ borderThickness: NaN;
+ borderColor: 0;
}
Callout ViewNavigator
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
index 364327d..1a6df7d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
@@ -576,7 +576,7 @@ public class CalloutSkin extends MobileSkin
var frameEllipseSize:Number = backgroundCornerRadius * 2;
// account for borderThickness center stroke alignment
- var showBorder:Boolean = !isNaN(borderThickness);
+ var showBorder:Boolean = !isNaN(borderThickness) || borderThickness > 0 ;
var borderWeight:Number = showBorder ? borderThickness : 0;
// contentBackgroundGraphic already accounts for the arrow position
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
index ac8823d..553eb21 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
@@ -146,6 +146,15 @@ public class CalloutArrow extends UIComponent
*/
protected var useBackgroundGradient:Boolean;
+ /**
+ * @copy spark.skins.mobile.CalloutSkin#borderColor
+ */
+ protected var borderColor:Number;
+
+ /**
+ * @copy spark.skins.mobile.CalloutSkin#borderThickness
+ */
+ protected var borderThickness:Number = NaN;
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/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 972f464..6d4f91d 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
+++ b/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
@@ -93,7 +93,7 @@ public class CalloutSkin extends ActionScriptSkinBase
dropShadowAlpha = 0.7;
- // default DPI_160
+ // default DPI_120
backgroundCornerRadius = 6;
contentBackgroundInsetClass = CalloutContentBackground;
backgroundGradientHeight = 83;
@@ -106,19 +106,6 @@ public class CalloutSkin extends ActionScriptSkinBase
dropShadowDistance = 2;
highlightWeight = 0.5;
- /*
- backgroundCornerRadius = 8;
- contentBackgroundInsetClass = CalloutContentBackground;
- backgroundGradientHeight = 110;
- frameThickness = 6;
- arrowWidth = 26;
- arrowHeight = 13;
- contentCornerRadius = 5;
- dropShadowBlurX = 16;
- dropShadowBlurY = 16;
- dropShadowDistance = 3;
- highlightWeight = 1;
- */
}
//--------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as b/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
index 8cc94eb..b49e03e 100644
--- a/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
+++ b/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
@@ -29,8 +29,8 @@ package skins
frameThickness=10;
arrowWidth = 50;
arrowHeight = 50;
- borderThickness = 10;
- borderColor = 0xFF0000;
+ setStyle('borderThickness' , 10);
+ setStyle('borderColor', 0xFF0000);
dropShadowVisible=true;
backgroundCornerRadius=30;