Fix the UI when there are release notes and a message

shana · shana · commit 3bc7fec3a313 · 2018-05-07T20:32:38.000+02:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UpdateCheck.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UpdateCheck.cs
@@ -167,26 +167,25 @@ private void OnGUI()
             {
                 GUILayout.Space(20);
 
+                scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.Width(405), GUILayout.Height(200));
                 if (hasMessage)
                 {
-                    scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.Width(405), GUILayout.Height(200));
                     EditorGUILayout.LabelField(guiPackageMessage, "WordWrappedLabel");
-                    EditorGUILayout.EndScrollView();
                 }
 
                 if (hasReleaseNotes)
                 {
-                    scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.Width(405), GUILayout.Height(200));
                     EditorGUILayout.LabelField(guiPackageReleaseNotes, "WordWrappedLabel");
-                    EditorGUILayout.EndScrollView();
                 }
+                EditorGUILayout.EndScrollView();
             }
 
             GUILayout.Space(20);
             EditorGUILayout.BeginHorizontal();
             if (GUILayout.Button(guiDownloadNewVersion, GUILayout.Width(200)))
             {
                 Help.BrowseURL(package.Package.Url);
+                Close();
             }
 
             if (GUILayout.Button(guiSkipThisVersion, GUILayout.Width(200)))

Original file line number	Diff line number	Diff line change
`@@ -167,26 +167,25 @@ private void OnGUI()`
`167`	`167`	`{`
`168`	`168`	`GUILayout.Space(20);`
`169`	`169`
	`170`	`+ scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.Width(405), GUILayout.Height(200));`
`170`	`171`	`if (hasMessage)`
`171`	`172`	`{`
`172`		`- scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.Width(405), GUILayout.Height(200));`
`173`	`173`	`EditorGUILayout.LabelField(guiPackageMessage, "WordWrappedLabel");`
`174`		`- EditorGUILayout.EndScrollView();`
`175`	`174`	`}`
`176`	`175`
`177`	`176`	`if (hasReleaseNotes)`
`178`	`177`	`{`
`179`		`- scrollPos = EditorGUILayout.BeginScrollView(scrollPos, GUILayout.Width(405), GUILayout.Height(200));`
`180`	`178`	`EditorGUILayout.LabelField(guiPackageReleaseNotes, "WordWrappedLabel");`
`181`		`- EditorGUILayout.EndScrollView();`
`182`	`179`	`}`
	`180`	`+ EditorGUILayout.EndScrollView();`
`183`	`181`	`}`
`184`	`182`
`185`	`183`	`GUILayout.Space(20);`
`186`	`184`	`EditorGUILayout.BeginHorizontal();`
`187`	`185`	`if (GUILayout.Button(guiDownloadNewVersion, GUILayout.Width(200)))`
`188`	`186`	`{`
`189`	`187`	`Help.BrowseURL(package.Package.Url);`
	`188`	`+ Close();`
`190`	`189`	`}`
`191`	`190`
`192`	`191`	`if (GUILayout.Button(guiSkipThisVersion, GUILayout.Width(200)))`