Skip to content

Conversation

@K-Tone
Copy link
Collaborator

@K-Tone K-Tone commented Oct 29, 2025

Description

Before this change we had a minor problem where the Add Control Scheme popup window would be allowed to expand infinitely to fit its content. Addressing it by limiting the popup to only what the parent window can fit.

Testing status & QA

Local testing, pending a QA pass on it.

aa9fc5d2beace1b85ef716ab372be669

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 Anthony/isxb 1733 control scheme popup window FIX: Prevent the Add Control Scheme popup window from expanding beyond its parent's visible area Oct 29, 2025
@K-Tone K-Tone marked this pull request as ready for review October 29, 2025 09:34
@u-pr-agent
Copy link
Contributor

u-pr-agent bot commented Oct 29, 2025

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 1 🔵⚪⚪⚪⚪

The PR consists of a single-line UI style change and a changelog update, making it very quick and easy to review.
🏅 Score: 95

The PR provides a simple and effective one-line fix for a UI layout issue, accompanied by a proper changelog entry.
🧪 No relevant tests
🔒 No security concerns identified
⚡ No major issues detected

🤖 Helpful? Please react with 👍/👎 | Questions❓Please reach out in Slack #ask-u-pr-agent

Copy link
Collaborator

@ritamerkl ritamerkl left a comment

Choose a reason for hiding this comment

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

Nice, thanks for adding!

@codecov-github-com
Copy link

codecov-github-com bot commented Oct 29, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

@@             Coverage Diff             @@
##           develop    #2269      +/-   ##
===========================================
+ Coverage    76.70%   76.82%   +0.11%     
===========================================
  Files          465      476      +11     
  Lines        87919    88715     +796     
===========================================
+ Hits         67442    68153     +711     
- Misses       20477    20562      +85     
Flag Coverage Δ
inputsystem_MacOS_2022.3 5.39% <ø> (+0.01%) ⬆️
inputsystem_MacOS_2022.3_project 74.70% <ø> (+0.11%) ⬆️
inputsystem_MacOS_6000.0 5.18% <ø> (-0.01%) ⬇️
inputsystem_MacOS_6000.0_project 76.60% <ø> (+0.10%) ⬆️
inputsystem_MacOS_6000.2 5.18% <ø> (-0.01%) ⬇️
inputsystem_MacOS_6000.2_project 76.60% <ø> (+0.10%) ⬆️
inputsystem_MacOS_6000.3 5.18% <ø> (-0.01%) ⬇️
inputsystem_MacOS_6000.3_project 76.60% <ø> (+0.10%) ⬆️
inputsystem_MacOS_6000.4 5.18% <ø> (-0.01%) ⬇️
inputsystem_MacOS_6000.4_project 76.61% <ø> (+0.11%) ⬆️
inputsystem_MacOS_6000.5 5.18% <ø> (?)
inputsystem_MacOS_6000.5_project 76.62% <ø> (?)
inputsystem_Ubuntu_2022.3 5.39% <ø> (+0.01%) ⬆️
inputsystem_Ubuntu_2022.3_project 74.49% <ø> (+0.10%) ⬆️
inputsystem_Ubuntu_6000.0 5.18% <ø> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.0_project 76.41% <ø> (+0.09%) ⬆️
inputsystem_Ubuntu_6000.2 5.18% <ø> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.2_project 76.41% <ø> (+0.09%) ⬆️
inputsystem_Ubuntu_6000.3 5.18% <ø> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.3_project 76.42% <ø> (+0.10%) ⬆️
inputsystem_Ubuntu_6000.4 5.19% <ø> (-0.01%) ⬇️
inputsystem_Ubuntu_6000.4_project 76.42% <ø> (+0.09%) ⬆️
inputsystem_Ubuntu_6000.5 5.19% <ø> (?)
inputsystem_Ubuntu_6000.5_project 76.42% <ø> (?)
inputsystem_Windows_2022.3 5.39% <ø> (+0.01%) ⬆️
inputsystem_Windows_2022.3_project 74.82% <ø> (+0.09%) ⬆️
inputsystem_Windows_6000.0 5.18% <ø> (-0.01%) ⬇️
inputsystem_Windows_6000.0_project 76.73% <ø> (+0.08%) ⬆️
inputsystem_Windows_6000.2 5.18% <ø> (-0.01%) ⬇️
inputsystem_Windows_6000.2_project 76.73% <ø> (+0.08%) ⬆️
inputsystem_Windows_6000.3 5.18% <ø> (-0.01%) ⬇️
inputsystem_Windows_6000.3_project 76.73% <ø> (+0.08%) ⬆️
inputsystem_Windows_6000.4 5.18% <ø> (-0.01%) ⬇️
inputsystem_Windows_6000.4_project 76.74% <ø> (+0.09%) ⬆️
inputsystem_Windows_6000.5 5.18% <ø> (?)
inputsystem_Windows_6000.5_project 76.73% <ø> (?)

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

