Skip to content

Conversation

@timkeo
Copy link
Collaborator

@timkeo timkeo commented May 9, 2024

Description

An issue with the trunk merge was brought up on this Slack thread. I don't fully understand the problem but made a lucky guess.

Changes made

Changed the d_InputControl.png asset reference from "url" to "resource".
This matches the other asset references within InputActionsEditorStyles.uss and appeared to fix the Package validation test failure.

Proof of fix: https://unity-ci.cds.internal.unity3d.com/project/2354/branch/timke%2Ftrunk-merge-test

NOTE: The fix for Neutron was pushed onto this trunk-merge branch and should (eventually) land to Neutron main. A forward port shouldn't be necessary.

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.
    • FogBugz ticket attached, example ([case %number%](https://issuetracker.unity3d.com/issues/...)).
    • FogBugz is marked as "Resolved" with next release version correctly set.
  • 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.

@timkeo timkeo requested review from Pauliusd01 and ekcoh May 9, 2024 20:55
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.

LGTM, checked the icon in question and it still works fine, albeit a bit blurry. Though that can be looked at later, this even fixes the blockyness I complained about ages ago on higher DPI screens

image

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.

Good catch, LGTM

@timkeo
Copy link
Collaborator Author

timkeo commented May 14, 2024

Failure for tvOS test is due to an infrastructure issue and unrelated to this PR.

@timkeo timkeo merged commit c2f4dea into develop May 14, 2024
@timkeo timkeo deleted the fix-package-verification-test branch May 14, 2024 18:14
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.

4 participants