Merge pull request #452 from github-for-unity/fixes/451-title-icon-loading

StanleyGoldman · web-flow · commit 086ea4aa0b2e · 2017-11-20T15:24:05.000-05:00
Regenerate title content if Unity has thrown away our logo image
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs
@@ -70,6 +70,8 @@ public override void OnDisable()
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();
+            if (titleContent.image == null)
+                titleContent = new GUIContent(ActiveView.Title, Styles.SmallLogo);
             ActiveView.OnDataUpdate();
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -112,7 +112,8 @@ public override void OnDisable()
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();
-
+            if (titleContent.image == null)
+                titleContent = new GUIContent(Title, Styles.SmallLogo);
             MaybeUpdateData();
 
             if (ActiveView != null)

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,8 @@ public override void OnDisable()`
`70`	`70`	`public override void OnDataUpdate()`
`71`	`71`	`{`
`72`	`72`	`base.OnDataUpdate();`
	`73`	`+ if (titleContent.image == null)`
	`74`	`+ titleContent = new GUIContent(ActiveView.Title, Styles.SmallLogo);`
`73`	`75`	`ActiveView.OnDataUpdate();`
`74`	`76`	`}`
`75`	`77`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ public override void OnDisable()`
`112`	`112`	`public override void OnDataUpdate()`
`113`	`113`	`{`
`114`	`114`	`base.OnDataUpdate();`
`115`		`-`
	`115`	`+ if (titleContent.image == null)`
	`116`	`+ titleContent = new GUIContent(Title, Styles.SmallLogo);`
`116`	`117`	`MaybeUpdateData();`
`117`	`118`
`118`	`119`	`if (ActiveView != null)`