Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 27fba8f

Browse files
Merge branch 'enhancements/git-path-save-button' into enhancements/git-path-view
# Conflicts: # src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
2 parents c0d6e62 + 9ba09e6 commit 27fba8f

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,25 @@ public override void OnGUI()
5959
EditorGUI.BeginDisabledGroup(IsBusy || Parent.IsBusy);
6060
{
6161
// Install path field
62-
//EditorGUI.BeginChangeCheck();
62+
GUILayout.BeginHorizontal();
6363
{
64-
GUILayout.BeginHorizontal();
65-
{
66-
newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
64+
newGitExec = EditorGUILayout.TextField(PathToGit, newGitExec);
6765

68-
if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
69-
{
70-
GUI.FocusControl(null);
66+
if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
67+
{
68+
GUI.FocusControl(null);
7169

72-
var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
73-
gitExecParent,
74-
gitExecExtension);
70+
var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
71+
gitExecParent,
72+
gitExecExtension);
7573

76-
if (!string.IsNullOrEmpty(newValue))
77-
{
78-
newGitExec = newValue;
79-
}
74+
if (!string.IsNullOrEmpty(newValue))
75+
{
76+
newGitExec = newValue;
8077
}
8178
}
82-
GUILayout.EndHorizontal();
8379
}
80+
GUILayout.EndHorizontal();
8481

8582
GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
8683

0 commit comments

Comments
 (0)