pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patches from PR

pull/413/head
Simon Jackson 2021-09-05 15:39:28 +01:00
parent 9363fd3221
commit 6333967b9a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/Scripts/Utilities/UIHighlightable.cs
View File

@ -32,20 +32,20 @@ namespace UnityEngine.UI.Extensions
{ {
m_Interactable = value; m_Interactable = value;
HighlightInteractable(m_Graphic); HighlightInteractable(m_Graphic);
OnInteractableChanged.Invoke(m_Interactable); OnInteractableChanged?.Invoke(m_Interactable);
if(!m_Interactable) if(!m_Interactable)
{ {
if(m_Highlighted) if(m_Highlighted)
{ {
m_Highlighted = false; m_Highlighted = false;
OnHighlightChanged.Invoke(false); OnHighlightChanged?.Invoke(false);
} }
if(m_Pressed) if(m_Pressed)
{ {
m_Pressed = false; m_Pressed = false;
OnPressChanged.Invoke(false); OnPressChanged?.Invoke(false);
} }
} }
} }
@ -61,7 +61,7 @@ namespace UnityEngine.UI.Extensions
if(!m_ClickToHold && m_Pressed) if(!m_ClickToHold && m_Pressed)
{ {
m_Pressed = false; m_Pressed = false;
OnPressChanged.Invoke(false); OnPressChanged?.Invoke(false);
} }
} }
} }
@ -77,7 +77,7 @@ namespace UnityEngine.UI.Extensions
HighlightInteractable(m_Graphic); HighlightInteractable(m_Graphic);
if(m_Interactable) if(m_Interactable)
{ {
OnHighlightChanged.Invoke(m_Highlighted); OnHighlightChanged?.Invoke(m_Highlighted);
} }
} }
} }
@ -94,7 +94,7 @@ namespace UnityEngine.UI.Extensions
m_Graphic.color = (m_Pressed ? PressedColor : NormalColor); m_Graphic.color = (m_Pressed ? PressedColor : NormalColor);
if(m_Interactable) if(m_Interactable)
{ {
OnPressChanged.Invoke(m_Pressed); OnPressChanged?.Invoke(m_Pressed);
} }
} }
} }
@ -127,7 +127,7 @@ namespace UnityEngine.UI.Extensions
{ {
m_Highlighted = true; m_Highlighted = true;
m_Graphic.color = HighlightedColor; m_Graphic.color = HighlightedColor;
OnHighlightChanged.Invoke(true); OnHighlightChanged?.Invoke(true);
} }
} }
@ -137,7 +137,7 @@ namespace UnityEngine.UI.Extensions
{ {
m_Highlighted = false; m_Highlighted = false;
m_Graphic.color = NormalColor; m_Graphic.color = NormalColor;
OnHighlightChanged.Invoke(false); OnHighlightChanged?.Invoke(false);
} }
} }
@ -155,12 +155,12 @@ namespace UnityEngine.UI.Extensions
else else
{ {
m_Pressed = true; m_Pressed = true;
OnPressChanged.Invoke(true); OnPressChanged?.Invoke(true);
} }
} }
else else
{ {
OnPressChanged.Invoke(true); OnPressChanged?.Invoke(true);
} }
} }
} }
@ -172,7 +172,7 @@ namespace UnityEngine.UI.Extensions
HighlightInteractable(m_Graphic); HighlightInteractable(m_Graphic);
if(m_Interactable) if(m_Interactable)
{ {
OnPressChanged.Invoke(false); OnPressChanged?.Invoke(false);
} }
} }
} }