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/04/16 06:49:07 UTC
[33/50] [abbrv] git commit: [flex-sdk] - Fix from develop branch,
rev 1445779. FLEX-33384. When RET is in the inactive state there
should not be a cursor showing. Any selection will still show if
selectionHighlighting='always'.
Fix from develop branch, rev 1445779. FLEX-33384. When RET is in the inactive state there should not be a cursor showing. Any selection will still show if selectionHighlighting='always'.
git-svn-id: https://svn.apache.org/repos/asf/flex/sdk/branches/release4.9@1446760 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/15b123b7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/15b123b7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/15b123b7
Branch: refs/heads/develop
Commit: 15b123b71e905ef3821c6397bef215a9f4e3fa44
Parents: 5bdb7ab
Author: Carol Frampton <cf...@apache.org>
Authored: Fri Feb 15 20:33:08 2013 +0000
Committer: Carol Frampton <cf...@apache.org>
Committed: Fri Feb 15 20:33:08 2013 +0000
----------------------------------------------------------------------
.../RichEditableTextContainerManager.as | 33 +++++++--------
1 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/15b123b7/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as b/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
index fad5878..8d96340 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as
@@ -30,6 +30,14 @@ import flash.geom.Rectangle;
import flash.ui.ContextMenu;
import flash.ui.Keyboard;
+import mx.core.mx_internal;
+import mx.events.SandboxMouseEvent;
+import mx.styles.IStyleClient;
+
+import spark.components.RichEditableText;
+import spark.components.TextSelectionHighlighting;
+
+import flashx.textLayout.tlf_internal;
import flashx.textLayout.container.ContainerController;
import flashx.textLayout.container.TextContainerManager;
import flashx.textLayout.edit.EditManager;
@@ -52,17 +60,9 @@ import flashx.textLayout.formats.TextLayoutFormat;
import flashx.textLayout.operations.ApplyFormatOperation;
import flashx.textLayout.operations.InsertTextOperation;
import flashx.textLayout.property.Property;
-import flashx.textLayout.tlf_internal;
import flashx.undo.IUndoManager;
import flashx.undo.UndoManager;
-import mx.core.mx_internal;
-import mx.events.SandboxMouseEvent;
-import mx.styles.IStyleClient;
-
-import spark.components.RichEditableText;
-import spark.components.TextSelectionHighlighting;
-
use namespace mx_internal;
use namespace tlf_internal;
@@ -294,23 +294,22 @@ public class RichEditableTextContainerManager extends TextContainerManager
var inactiveSelectionColor:* = textDisplay.getStyle(
"inactiveTextSelectionColor");
- var inactivePointAlpha:Number =
- editingMode == EditingMode.READ_WRITE ?
- 1.0 :
- 0.0;
+ var inactivePointAlpha:Number = 0.0;
- var inactiveAlpha:Number =
+ var inactiveRangeAlpha:Number =
textDisplay.selectionHighlighting ==
TextSelectionHighlighting.ALWAYS ?
1.0 :
0.0;
- // Inactive is not unfocused so show an insertion point if there is one.
- // This is consistent with TextField.
+
+ // This doesn't really matter since inactivePointAlpha is 0.
+ var pointBlinkRate:Number = 0.0;
return new SelectionFormat(
- inactiveSelectionColor, inactiveAlpha, BlendMode.NORMAL,
- inactiveSelectionColor, inactivePointAlpha, BlendMode.INVERT);
+ inactiveSelectionColor, inactiveRangeAlpha, BlendMode.NORMAL,
+ inactiveSelectionColor, inactivePointAlpha, BlendMode.INVERT,
+ pointBlinkRate);
}
/**