Skip to content

Conversation

@K-Tone
Copy link
Collaborator

@K-Tone K-Tone commented Jun 30, 2025

This reverts commit 2a37caa.

Description

We received a regression from a fix for ISXB-1221 that makes it impossible to have more than one InputControl components at the same time. This is caused by the static variable used internally. We have to roll this back and return back to the drawing board in order to have a better fix for the original case. I'm closing the regression as fixed and reopening ISXB-1221 instead.

Testing status & QA

Local testing

Overall Product Risks

  • Complexity: Low
  • Halo Effect: Low

Checklist

Before review:

  • Changelog entry added.
    • Explains the change in Changed, Fixed, Added sections.
    • For API change contains an example snippet and/or migration example.
    • JIRA ticket linked, example (case %%). If it is a private issue, just add the case ID without a link.
    • Jira port for the next release set as "Resolved".
  • Tests added/changed, if applicable.
    • Functional tests Area_CanDoX, Area_CanDoX_EvenIfYIsTheCase, Area_WhenIDoX_AndYHappens_ThisIsTheResult.
    • Performance tests.
    • Integration tests.
  • Docs for new/changed API's.
    • Xmldoc cross references are set correctly.
    • Added explanation how the API works.
    • Usage code examples added.
    • The manual is updated, if needed.

During merge:

  • Commit message for squash-merge is prefixed with one of the list:
    • NEW: ___.
    • FIX: ___.
    • DOCS: ___.
    • CHANGE: ___.
    • RELEASE: 1.1.0-preview.3.

After merge:

  • Create forward/backward port if needed. If you are blocked from creating a forward port now please add a task to ISX-1444.

@K-Tone K-Tone changed the title Revert "FIX: ISXB-1221 input action binding discarded (#2119)" FIX: All InputControl change when modifying one Jun 30, 2025
@K-Tone K-Tone changed the title FIX: All InputControl change when modifying one FIX: All InputControls change when modifying one Jun 30, 2025
@K-Tone K-Tone marked this pull request as ready for review June 30, 2025 13:07
@K-Tone K-Tone requested review from Pauliusd01 and ekcoh June 30, 2025 13:08
@codecov-github-com
Copy link

codecov-github-com bot commented Jun 30, 2025

Codecov Report

Attention: Patch coverage is 0% with 19 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...tem/Editor/ControlPicker/InputControlPathEditor.cs 0.00% 15 Missing ⚠️
...Editor/ControlPicker/InputControlPickerDropdown.cs 0.00% 3 Missing ⚠️
...m/Editor/PropertyDrawers/InputControlPathDrawer.cs 0.00% 1 Missing ⚠️
@@             Coverage Diff             @@
##           develop    #2199      +/-   ##
===========================================
- Coverage    67.78%   67.78%   -0.01%     
===========================================
  Files          367      367              
  Lines        53538    53545       +7     
===========================================
  Hits         36293    36293              
- Misses       17245    17252       +7     
Flag Coverage Δ
mac_2021.3_pkg 5.41% <0.00%> (-0.01%) ⬇️
mac_2021.3_project 70.41% <0.00%> (-0.02%) ⬇️
mac_2022.3_pkg 5.19% <0.00%> (-0.01%) ⬇️
mac_2022.3_project 65.27% <0.00%> (-0.01%) ⬇️
mac_6000.0_pkg 5.19% <0.00%> (-0.01%) ⬇️
mac_6000.0_project 67.69% <0.00%> (-0.01%) ⬇️
mac_6000.1_pkg 5.19% <0.00%> (-0.01%) ⬇️
mac_6000.1_project 67.69% <0.00%> (-0.01%) ⬇️
mac_6000.2_pkg 5.19% <0.00%> (-0.01%) ⬇️
mac_6000.2_project 67.70% <0.00%> (+<0.01%) ⬆️
mac_trunk_pkg 5.19% <0.00%> (-0.01%) ⬇️
mac_trunk_project 67.68% <0.00%> (-0.01%) ⬇️
win_2021.3_pkg 5.41% <0.00%> (-0.01%) ⬇️
win_2021.3_project 70.48% <0.00%> (-0.02%) ⬇️
win_2022.3_pkg 5.19% <0.00%> (-0.01%) ⬇️
win_2022.3_project 65.35% <0.00%> (-0.01%) ⬇️
win_6000.0_pkg 5.20% <0.00%> (-0.01%) ⬇️
win_6000.0_project 67.76% <0.00%> (-0.01%) ⬇️
win_6000.1_pkg 5.20% <0.00%> (-0.01%) ⬇️
win_6000.1_project 67.76% <0.00%> (+0.09%) ⬆️
win_6000.2_pkg 5.20% <0.00%> (-0.01%) ⬇️
win_6000.2_project 67.77% <0.00%> (+<0.01%) ⬆️
win_trunk_pkg 5.20% <0.00%> (-0.01%) ⬇️
win_trunk_project 67.76% <0.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...m/Editor/PropertyDrawers/InputControlPathDrawer.cs 0.00% <0.00%> (ø)
...Editor/ControlPicker/InputControlPickerDropdown.cs 44.26% <0.00%> (-0.36%) ⬇️
...tem/Editor/ControlPicker/InputControlPathEditor.cs 0.00% <0.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Collaborator

@ekcoh ekcoh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert looks correct to me. Guess the reverted case is reopened as part of landing this revert.

@Pauliusd01
Copy link
Collaborator

Pauliusd01 commented Jul 1, 2025

I don't know if I agree that reverting this is the best option as the older bug will be noticed by everyone and the one being fixed here not as much. Maybe keep this one off from the upcoming release? Or someone can smack some sense into me I don't know, just feels like we're trading pinky pain to a headache

@jfreire-unity
Copy link
Collaborator

I don't know if I agree that reverting this is the best option as the older bug will be noticed by everyone and the one being fixed here not as much. Maybe keep this one off from the upcoming release? Or someone can smack some sense into me I don't know, just feels like we're trading pinky pain to a headache

Based on this, I'd prefer we don't land this in the upcoming release and revert+fix in the next one.

@jfreire-unity
Copy link
Collaborator

My reasoning is that the fix we're reverting in this PR was a 6.1 release concern issue. So we should avoid reintroducing it.

Copy link
Collaborator

@Pauliusd01 Pauliusd01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update: I thought the bug with ISXB-1531 was purely in the UI which wouldn't affect as many users but it doesn't let you switch paths even via scripts making it severe. So it was indeed the right call to revert this.

I checked that this fixes the bug and did not notice any other problems besides the one we already know about.

@K-Tone K-Tone merged commit 0f3413d into develop Jul 1, 2025
132 of 135 checks passed
@K-Tone K-Tone deleted the anthony/isxb-1531-static-inputcontrol-revert branch July 1, 2025 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants