[WinUI][CV2] CollectionView2 Handler Implementation for Windows #34600
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| using System; | ||
| using Microsoft.Maui.Controls.Internals; | ||
| using Microsoft.Maui.Controls.Platform; | ||
| using Microsoft.UI.Xaml; | ||
| using Microsoft.UI.Xaml.Controls; | ||
| using WASDKScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility; | ||
| using WASDKScrollingScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollingScrollBarVisibility; | ||
|
|
||
| namespace Microsoft.Maui.Controls.Handlers.Items | ||
| { | ||
| internal static class ItemsViewExtensions | ||
| { | ||
| internal static FrameworkElement RealizeEmptyViewTemplate(object? bindingContext, DataTemplate? emptyViewTemplate, IMauiContext mauiContext, ref View? mauiEmptyView, BindableObject? container = null) | ||
| { | ||
| if (emptyViewTemplate is null) | ||
| { | ||
| return CreateDefaultEmptyViewTextBlock(bindingContext); | ||
| } | ||
|
|
||
| // Pass the owning ItemsView as the container so DataTemplateSelector | ||
| // implementations can inspect it (parity with iOS/Android/Tizen). | ||
| var template = emptyViewTemplate.SelectDataTemplate(bindingContext, container); | ||
|
|
||
| var view = template.CreateContent() as View; | ||
| if (view is not null) | ||
| { | ||
| view.BindingContext = bindingContext; | ||
| } | ||
|
|
||
| return RealizeEmptyView(view, mauiContext, ref mauiEmptyView); | ||
| } | ||
|
|
||
| static TextBlock CreateDefaultEmptyViewTextBlock(object? bindingContext) | ||
| { | ||
| return new TextBlock | ||
| { | ||
| HorizontalAlignment = Microsoft.UI.Xaml.HorizontalAlignment.Center, | ||
| VerticalAlignment = Microsoft.UI.Xaml.VerticalAlignment.Center, | ||
| Text = bindingContext?.ToString() ?? string.Empty | ||
| }; | ||
| } | ||
| internal static FrameworkElement RealizeEmptyView(View? view, IMauiContext mauiContext, ref View? mauiEmptyView) | ||
| { | ||
| mauiEmptyView = view ?? throw new ArgumentNullException(nameof(view)); | ||
|
|
||
| var handler = view.ToHandler(mauiContext); | ||
| var platformView = handler.ContainerView ?? handler.PlatformView; | ||
|
|
||
| return platformView as FrameworkElement ?? throw new InvalidOperationException("Unable to convert view to FrameworkElement"); | ||
| } | ||
|
|
||
| internal static FrameworkElement RealizeHeaderFooterTemplate(object? bindingContext, DataTemplate? template, IMauiContext mauiContext, ref View? mauiView, BindableObject? container = null) | ||
| { | ||
| if (template is null) | ||
| { | ||
| return new TextBlock | ||
| { | ||
| Text = bindingContext?.ToString() ?? string.Empty, | ||
| Margin = new Microsoft.UI.Xaml.Thickness(0, 5, 0, 5) | ||
| }; | ||
| } | ||
|
|
||
| // Pass the owning ItemsView as the container so DataTemplateSelector | ||
| // implementations can inspect it (parity with iOS/Android/Tizen). | ||
| var dataTemplate = template.SelectDataTemplate(bindingContext, container); | ||
| var view = dataTemplate.CreateContent() as View; | ||
| if (view is not null) | ||
| { | ||
| view.BindingContext = bindingContext; | ||
| } | ||
|
|
||
| return RealizeHeaderFooterView(view, mauiContext, ref mauiView); | ||
| } | ||
|
|
||
| internal static FrameworkElement RealizeHeaderFooterView(View? view, IMauiContext mauiContext, ref View? mauiView) | ||
| { | ||
| mauiView = view ?? throw new ArgumentNullException(nameof(view)); | ||
|
|
||
| var handler = view.ToHandler(mauiContext); | ||
| var platformView = handler.ContainerView ?? handler.PlatformView; | ||
|
|
||
| return platformView as FrameworkElement ?? throw new InvalidOperationException("Unable to convert view to FrameworkElement"); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Applies MAUI margin and layout options to a WinUI element that hosts a MAUI View | ||
| /// (e.g., CollectionView header/footer placed in a WinUI ContentControl). | ||
| /// The cross-platform layout system never applies these because the element | ||
| /// is not inside a MAUI layout. | ||
| /// </summary> | ||
| internal static void ApplyMauiLayoutProperties(View? mauiView, FrameworkElement? platformElement) | ||
| { | ||
| if (mauiView is null || platformElement is null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| // Apply MAUI margin as WinUI margin | ||
| var margin = mauiView.Margin; | ||
| platformElement.Margin = new Microsoft.UI.Xaml.Thickness(margin.Left, margin.Top, margin.Right, margin.Bottom); | ||
|
|
||
| // Map HorizontalOptions/VerticalOptions to WinUI alignment | ||
| platformElement.UpdateHorizontalOptions(mauiView); | ||
| platformElement.UpdateVerticalOptions(mauiView); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This newly added step (
platform=windows+useWindowsCV1=false+failed()) publishesui-tests-samples-windows_failed_$(System.JobAttempt)— the same artifact name used by the pre-existing generic Windows failure publish just below (L149-151, conditionplatform=windows+failed()). When a non-CV1 Windows sample build fails, both conditions are true and both steps publish the same artifact name in the same job, which Azure Pipelines rejects ("an artifact with the name … already exists"). The failure-diagnostics path then itself errors and can mask the real build failure.Fix: make the conditions mutually exclusive — give the new (CV2) step a distinct name (e.g.
ui-tests-samples-windows-cv2_failed_$(System.JobAttempt)) or remove the redundant generic block at L149-151.(found by: gpt-5.5)