Merge pull request #21772 from unoplatform/mergify/bp/release/stable/6.4/pr-21721

fix(skia): closed flyout still linger on screen (backport #21721)

Author: agneszitte

build/ci/tests/.azure-devops-tests-windows-skia.yml

@@ -125,56 +125,56 @@ jobs:
       ArtifactName: uitests-failure-results
       ArtifactType: Container
 
-- job: Uno_Islands_Skia_Wpf_Runtime_Tests_Build
-  displayName: 'WPF Islands Runtime Tests'
-  timeoutInMinutes: 45
-  cancelTimeoutInMinutes: 1
-  condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
-  pool:
-    vmImage: ${{ parameters.vmImage }}
-
-  variables:
-    SamplesAppArtifactName: uno-islands-skia-wpf-samples-app-WinUI
-    SamplesAppArtifactPath: $(build.sourcesdirectory)/build/$(SamplesAppArtifactName)
-
-    UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
-    XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
-
-  steps:
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Downloading $(SamplesAppArtifactName)
-    inputs:
-      artifact: $(SamplesAppArtifactName)
-      path: $(build.sourcesdirectory)/build/$(SamplesAppArtifactName)
-
-  - task: DownloadBuildArtifacts@0
-    condition: gt(variables['System.JobAttempt'], 1)
-    continueOnError: true
-    displayName: Download previous test runs failed tests
-    inputs:
-        artifactName: uitests-failure-results
-        downloadPath: '$(build.sourcesdirectory)/build'
-
-  - template: ../templates/dotnet-install.yml
-
-  - pwsh: build/test-scripts/run-windows-islands-skia-runtime-tests.ps1
-    displayName: Run Uno Islands Skia WPF Runtime Tests
-
-  - task: PublishTestResults@2
-    condition: always()
-    inputs:
-      testRunTitle: 'WPF Islands Skia Runtime Tests'
-      testResultsFormat: 'NUnit'
-      testResultsFiles: '$(build.sourcesdirectory)/build/uno-islands-skia-wpf-runtime-tests-results.xml'
-      failTaskOnFailedTests: true
-      failTaskOnMissingResultsFile: true
-
-  - task: PublishBuildArtifacts@1
-    condition: always()
-    displayName: Publish Failed Tests Results
-    retryCountOnTaskFailure: 3
-    inputs:
-      PathtoPublish: $(build.sourcesdirectory)/build/uitests-failure-results
-      ArtifactName: uitests-failure-results
-      ArtifactType: Container
+# - job: Uno_Islands_Skia_Wpf_Runtime_Tests_Build
+#   displayName: 'WPF Islands Runtime Tests'
+#   timeoutInMinutes: 45
+#   cancelTimeoutInMinutes: 1
+#   condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
+#   pool:
+#     vmImage: ${{ parameters.vmImage }}
+
+#   variables:
+#     SamplesAppArtifactName: uno-islands-skia-wpf-samples-app-WinUI
+#     SamplesAppArtifactPath: $(build.sourcesdirectory)/build/$(SamplesAppArtifactName)
+
+#     UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
+#     XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
+
+#   steps:
+
+#   - task: DownloadPipelineArtifact@2
+#     displayName: Downloading $(SamplesAppArtifactName)
+#     inputs:
+#       artifact: $(SamplesAppArtifactName)
+#       path: $(build.sourcesdirectory)/build/$(SamplesAppArtifactName)
+
+#   - task: DownloadBuildArtifacts@0
+#     condition: gt(variables['System.JobAttempt'], 1)
+#     continueOnError: true
+#     displayName: Download previous test runs failed tests
+#     inputs:
+#         artifactName: uitests-failure-results
+#         downloadPath: '$(build.sourcesdirectory)/build'
+
+#   - template: ../templates/dotnet-install.yml
+
+#   - pwsh: build/test-scripts/run-windows-islands-skia-runtime-tests.ps1
+#     displayName: Run Uno Islands Skia WPF Runtime Tests
+
+#   - task: PublishTestResults@2
+#     condition: always()
+#     inputs:
+#       testRunTitle: 'WPF Islands Skia Runtime Tests'
+#       testResultsFormat: 'NUnit'
+#       testResultsFiles: '$(build.sourcesdirectory)/build/uno-islands-skia-wpf-runtime-tests-results.xml'
+#       failTaskOnFailedTests: true
+#       failTaskOnMissingResultsFile: true
+
+#   - task: PublishBuildArtifacts@1
+#     condition: always()
+#     displayName: Publish Failed Tests Results
+#     retryCountOnTaskFailure: 3
+#     inputs:
+#       PathtoPublish: $(build.sourcesdirectory)/build/uitests-failure-results
+#       ArtifactName: uitests-failure-results
+#       ArtifactType: Container

src/Uno.UI.Composition/Composition/ContainerVisual.skia.cs

@@ -36,6 +36,13 @@ partial void InitializePartial()
 
 			InvalidateParentChildrenPicture(true);
 
+			// We need to force a redraw because at this point it's not necessarily true that
+			// a visual in the composition tree was changed, only that it was added/removed,
+			// so it's possible that no InvalidatePaint() calls were fired in response to this change, 
+			// so we need to force a new frame even though no paint invalidations happened just so that
+			// already-clean added/removed visuals are reflected in the UI
+			CompositionTarget?.RequestNewFrame();
+
 			if (e.Action is NotifyCollectionChangedAction.Remove or NotifyCollectionChangedAction.Reset
 				&& e.OldItems is not null)
 			{