Files with missing lines Coverage Δ
...Editor/UITKAssetEditor/Views/ControlSchemesView.cs 0.00% <ø> (ø)

... and 25 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@K-Tone K-Tone changed the title FIX: Prevent the Add Control Scheme popup window from expanding beyond its parent's visible area FIX: [ISXB-1733] Prevent the Add Control Scheme popup window from expanding beyond its parent's visible area Oct 29, 2025
@Pauliusd01
Copy link
Collaborator

Pauliusd01 commented Oct 30, 2025

In my opinion it shouldn't expand at all, I think our menus are the only ones that do that and It's weird when it expands to full width, you delete the text and it stays wide.

@K-Tone
Copy link
Collaborator Author

K-Tone commented Oct 30, 2025

While I agree with the sentiment, I think it's against the popup design: no matter what initial size I pick, if you resize the asset window, you can always resize it such that it's smaller than the pickup and the pickup is then cut. For that reason, I think that the change is kinda right in its spirit: we do need to limit the popup by the visible area.

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.

Not sure I'm following the reasoning to keep the expansion but It's not worth fighting over something this small, this would be an improvement either way.

I did notice one bug though: Open the Projects Settings -> ProjectWideActions -> Make the Control Scheme popup expand -> scale the Project Settings window to its minimum size -> the text is squashed. Only happens once per window being opened, you have to reopen it to reproduce the bug again

30.10.2025.-.Unity.319.mp4

@K-Tone
Copy link
Collaborator Author

K-Tone commented Oct 30, 2025

Dear god, this is pretty surprising!! No idea why would the text field not repaint itself after expanding back...

@Pauliusd01
Copy link
Collaborator

Dear god, this is pretty surprising!! No idea why would the text field not repaint itself after expanding back...

It's not a big deal, clicking once inside the editor fixes it. 😄 Wouldn't mind skipping it if you decide It's not worth it

@K-Tone
Copy link
Collaborator Author

K-Tone commented Oct 31, 2025

hey @Pauliusd01, I think what you found is a minor UI Toolkit issue, it's not in our package. It doesn't repro for me on a Mac in Unity 6000.0.49
ce437c9f687f33c16e76202351ba26e0

Wonder if we could allow this change with the refresh defect that is likely to be fixed elsewhere.

@Pauliusd01 Pauliusd01 self-requested a review October 31, 2025 14:07
@Pauliusd01
Copy link
Collaborator

Pauliusd01 commented Oct 31, 2025

hey @Pauliusd01, I think what you found is a minor UI Toolkit issue, it's not in our package. It doesn't repro for me on a Mac in Unity 6000.0.49
Wonder if we could allow this change with the refresh defect that is likely to be fixed elsewhere.

I'm fine with ignoring it then

@K-Tone K-Tone merged commit 069520c into develop Nov 1, 2025
127 checks passed
@K-Tone K-Tone deleted the anthony/isxb-1733-control-scheme-popup-window branch November 1, 2025 12:50
{
text = "Add Control Scheme",
style = { position = new StyleEnum<Position>(Position.Absolute) }
style = { position = new StyleEnum<Position>(Position.Absolute), maxWidth = new StyleLength(new Length(100, LengthUnit.Percent)) }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Saw this already got merged, but I wonder if the right thing to do here was to constrain the window, wasn't it the text input field that was supposed to be constrained in size?

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