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

Merged in sushanta1991/unity-ui-extensions-3/sushanta-chakraborty/textpiccs-edited-online-with-bitbucket-1-1565460043403 (pull request #54) 

TextPic.cs edited online with Bitbucket

Approved-by: sushanta chakraborty <kumar.suresh761651@gmail.com>
Approved-by: Simon Jackson <darkside@xna-uk.net>
pull/413/head
sushanta chakraborty 2019-08-13 20:30:07 +00:00 committed by Simon Jackson
parent 1dc2b604e2 3e580876b1
commit 9dac6864c1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/Controls/TextPic.cs
View File

@ -339,7 +339,7 @@ namespace UnityEngine.UI.Extensions {
m_HrefInfos.Add(hrefInfo); m_HrefInfos.Add(hrefInfo);
} }
else { else {
if (m_HrefInfos.Count > 0) { if (count <= m_HrefInfos.Count - 1) {
// Hyperlinks in text starting index // Hyperlinks in text starting index
m_HrefInfos[count].startIndex = (usesNewRendering ? s_TextBuilder.Length : s_TextBuilder.Length * 4); m_HrefInfos[count].startIndex = (usesNewRendering ? s_TextBuilder.Length : s_TextBuilder.Length * 4);
m_HrefInfos[count].endIndex = (usesNewRendering ? (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) : (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) * 4 + 3); m_HrefInfos[count].endIndex = (usesNewRendering ? (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) : (s_TextBuilder.Length + href_matches[i].Groups[2].Length - 1) * 4 + 3);
@ -624,12 +624,14 @@ namespace UnityEngine.UI.Extensions {
// Update the quad images // Update the quad images
updateQuad = true; updateQuad = true;
if (inspectorIconList != null) {
for (int i = 0; i < inspectorIconList.Length; i++) { for (int i = 0; i < inspectorIconList.Length; i++) {
if (inspectorIconList[i].scale == Vector2.zero) { if (inspectorIconList[i].scale == Vector2.zero) {
inspectorIconList[i].scale = Vector2.one; inspectorIconList[i].scale = Vector2.one;
} }
} }
} }
}
#endif #endif
protected override void OnEnable() { protected override void OnEnable() {