-
Notifications
You must be signed in to change notification settings - Fork 324
PoC for device flag clarity #2039
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.
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
Draft
ekcoh
wants to merge
1
commit into
develop
Choose a base branch
from
isx-2177-device-flag-clarity
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
Packages/com.unity.inputsystem/InputSystem/Editor/Internal/DeviceFlagsTreeView.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,136 @@ | ||||||
| using UnityEditor; | ||||||
| using UnityEditor.IMGUI.Controls; | ||||||
|
|
||||||
| #if UNITY_EDITOR | ||||||
|
|
||||||
| namespace UnityEngine.InputSystem.Editor | ||||||
| { | ||||||
| public class DeviceFlagsTreeView : TreeView | ||||||
| { | ||||||
| private InputDevice m_Device; | ||||||
|
|
||||||
| private enum ColumnId | ||||||
| { | ||||||
| Name, | ||||||
| Value, | ||||||
| COUNT | ||||||
| } | ||||||
|
|
||||||
| public static DeviceFlagsTreeView Create(InputDevice device, ref TreeViewState treeState, ref MultiColumnHeaderState headerState) | ||||||
| { | ||||||
| if (treeState == null) | ||||||
| treeState = new TreeViewState(); | ||||||
|
|
||||||
| var newHeaderState = CreateHeaderState(); | ||||||
| if (headerState != null) | ||||||
| MultiColumnHeaderState.OverwriteSerializedFields(headerState, newHeaderState); | ||||||
| headerState = newHeaderState; | ||||||
|
|
||||||
| var header = new MultiColumnHeader(headerState); | ||||||
| return new DeviceFlagsTreeView(treeState, header, device); | ||||||
| } | ||||||
|
|
||||||
| private static MultiColumnHeaderState CreateHeaderState() | ||||||
| { | ||||||
| var columns = new MultiColumnHeaderState.Column[(int)ColumnId.COUNT]; | ||||||
|
|
||||||
| columns[(int)ColumnId.Name] = new MultiColumnHeaderState.Column() | ||||||
| { | ||||||
| width = 320, | ||||||
| minWidth = 60, | ||||||
| headerContent = new GUIContent("Name"), | ||||||
| canSort = false | ||||||
| }; | ||||||
| columns[(int)ColumnId.Value] = new MultiColumnHeaderState.Column() | ||||||
| { | ||||||
| width = 80, | ||||||
| minWidth = 60, | ||||||
| headerContent = new GUIContent("Value"), | ||||||
| canSort = false | ||||||
| }; | ||||||
|
|
||||||
| return new MultiColumnHeaderState(columns); | ||||||
| } | ||||||
|
|
||||||
| private DeviceFlagsTreeView(TreeViewState state, MultiColumnHeader multiColumnHeader, InputDevice device) | ||||||
| : base(state, multiColumnHeader) | ||||||
| { | ||||||
| m_Device = device; | ||||||
| Reload(); | ||||||
| } | ||||||
|
|
||||||
| private void AddFlag(TreeViewItem root, InputDevice.DeviceFlags flag) | ||||||
| { | ||||||
| root.AddChild(new FlagItem() | ||||||
| { | ||||||
| id = 1, | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Each FlagItem is assigned the same id, which may result in duplicate IDs in the tree view. Consider generating unique ids for each flag, for example by hashing the flag value or using an incremental counter.
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
| depth = 1, | ||||||
| displayName = "", | ||||||
| Flag = flag | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| protected override TreeViewItem BuildRoot() | ||||||
| { | ||||||
| var root = new TreeViewItem { id = 0, depth = -1, displayName = "Root" }; | ||||||
|
|
||||||
| AddFlag(root, InputDevice.DeviceFlags.Native); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.Remote); | ||||||
|
|
||||||
| AddFlag(root, InputDevice.DeviceFlags.CanRunInBackground); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.CanRunInBackgroundHasBeenQueried); | ||||||
|
|
||||||
| AddFlag(root, InputDevice.DeviceFlags.UpdateBeforeRender); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.HasStateCallbacks); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.HasControlsWithDefaultState); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.HasDontResetControls); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.HasEventMerger); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.HasEventPreProcessor); | ||||||
|
|
||||||
| AddFlag(root, InputDevice.DeviceFlags.DisabledInFrontend); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.DisabledInRuntime); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.DisabledWhileInBackground); | ||||||
| AddFlag(root, InputDevice.DeviceFlags.DisabledStateHasBeenQueriedFromRuntime); | ||||||
|
|
||||||
| return root; | ||||||
| } | ||||||
|
|
||||||
| protected override void RowGUI(RowGUIArgs args) | ||||||
| { | ||||||
| var columnCount = args.GetNumVisibleColumns(); | ||||||
| for (var i = 0; i < columnCount; ++i) | ||||||
| { | ||||||
| var item = (FlagItem)args.item; | ||||||
| ColumnGUI(args.GetCellRect(i), item.Flag, args.GetColumn(i)); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private unsafe void ColumnGUI(Rect cellRect, InputDevice.DeviceFlags flag, int column) | ||||||
| { | ||||||
| CenterRectUsingSingleLineHeight(ref cellRect); | ||||||
|
|
||||||
| switch (column) | ||||||
| { | ||||||
| case (int)ColumnId.Name: | ||||||
| GUI.Label(cellRect, flag.ToString()); | ||||||
| break; | ||||||
| case (int)ColumnId.Value: | ||||||
| { | ||||||
| var isSet = ((m_Device.m_DeviceFlags & flag) != 0); | ||||||
| if (isSet) | ||||||
| GUI.Label(cellRect, "true", EditorStyles.boldLabel); | ||||||
| else | ||||||
| GUI.Label(cellRect, "false"); | ||||||
| } | ||||||
| break; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private class FlagItem : TreeViewItem | ||||||
| { | ||||||
| public InputDevice.DeviceFlags Flag; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| #endif // UNITY_EDITOR | ||||||
3 changes: 3 additions & 0 deletions
3
Packages/com.unity.inputsystem/InputSystem/Editor/Internal/DeviceFlagsTreeView.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] Typo found in the label text "DisabledWWhileInBackground". It should likely be corrected to "DisabledWhileInBackground".
Copilot uses AI. Check for mistakes.