Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hotfix] Prevent tabbing or submitting from other forms. #6

Merged
merged 1 commit into from
Jul 12, 2020
Merged

[hotfix] Prevent tabbing or submitting from other forms. #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions Assets/Plugins/CandyCoded.Forms/Scripts/Form.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,19 @@ private void Update()
return;
}

var selectable = _eventSystem.currentSelectedGameObject.GetComponent<Selectable>();

var allSelectable = _eventSystem.currentSelectedGameObject.GetComponentInParent<Form>()
.GetComponentsInChildren<Selectable>();

if (!allSelectable.Contains(selectable))
{
return;
}

if (Input.GetKeyDown(KeyCode.Tab))
{
HandleTabPress();
HandleTabPress(selectable, allSelectable);
}

if (Input.GetKeyDown(KeyCode.Return))
Expand All @@ -61,14 +71,9 @@ private void Update()

}

private void HandleTabPress()
private void HandleTabPress(Selectable selectable, Selectable[] allSelectable)
{

var selectable = _eventSystem.currentSelectedGameObject.GetComponent<Selectable>();

var allSelectable = _eventSystem.currentSelectedGameObject.GetComponentInParent<Form>()
.GetComponentsInChildren<Selectable>();

var prevSelectable = selectable.FindSelectableOnUp() ?? allSelectable.Last();
var nextSelectable = selectable.FindSelectableOnDown() ?? allSelectable.First();

Expand Down