Browse Source

Merge branch 'develop'

master
Steve Halliwell 5 years ago
parent
commit
ed688e1a09
  1. 14
      Assets/Fungus/Scripts/Editor/ViewEditor.cs
  2. 12
      Assets/Fungus/Scripts/Utils/TMProLinkAnimLookup.cs
  3. 7
      Assets/Fungus/Scripts/Utils/VariableUtil.cs

14
Assets/Fungus/Scripts/Editor/ViewEditor.cs

@ -18,17 +18,13 @@ namespace Fungus.EditorUtils
// Draw Views when they're not selected // Draw Views when they're not selected
#if UNITY_5_0 #if UNITY_5_0
[DrawGizmo(GizmoType.NotSelected | GizmoType.SelectedOrChild)] [DrawGizmo(GizmoType.NotSelected | GizmoType.SelectedOrChild, typeof(View))]
#else #else
[DrawGizmo(GizmoType.NotInSelectionHierarchy | GizmoType.InSelectionHierarchy)] [DrawGizmo(GizmoType.NotInSelectionHierarchy | GizmoType.InSelectionHierarchy, typeof(View))]
#endif #endif
static void RenderCustomGizmo(Transform objectTransform, GizmoType gizmoType) public static void RenderCustomGizmo(View view, GizmoType gizmoType)
{ {
View view = objectTransform.gameObject.GetComponent<View>(); DrawView(view, false);
if (view != null)
{
DrawView(view, false);
}
} }
protected virtual Vector2 LookupAspectRatio(int index) protected virtual Vector2 LookupAspectRatio(int index)
@ -264,4 +260,4 @@ namespace Fungus.EditorUtils
return view.transform.InverseTransformPoint(view.transform.position + new Vector3(0, view.ViewSize, 0)).magnitude; return view.transform.InverseTransformPoint(view.transform.position + new Vector3(0, view.ViewSize, 0)).magnitude;
} }
} }
} }

12
Assets/Fungus/Scripts/Utils/TMProLinkAnimLookup.cs

@ -81,17 +81,23 @@ namespace Fungus
static public void AddHelper(string linkIdText, TMProAnimFunc func) static public void AddHelper(string linkIdText, TMProAnimFunc func)
{ {
LinkHashToEffect.Add(TMPro.TMP_TextUtilities.GetSimpleHashCode(linkIdText), func); var hashCode = TMPro.TMP_TextUtilities.GetSimpleHashCode(linkIdText);
if(!LinkHashToEffect.ContainsKey(hashCode))
LinkHashToEffect.Add(hashCode, func);
} }
static public void AddHelper(string linkIdText, TMProLinkAnimEffects.BaseEffect baseEffect) static public void AddHelper(string linkIdText, TMProLinkAnimEffects.BaseEffect baseEffect)
{ {
LinkHashToEffect.Add(TMPro.TMP_TextUtilities.GetSimpleHashCode(linkIdText), baseEffect.DoEffect); var hashCode = TMPro.TMP_TextUtilities.GetSimpleHashCode(linkIdText);
if (!LinkHashToEffect.ContainsKey(hashCode))
LinkHashToEffect.Add(TMPro.TMP_TextUtilities.GetSimpleHashCode(linkIdText), baseEffect.DoEffect);
} }
static public void Remove(string linkIdText) static public void Remove(string linkIdText)
{ {
LinkHashToEffect.Remove(TMPro.TMP_TextUtilities.GetSimpleHashCode(linkIdText)); var hashCode = TMPro.TMP_TextUtilities.GetSimpleHashCode(linkIdText);
if (LinkHashToEffect.ContainsKey(hashCode))
LinkHashToEffect.Remove(hashCode);
} }
static public void RemoveAll() static public void RemoveAll()

7
Assets/Fungus/Scripts/Utils/VariableUtil.cs

@ -65,8 +65,11 @@ namespace Fungus
break; break;
case SetOperator.Divide: case SetOperator.Divide:
return "/="; //https://answers.unity.com/questions/398495/can-genericmenu-item-content-display-.html
break; // '/' in a menu means submenu and because it had no leading text, Unity thinks we want a spacer
// using unicode alternates for / fix the problem.
return "\u200A\u2215\u200A=";
break;
} }
return string.Empty; return string.Empty;

Loading…
Cancel
Save