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.

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

[ShaderGraph][2022.1] Fix 1356725 - incorrect appearance of warning message in Node Settings #5672

Merged
merged 3 commits into from
Sep 15, 2021

Conversation

jessebarker
Copy link
Contributor

@jessebarker jessebarker commented Sep 15, 2021

Purpose of this PR

This PR fixes https://fogbugz.unity3d.com/f/cases/1356725/

The behavior for the HelpBoxRow changed and this instance did not get updated. This change updates the one use (that I could find) that doesn't handle the label setup correctly. With this change, we match the "without" image in the bug report - i.e., the text is both in the correct color and the text wraps so that the whole message is viewable.

Fixed (labeled "without" in the bug report):
image

Broken (labeled "with" in the bug report):
image


Testing status

Manual testing according to the repro steps in the bug report. I could not find any other uses of HelpBoxRow with message type warning elsewhere in the code base, so, contrary to the claim in the bug, I could not make a node with an error (e.g., an invalid custom function node) generate a similar warning in Node Settings.

For when the checks inevitably get erased (due to resolving changelog conflicts):
PR ShaderGraph on trunk


Comments to reviewers

Notes for the reviewers you have assigned.

@github-actions
Copy link

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://yamato.cds.internal.unity3d.com/jobs/902-Graphics
Search for your PR branch using the sidebar on the left, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

Shader Graph
/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_trunk
Depending on your PR, you may also want
/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_trunk
/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_trunk

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

@jessebarker jessebarker marked this pull request as ready for review September 15, 2021 18:26
@jessebarker jessebarker requested a review from a team as a code owner September 15, 2021 18:26
Copy link
Contributor

@Nightmask3 Nightmask3 left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@jessebarker jessebarker merged commit f0467f4 into master Sep 15, 2021
@jessebarker jessebarker deleted the sg-fix-1356725 branch September 15, 2021 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants