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

Commit f46c1d6

Browse files
MunchyYDLMunchyYDL
committed
* Moved the Begin/EndDisabledGroup to a wider scope.
1 parent ad40bb9 commit f46c1d6

File tree

3 files changed

+52
-66
lines changed

3 files changed

+52
-66
lines changed

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs

Lines changed: 49 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -131,41 +131,34 @@ private void HandleEnterPressed()
131131

132132
private void OnGUILogin()
133133
{
134-
GUILayout.Space(3);
135-
GUILayout.BeginHorizontal();
134+
EditorGUI.BeginDisabledGroup(isBusy);
136135
{
137-
EditorGUI.BeginDisabledGroup(isBusy);
136+
GUILayout.Space(3);
137+
GUILayout.BeginHorizontal();
138138
{
139139
username = EditorGUILayout.TextField(usernameLabel, username, Styles.TextFieldStyle);
140140
}
141-
EditorGUI.EndDisabledGroup();
142-
}
143-
GUILayout.EndHorizontal();
144-
GUILayout.Space(Styles.BaseSpacing);
145-
GUILayout.BeginHorizontal();
146-
{
147-
EditorGUI.BeginDisabledGroup(isBusy);
141+
GUILayout.EndHorizontal();
142+
143+
GUILayout.Space(Styles.BaseSpacing);
144+
GUILayout.BeginHorizontal();
148145
{
149146
password = EditorGUILayout.PasswordField(passwordLabel, password, Styles.TextFieldStyle);
150147
}
151-
EditorGUI.EndDisabledGroup();
152-
}
153-
GUILayout.EndHorizontal();
154-
155-
ShowErrorMessage();
156-
157-
GUILayout.Space(Styles.BaseSpacing + 3);
148+
GUILayout.EndHorizontal();
158149

150+
ShowErrorMessage();
159151

160-
EditorGUI.BeginDisabledGroup(isBusy);
161-
{
152+
GUILayout.Space(Styles.BaseSpacing + 3);
162153
GUILayout.BeginHorizontal();
163-
GUILayout.FlexibleSpace();
164-
if (GUILayout.Button(loginButton) || (GUI.enabled && enterPressed))
165154
{
166-
GUI.FocusControl(null);
167-
isBusy = true;
168-
AuthenticationService.Login(username, password, DoRequire2fa, DoResult);
155+
GUILayout.FlexibleSpace();
156+
if (GUILayout.Button(loginButton) || (GUI.enabled && enterPressed))
157+
{
158+
GUI.FocusControl(null);
159+
isBusy = true;
160+
AuthenticationService.Login(username, password, DoRequire2fa, DoResult);
161+
}
169162
}
170163
GUILayout.EndHorizontal();
171164
}
@@ -175,48 +168,46 @@ private void OnGUILogin()
175168
private void OnGUI2FA()
176169
{
177170
GUILayout.BeginVertical();
178-
GUILayout.Label(twofaTitle, EditorStyles.boldLabel);
179-
GUILayout.Label(twofaDescription, EditorStyles.wordWrappedLabel);
180-
181-
GUILayout.Space(Styles.BaseSpacing);
182-
183-
GUILayout.BeginHorizontal();
184171
{
172+
GUILayout.Label(twofaTitle, EditorStyles.boldLabel);
173+
GUILayout.Label(twofaDescription, EditorStyles.wordWrappedLabel);
174+
185175
EditorGUI.BeginDisabledGroup(isBusy);
186176
{
187-
two2fa = EditorGUILayout.TextField(twofaLabel, two2fa, Styles.TextFieldStyle);
188-
}
189-
EditorGUI.EndDisabledGroup();
190-
}
191-
GUILayout.EndHorizontal();
192-
GUILayout.Space(Styles.BaseSpacing);
193-
194-
ShowErrorMessage();
177+
GUILayout.Space(Styles.BaseSpacing);
178+
GUILayout.BeginHorizontal();
179+
{
180+
two2fa = EditorGUILayout.TextField(twofaLabel, two2fa, Styles.TextFieldStyle);
181+
}
182+
GUILayout.EndHorizontal();
195183

196-
GUILayout.Space(Styles.BaseSpacing);
184+
GUILayout.Space(Styles.BaseSpacing);
185+
ShowErrorMessage();
197186

198-
EditorGUI.BeginDisabledGroup(isBusy);
199-
{
200-
GUILayout.BeginHorizontal();
201-
GUILayout.FlexibleSpace();
202-
if (GUILayout.Button(backButton))
203-
{
204-
GUI.FocusControl(null);
205-
need2fa = false;
206-
Redraw();
207-
}
187+
GUILayout.Space(Styles.BaseSpacing);
188+
GUILayout.BeginHorizontal();
189+
{
190+
GUILayout.FlexibleSpace();
191+
if (GUILayout.Button(backButton))
192+
{
193+
GUI.FocusControl(null);
194+
need2fa = false;
195+
Redraw();
196+
}
197+
198+
if (GUILayout.Button(twofaButton) || (GUI.enabled && enterPressed))
199+
{
200+
GUI.FocusControl(null);
201+
isBusy = true;
202+
AuthenticationService.LoginWith2fa(two2fa);
203+
}
204+
}
205+
GUILayout.EndHorizontal();
208206

209-
if (GUILayout.Button(twofaButton) || (GUI.enabled && enterPressed))
210-
{
211-
GUI.FocusControl(null);
212-
isBusy = true;
213-
AuthenticationService.LoginWith2fa(two2fa);
207+
GUILayout.Space(Styles.BaseSpacing);
214208
}
215-
GUILayout.EndHorizontal();
209+
EditorGUI.EndDisabledGroup();
216210
}
217-
EditorGUI.EndDisabledGroup();
218-
219-
GUILayout.Space(Styles.BaseSpacing);
220211
GUILayout.EndVertical();
221212
}
222213

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,20 +355,16 @@ public void OnEmbeddedGUI()
355355

356356
if (isPublished)
357357
{
358-
// Fetch button
359358
EditorGUI.BeginDisabledGroup(currentRemote == null);
360359
{
360+
// Fetch button
361361
var fetchClicked = GUILayout.Button(FetchButtonText, Styles.HistoryToolbarButtonStyle);
362362
if (fetchClicked)
363363
{
364364
Fetch();
365365
}
366-
}
367-
EditorGUI.EndDisabledGroup();
368366

369-
// Pull button
370-
EditorGUI.BeginDisabledGroup(currentRemote == null);
371-
{
367+
// Pull button
372368
var pullButtonText = statusBehind > 0 ? String.Format(PullButtonCount, statusBehind) : PullButton;
373369
var pullClicked = GUILayout.Button(pullButtonText, Styles.HistoryToolbarButtonStyle);
374370

‎src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ public override void OnGUI()
138138
GUILayout.BeginVertical();
139139
{
140140
GUILayout.Label(SelectedOwnerLabel);
141-
142141
selectedOwner = EditorGUILayout.Popup(selectedOwner, owners);
143142
}
144143
GUILayout.EndVertical();
@@ -179,7 +178,7 @@ public override void OnGUI()
179178
}
180179
GUILayout.EndHorizontal();
181180
}
182-
GUILayout.EndVertical();;
181+
GUILayout.EndVertical();
183182

184183
GUILayout.Space(Styles.PublishViewSpacingHeight);
185184

0 commit comments

Comments
 (0)