Merge pull request #761 from github-for-unity/fixes/gitpath-buttons-state-nitpick

shana · web-flow · commit fa6bc90a0b70 · 2018-05-16T18:14:35.000+02:00
Capturing when the GitPathView has changes in a property
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs
@@ -96,7 +96,7 @@ public override void OnGUI()
                         }
                         if (EditorGUI.EndChangeCheck())
                         {
-                            changingManually = gitPath != installationState.GitExecutablePath || gitLfsPath != installationState.GitLfsExecutablePath;
+                            changingManually = ViewHasChanges;
                         }
                     }
                     GUILayout.EndHorizontal();
@@ -123,7 +123,7 @@ public override void OnGUI()
                         }
                         if (EditorGUI.EndChangeCheck())
                         {
-                            changingManually = gitPath != installationState.GitExecutablePath || gitLfsPath != installationState.GitLfsExecutablePath;;
+                            changingManually = ViewHasChanges;
                             errorMessage = "";
                         }
                     }
@@ -160,7 +160,7 @@ public override void OnGUI()
                             if (Environment.IsWindows)
                                 gitPath = installDetails.GitExecutablePath;
                             gitLfsPath = installDetails.GitLfsExecutablePath;
-                            resetToBundled = gitPath != installationState.GitExecutablePath || gitLfsPath != installationState.GitLfsExecutablePath;
+                            resetToBundled = ViewHasChanges;
                             resetToSystem = false;
                             changingManually = false;
                             errorMessage = "";
@@ -197,7 +197,7 @@ public override void OnGUI()
                                 }
                                 isBusy = false;
                                 resetToBundled = false;
-                                resetToSystem = gitPath != installationState.GitExecutablePath || gitLfsPath != installationState.GitLfsExecutablePath;
+                                resetToSystem = ViewHasChanges;
                                 changingManually = false;
                                 errorMessage = "";
                                 Redraw();
@@ -338,6 +338,14 @@ private void ValidateAndSetGitInstallPath()
             }
         }
 
+        public bool ViewHasChanges
+        {
+            get
+            {
+                return gitPath != installationState.GitExecutablePath || gitLfsPath != installationState.GitLfsExecutablePath;
+            }
+        }
+
         public override bool IsBusy
         {
             get { return isBusy; }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public override void OnGUI()`
`96`	`96`	`}`
`97`	`97`	`if (EditorGUI.EndChangeCheck())`
`98`	`98`	`{`
`99`		`- changingManually = gitPath != installationState.GitExecutablePath \|\| gitLfsPath != installationState.GitLfsExecutablePath;`
	`99`	`+ changingManually = ViewHasChanges;`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`GUILayout.EndHorizontal();`
`@@ -123,7 +123,7 @@ public override void OnGUI()`
`123`	`123`	`}`
`124`	`124`	`if (EditorGUI.EndChangeCheck())`
`125`	`125`	`{`
`126`		`- changingManually = gitPath != installationState.GitExecutablePath \|\| gitLfsPath != installationState.GitLfsExecutablePath;;`
	`126`	`+ changingManually = ViewHasChanges;`
`127`	`127`	`errorMessage = "";`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -160,7 +160,7 @@ public override void OnGUI()`
`160`	`160`	`if (Environment.IsWindows)`
`161`	`161`	`gitPath = installDetails.GitExecutablePath;`
`162`	`162`	`gitLfsPath = installDetails.GitLfsExecutablePath;`
`163`		`- resetToBundled = gitPath != installationState.GitExecutablePath \|\| gitLfsPath != installationState.GitLfsExecutablePath;`
	`163`	`+ resetToBundled = ViewHasChanges;`
`164`	`164`	`resetToSystem = false;`
`165`	`165`	`changingManually = false;`
`166`	`166`	`errorMessage = "";`
`@@ -197,7 +197,7 @@ public override void OnGUI()`
`197`	`197`	`}`
`198`	`198`	`isBusy = false;`
`199`	`199`	`resetToBundled = false;`
`200`		`- resetToSystem = gitPath != installationState.GitExecutablePath \|\| gitLfsPath != installationState.GitLfsExecutablePath;`
	`200`	`+ resetToSystem = ViewHasChanges;`
`201`	`201`	`changingManually = false;`
`202`	`202`	`errorMessage = "";`
`203`	`203`	`Redraw();`
`@@ -338,6 +338,14 @@ private void ValidateAndSetGitInstallPath()`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`
	`341`	`+ public bool ViewHasChanges`
	`342`	`+ {`
	`343`	`+ get`
	`344`	`+ {`
	`345`	`+ return gitPath != installationState.GitExecutablePath \|\| gitLfsPath != installationState.GitLfsExecutablePath;`
	`346`	`+ }`
	`347`	`+ }`
	`348`	`+`
`341`	`349`	`public override bool IsBusy`
`342`	`350`	`{`
`343`	`351`	`get { return isBusy; }`