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

Fix SetCurrent value in combination with certain styles #10497

Merged
merged 3 commits into from
Mar 1, 2023

Conversation

grokys
Copy link
Member

@grokys grokys commented Feb 27, 2023

What does the pull request do?

SetCurrentValue's value was being discarded if a style with more than one setter was was re-evaluated because ValueStore.ReevaluationEffectiveValues removed the effective value.

Add a check for a current value before removing the effective value, and a unit test.

Should unblock #10370

`SetCurrent_Value_Persists_When_Toggling_Style_1` passes but `SetCurrent_Value_Persists_When_Toggling_Style_2` fails as it uses a different code-path.
`SetCurrentValue`'s value was being discarded if a style with more than one setter was was re-evaluated as `ValueStore.ReevaluationEffectiveValues` removed the effective value.
@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0030855-beta. (feed url: https://pkgs.dev.azure.com/AvaloniaUI/AvaloniaUI/_packaging/avalonia-all/nuget/v3/index.json) [PRBUILDID]

@grokys grokys disabled auto-merge February 28, 2023 15:57
@grokys grokys added this pull request to the merge queue Feb 28, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 28, 2023
@grokys grokys added this pull request to the merge queue Mar 1, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 1, 2023
@grokys grokys added this pull request to the merge queue Mar 1, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 1, 2023
@grokys grokys added this pull request to the merge queue Mar 1, 2023
Merged via the queue into master with commit e9cffd0 Mar 1, 2023
@grokys grokys deleted the fixes/setcurrent-value-with-style branch March 1, 2023 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants