Manual merge for PR #9

Resolves an issue with the EventSystem and EventTriggers
release
Simon Jackson 2017-06-19 18:48:49 +01:00
parent e373565536
commit 937daaa227
1 changed files with 2 additions and 1 deletions

View File

@ -224,7 +224,7 @@ namespace UnityEngine.UI.Extensions
{ {
Rect spriteRect = sprite.rect; Rect spriteRect = sprite.rect;
//if (type == Type.Simple || type == Type.Filled) //if (type == Type.Simple || type == Type.Filled)
return new Vector2(local.x * spriteRect.width / rect.width, local.y * spriteRect.height / rect.height); return new Vector2(local.x * rect.width, local.y * rect.height);
//Vector4 border = sprite.border; //Vector4 border = sprite.border;
//Vector4 adjustedBorder = GetAdjustedBorders(border / pixelsPerUnit, rect); //Vector4 adjustedBorder = GetAdjustedBorders(border / pixelsPerUnit, rect);
@ -280,6 +280,7 @@ namespace UnityEngine.UI.Extensions
#region onEnable #region onEnable
protected override void OnEnable() protected override void OnEnable()
{ {
base.OnEnable();
SetAllDirty(); SetAllDirty();
} }
#endregion #endregion