Merge pull request #83 from VirtualThief/recttransform-offset

Fixed simultaneous tween of RectTransform offsetMin and offsetMax
prime31 · Jun 28, 2018 · 8dbfd9f · 8dbfd9f
2 parents 8f1c874 + 8317054
commit 8dbfd9f
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 4 deletions.
diff --git a/Assets/Plugins/GoKit/GoTweenConfig.cs b/Assets/Plugins/GoKit/GoTweenConfig.cs
@@ -219,7 +219,7 @@ public GoTweenConfig anchorMin( Vector2 endValue, bool isRelative = false )
 	/// </summary>
 	public GoTweenConfig offsetMax( Vector2 endValue, bool isRelative = false )
 	{
-		var prop = new OffsetTweenProperty( endValue, isRelative, true );
+		var prop = new OffsetMaxTweenProperty( endValue, isRelative );
 		_tweenProperties.Add( prop );
 
 		return this;
@@ -230,7 +230,7 @@ public GoTweenConfig offsetMax( Vector2 endValue, bool isRelative = false )
 	/// </summary>
 	public GoTweenConfig offsetMin( Vector2 endValue, bool isRelative = false )
 	{
-		var prop = new OffsetTweenProperty( endValue, isRelative );
+		var prop = new OffsetMinTweenProperty( endValue, isRelative );
 		_tweenProperties.Add( prop );
 
 		return this;

diff --git a/...ties/specificTypes/OffsetTweenProperty.cs → .../abstracts/AbstractOffsetTweenProperty.cs b/...ties/specificTypes/OffsetTweenProperty.cs → .../abstracts/AbstractOffsetTweenProperty.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 
 
-public sealed class OffsetTweenProperty : AbstractTweenProperty
+public abstract class AbstractOffsetTweenProperty : AbstractTweenProperty
 {
 	private bool _useMax;
 
@@ -13,7 +13,7 @@ public sealed class OffsetTweenProperty : AbstractTweenProperty
 	private Vector2 _endValue;
 	private Vector2 _diffValue;
 
-	public OffsetTweenProperty( Vector2 endValue, bool isRelative = false, bool useMax = false ) : base( isRelative )
+	public AbstractOffsetTweenProperty( Vector2 endValue, bool isRelative = false, bool useMax = false ) : base( isRelative )
 	{
 		_originalEndValue = endValue;
 		_useMax = useMax;

diff --git a/...specificTypes/OffsetTweenProperty.cs.meta → ...racts/AbstractOffsetTweenProperty.cs.meta b/...specificTypes/OffsetTweenProperty.cs.meta → ...racts/AbstractOffsetTweenProperty.cs.meta
diff --git a/Assets/Plugins/GoKit/properties/specificTypes/OffsetMaxTweenProperty.cs b/Assets/Plugins/GoKit/properties/specificTypes/OffsetMaxTweenProperty.cs
@@ -0,0 +1,8 @@
+using UnityEngine;
+
+public sealed class OffsetMaxTweenProperty : AbstractOffsetTweenProperty
+{
+    public OffsetMaxTweenProperty( Vector2 endValue, bool isRelative = false ) : base( endValue, isRelative, useMax: true )
+    {
+    }
+}
diff --git a/Assets/Plugins/GoKit/properties/specificTypes/OffsetMaxTweenProperty.cs.meta b/Assets/Plugins/GoKit/properties/specificTypes/OffsetMaxTweenProperty.cs.meta
diff --git a/Assets/Plugins/GoKit/properties/specificTypes/OffsetMinTweenProperty.cs b/Assets/Plugins/GoKit/properties/specificTypes/OffsetMinTweenProperty.cs
@@ -0,0 +1,8 @@
+using UnityEngine;
+
+public sealed class OffsetMinTweenProperty : AbstractOffsetTweenProperty
+{
+    public OffsetMinTweenProperty( Vector2 endValue, bool isRelative = false ) : base( endValue, isRelative, useMax: false )
+    {
+    }
+}
diff --git a/Assets/Plugins/GoKit/properties/specificTypes/OffsetMinTweenProperty.cs.meta b/Assets/Plugins/GoKit/properties/specificTypes/OffsetMinTweenProperty.cs.meta