flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [14/50] git commit: [flex-asjs] [refs/heads/develop] - Added blendMode
Date Mon, 03 Jul 2017 13:35:08 GMT
Added blendMode


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b922b6ba
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b922b6ba
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b922b6ba

Branch: refs/heads/develop
Commit: b922b6ba6ae160d8b1c210bbb5f067287073b82c
Parents: 5ac1e6a
Author: Harbs <harbs@in-tools.com>
Authored: Tue Jun 20 15:08:09 2017 +0300
Committer: Harbs <harbs@in-tools.com>
Committed: Tue Jun 20 15:08:09 2017 +0300

----------------------------------------------------------------------
 .../org/apache/flex/textLayout/container/ContainerController.as | 4 ++--
 .../main/flex/org/apache/flex/textLayout/factory/ITLFFactory.as | 4 ++--
 .../org/apache/flex/textLayout/factory/StandardTLFFactory.as    | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b922b6ba/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
index 76cb412..03a68c8 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
@@ -2824,7 +2824,7 @@ package org.apache.flex.textLayout.container
 //TODO create shape in abstract way
 //AJH: probably should be graphicContainer with selection rectangles drawn at offset positions
instead
 //of positioning a rectangle.
-			var selObj:IRect = textFlow.tlfFactory.getRect();
+			var selObj:IRect = textFlow.tlfFactory.getRect(selFormat.pointBlendMode);
 			
 			// Oh, this is ugly. If we are in right aligned text, and there is no padding, and the
scrollRect is set, 
 			// then in an empty line (or if the point is at the right edge of the line), the blinking
cursor is not
@@ -2936,7 +2936,7 @@ package org.apache.flex.textLayout.container
 				if (endLine >= flowComposer.numLines)
 					endLine = flowComposer.numLines-1;
 				
-				var selObj:ICompoundGraphic = textFlow.tlfFactory.getCompoundGraphic();
+				var selObj:ICompoundGraphic = textFlow.tlfFactory.getCompoundGraphic(selFormat.rangeBlendMode);
 				prevLine = begLine ? flowComposer.getLineAt(begLine-1) : null;
 				var line:ITextFlowLine = flowComposer.getLineAt(begLine); 
 				

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b922b6ba/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/ITLFFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/ITLFFactory.as
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/ITLFFactory.as
index c8da7ad..d122879 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/ITLFFactory.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/ITLFFactory.as
@@ -23,8 +23,8 @@ package org.apache.flex.textLayout.factory {
 	import org.apache.flex.text.engine.ITextFactory;
 	public interface ITLFFactory {
 		function get textFactory():ITextFactory;
-		function getRect():IRect;
-		function getCompoundGraphic():ICompoundGraphic;
+		function getRect(blendMode:String=""):IRect;
+		function getCompoundGraphic(blendMode:String=""):ICompoundGraphic;
 		function getContainer():IParentIUIBase;
 		
 		// in JS, in order to measure text, TextLines need to be put

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b922b6ba/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/StandardTLFFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/StandardTLFFactory.as
b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/StandardTLFFactory.as
index 7ed3439..0ed80f1 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/StandardTLFFactory.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/factory/StandardTLFFactory.as
@@ -28,11 +28,11 @@ package org.apache.flex.textLayout.factory {
 	import org.apache.flex.text.html.HTMLTextFactory;
 
 	public class StandardTLFFactory implements ITLFFactory {
-		public function getRect() : IRect {
+		public function getRect(blendMode:String="") : IRect {
 			return new Rect();
 		}
 
-		public function getCompoundGraphic() : ICompoundGraphic {
+		public function getCompoundGraphic(blendMode:String="") : ICompoundGraphic {
 			return new CompoundGraphic();
 		}
 		
@@ -40,7 +40,6 @@ package org.apache.flex.textLayout.factory {
 		{
 			return new GraphicContainer();
 		}
-//TODO add a basic factory when it's ready		
 		private static var factory:ITextFactory;
 		public function get textFactory() : ITextFactory {
 			if(!factory)


Mime
View raw message