Skip to content

fix: Fix animation setters not executed if a transition contains RepositionThemeAnimation (backport #13324) - #13330

Merged
jeromelaban merged 4 commits into
legacy/4xfrom
mergify/bp/legacy/4x/pr-13324
Aug 21, 2023
Merged

fix: Fix animation setters not executed if a transition contains RepositionThemeAnimation (backport #13324)#13330
jeromelaban merged 4 commits into
legacy/4xfrom
mergify/bp/legacy/4x/pr-13324

Conversation

@mergify

@mergify mergify Bot commented Aug 21, 2023 •
edited by Youssef1313
Loading

Copy link
Copy Markdown
Contributor

Closes #13303
This is an automatic backport of pull request #13324 done by Mergify.
Cherry-pick of 0cc8296 has failed:

On branch mergify/bp/legacy/4x/pr-13324
Your branch is up to date with 'origin/legacy/4x'.

You are currently cherry-picking commit 0cc8296615.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/Uno.UI/UI/Xaml/Controls/ToggleSwitch/ToggleSwitch.mux.cs
	deleted:    src/Uno.UI/UI/Xaml/Media/Animation/PointerUpThemeAnimation.cs
	new file:   src/Uno.UI/UI/Xaml/Media/Animation/RepositionThemeAnimation.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Media.Animation/RepositionThemeAnimation.cs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@Youssef1313 @mergify
chore: Remove workaround
66943c4 
(cherry picked from commit 0cc8296)

# Conflicts:
#	src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Media.Animation/RepositionThemeAnimation.cs
@Youssef1313 @mergify
chore: Remove workaround
3536962 
(cherry picked from commit 74b2bf7)
@mergify mergify Bot added the conflicts label Aug 21, 2023
@mergify mergify Bot mentioned this pull request Aug 21, 2023
Merged
6 tasks
@Youssef1313 Youssef1313 linked an issue Aug 21, 2023 that may be closed by this pull request
[ToggleSwitch/GTK/WASM] Thumb in wrong position when adding Shadows #13303
Closed
@jeromelaban
jeromelaban enabled auto-merge August 21, 2023 13:52
@jeromelaban
jeromelaban disabled auto-merge August 21, 2023 15:15
@github-actions github-actions Bot added the area/build Categorizes an issue or PR as relevant to build infrastructure label Aug 21, 2023
@jeromelaban
jeromelaban merged commit 71e2ded into legacy/4x Aug 21, 2023
@jeromelaban
jeromelaban deleted the mergify/bp/legacy/4x/pr-13324 branch August 21, 2023 15:31
@Youssef1313 Youssef1313 mentioned this pull request Aug 21, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jeromelaban jeromelaban jeromelaban approved these changes
@agneszitte agneszitte agneszitte approved these changes

Assignees

No one assigned

Labels

area/build Categorizes an issue or PR as relevant to build infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[ToggleSwitch/GTK/WASM] Thumb in wrong position when adding Shadows

3 participants

@jeromelaban @agneszitte @Youssef1313