mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 02:36:19 +02:00
05d621a121
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request While testing the recent GridPages changes #40832 , I noticed that the `EmptyContent` case was removed from the `SwitchPresenter`, which caused EmptyContent to stop rendering. This PR restores the missing case so that `EmptyContent` is correctly displayed again. ### Before <img width="790" height="480" alt="BeforeFix" src="https://github.com/user-attachments/assets/71e43da9-41c4-4c1a-bbb1-bc3f6b4da1d0" /> ### After <img width="793" height="483" alt="AfterFix" src="https://github.com/user-attachments/assets/ebec6b44-ebfd-4497-9e69-99b00ce44117" /> <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #41786 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
342 lines
15 KiB
XML
342 lines
15 KiB
XML
<?xml version="1.0" encoding="utf-8" ?>
|
|
<Page
|
|
x:Class="Microsoft.CmdPal.UI.ListPage"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:cmdpalUI="using:Microsoft.CmdPal.UI"
|
|
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
|
|
xmlns:converters="using:CommunityToolkit.WinUI.Converters"
|
|
xmlns:coreViewModels="using:Microsoft.CmdPal.Core.ViewModels"
|
|
xmlns:cpcontrols="using:Microsoft.CmdPal.UI.Controls"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
|
|
xmlns:local="using:Microsoft.CmdPal.UI"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
|
xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
|
|
x:Name="PageRoot"
|
|
Background="Transparent"
|
|
DataContext="{x:Bind ViewModel, Mode=OneWay}"
|
|
mc:Ignorable="d">
|
|
|
|
<Page.Resources>
|
|
<!-- TODO: Figure out what we want to do here for filtering/grouping and where -->
|
|
<!-- https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.data.collectionviewsource -->
|
|
<!--<CollectionViewSource
|
|
x:Name="ItemsCVS"
|
|
IsSourceGrouped="True"
|
|
Source="{x:Bind ViewModel.Items, Mode=OneWay}" />-->
|
|
|
|
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
|
|
<converters:StringVisibilityConverter
|
|
x:Key="StringVisibilityConverter"
|
|
EmptyValue="Collapsed"
|
|
NotEmptyValue="Visible" />
|
|
|
|
<DataTemplate x:Key="TagTemplate" x:DataType="coreViewModels:TagViewModel">
|
|
<cpcontrols:Tag
|
|
AutomationProperties.Name="{x:Bind Text, Mode=OneWay}"
|
|
BackgroundColor="{x:Bind Background, Mode=OneWay}"
|
|
FontSize="12"
|
|
ForegroundColor="{x:Bind Foreground, Mode=OneWay}"
|
|
Icon="{x:Bind Icon, Mode=OneWay}"
|
|
Text="{x:Bind Text, Mode=OneWay}"
|
|
ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}" />
|
|
</DataTemplate>
|
|
|
|
<cmdpalUI:GridItemTemplateSelector
|
|
x:Key="GridItemTemplateSelector"
|
|
x:DataType="coreViewModels:ListItemViewModel"
|
|
Gallery="{StaticResource GalleryGridItemViewModelTemplate}"
|
|
GridProperties="{x:Bind ViewModel.GridProperties}"
|
|
Medium="{StaticResource MediumGridItemViewModelTemplate}"
|
|
Small="{StaticResource SmallGridItemViewModelTemplate}" />
|
|
|
|
<!-- https://learn.microsoft.com/windows/apps/design/controls/itemsview#specify-the-look-of-the-items -->
|
|
<DataTemplate x:Key="ListItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
|
|
<Grid
|
|
Padding="0,12,0,12"
|
|
AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
|
|
ColumnSpacing="12">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="28" />
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="Auto" />
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<cpcontrols:IconBox
|
|
x:Name="IconBorder"
|
|
Grid.Column="0"
|
|
Width="20"
|
|
Height="20"
|
|
Margin="4,0,4,0"
|
|
AutomationProperties.AccessibilityView="Raw"
|
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
SourceKey="{x:Bind Icon, Mode=OneWay}"
|
|
SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
|
|
|
|
<StackPanel
|
|
Grid.Column="1"
|
|
VerticalAlignment="Center"
|
|
Orientation="Vertical"
|
|
Spacing="1">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
CharacterSpacing="12"
|
|
FontSize="14"
|
|
Text="{x:Bind Title, Mode=OneWay}"
|
|
TextTrimming="CharacterEllipsis"
|
|
TextWrapping="NoWrap" />
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
Style="{StaticResource CaptionTextBlockStyle}"
|
|
Text="{x:Bind Subtitle, Mode=OneWay}"
|
|
TextTrimming="CharacterEllipsis"
|
|
TextWrapping="NoWrap"
|
|
Visibility="{x:Bind Subtitle, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
|
|
</StackPanel>
|
|
|
|
<ItemsControl
|
|
Grid.RowSpan="2"
|
|
Grid.Column="2"
|
|
Margin="0,0,8,0"
|
|
VerticalAlignment="Center"
|
|
IsHitTestVisible="False"
|
|
IsTabStop="False"
|
|
ItemTemplate="{StaticResource TagTemplate}"
|
|
ItemsSource="{x:Bind Tags, Mode=OneWay}"
|
|
Visibility="{x:Bind HasTags, Mode=OneWay}">
|
|
<ItemsControl.ItemsPanel>
|
|
<ItemsPanelTemplate>
|
|
<StackPanel Orientation="Horizontal" Spacing="4" />
|
|
</ItemsPanelTemplate>
|
|
</ItemsControl.ItemsPanel>
|
|
</ItemsControl>
|
|
</Grid>
|
|
</DataTemplate>
|
|
|
|
<!-- Grid item templates for visual grid representation -->
|
|
<DataTemplate x:Key="SmallGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
|
|
<StackPanel
|
|
Width="60"
|
|
Height="60"
|
|
Padding="8,16"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
AutomationProperties.Name="{x:Bind Title}"
|
|
BorderThickness="0"
|
|
CornerRadius="8"
|
|
Orientation="Vertical"
|
|
ToolTipService.ToolTip="{x:Bind Title}">
|
|
|
|
<cpcontrols:IconBox
|
|
x:Name="GridIconBorder"
|
|
Width="28"
|
|
Height="28"
|
|
Margin="0"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
Foreground="{ThemeResource TextFillColorPrimary}"
|
|
SourceKey="{x:Bind Icon, Mode=OneWay}"
|
|
SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
|
|
|
|
</StackPanel>
|
|
</DataTemplate>
|
|
|
|
<DataTemplate x:Key="MediumGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
|
|
<StackPanel
|
|
Width="100"
|
|
Height="100"
|
|
Padding="8,16"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
AutomationProperties.Name="{x:Bind Title}"
|
|
BorderThickness="0"
|
|
CornerRadius="8"
|
|
Orientation="Vertical"
|
|
ToolTipService.ToolTip="{x:Bind Title}">
|
|
|
|
<cpcontrols:IconBox
|
|
x:Name="GridIconBorder"
|
|
Width="36"
|
|
Height="36"
|
|
Margin="0"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
CharacterSpacing="12"
|
|
FontSize="14"
|
|
Foreground="{ThemeResource TextFillColorPrimary}"
|
|
SourceKey="{x:Bind Icon, Mode=OneWay}"
|
|
SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
|
|
|
|
<TextBlock
|
|
x:Name="TitleTextBlock"
|
|
MaxHeight="40"
|
|
Margin="0,8,0,4"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
CharacterSpacing="12"
|
|
FontSize="12"
|
|
Text="{x:Bind Title}"
|
|
TextAlignment="Center"
|
|
TextTrimming="WordEllipsis"
|
|
TextWrapping="Wrap"
|
|
Visibility="{Binding ElementName=PageRoot, Path=DataContext.GridProperties.ShowTitle, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
|
|
</StackPanel>
|
|
</DataTemplate>
|
|
|
|
<DataTemplate x:Key="GalleryGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
|
|
<StackPanel
|
|
Width="160"
|
|
Margin="4"
|
|
Padding="0"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
AutomationProperties.Name="{x:Bind Title}"
|
|
BorderThickness="0"
|
|
CornerRadius="4"
|
|
Orientation="Vertical"
|
|
ToolTipService.ToolTip="{x:Bind Title}">
|
|
|
|
<Grid
|
|
Width="160"
|
|
Height="160"
|
|
Margin="0"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
CornerRadius="4">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition />
|
|
</Grid.RowDefinitions>
|
|
<Viewbox
|
|
Grid.Row="1"
|
|
HorizontalAlignment="Center"
|
|
Stretch="UniformToFill"
|
|
StretchDirection="Both">
|
|
<cpcontrols:IconBox
|
|
CornerRadius="4"
|
|
Foreground="{ThemeResource TextFillColorPrimary}"
|
|
SourceKey="{x:Bind Icon, Mode=OneWay}"
|
|
SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
|
|
</Viewbox>
|
|
</Grid>
|
|
|
|
<StackPanel Padding="4" Orientation="Vertical">
|
|
<TextBlock
|
|
x:Name="TitleTextBlock"
|
|
MaxWidth="152"
|
|
MaxHeight="40"
|
|
Margin="0"
|
|
HorizontalAlignment="Left"
|
|
VerticalAlignment="Center"
|
|
CharacterSpacing="12"
|
|
FontSize="14"
|
|
Foreground="{ThemeResource TextFillColorPrimary}"
|
|
Text="{x:Bind Title}"
|
|
TextAlignment="Center"
|
|
TextTrimming="WordEllipsis"
|
|
TextWrapping="NoWrap" />
|
|
<TextBlock
|
|
x:Name="SubTitleTextBlock"
|
|
MaxWidth="152"
|
|
MaxHeight="40"
|
|
Margin="0,4,0,0"
|
|
HorizontalAlignment="Left"
|
|
VerticalAlignment="Center"
|
|
CharacterSpacing="11"
|
|
FontSize="11"
|
|
Foreground="{ThemeResource TextFillColorTertiary}"
|
|
Text="{x:Bind Subtitle}"
|
|
TextAlignment="Center"
|
|
TextTrimming="WordEllipsis"
|
|
TextWrapping="NoWrap" />
|
|
</StackPanel>
|
|
</StackPanel>
|
|
</DataTemplate>
|
|
</Page.Resources>
|
|
|
|
<Grid>
|
|
<controls:SwitchPresenter
|
|
HorizontalAlignment="Stretch"
|
|
TargetType="x:Boolean"
|
|
Value="{x:Bind ViewModel.ShowEmptyContent, Mode=OneWay}">
|
|
<controls:Case Value="False">
|
|
<controls:SwitchPresenter
|
|
HorizontalAlignment="Stretch"
|
|
TargetType="x:Boolean"
|
|
Value="{x:Bind ViewModel.IsGridView, Mode=OneWay}">
|
|
<controls:Case Value="False">
|
|
<ListView
|
|
x:Name="ItemsList"
|
|
Padding="0,2,0,0"
|
|
ContextCanceled="Items_OnContextCanceled"
|
|
ContextRequested="Items_OnContextRequested"
|
|
DoubleTapped="Items_DoubleTapped"
|
|
IsDoubleTapEnabled="True"
|
|
IsItemClickEnabled="True"
|
|
ItemClick="Items_ItemClick"
|
|
ItemTemplate="{StaticResource ListItemViewModelTemplate}"
|
|
ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
|
|
RightTapped="Items_RightTapped"
|
|
SelectionChanged="Items_SelectionChanged">
|
|
<ListView.ItemContainerTransitions>
|
|
<TransitionCollection />
|
|
</ListView.ItemContainerTransitions>
|
|
</ListView>
|
|
</controls:Case>
|
|
<controls:Case Value="True">
|
|
<GridView
|
|
x:Name="ItemsGrid"
|
|
Padding="8"
|
|
ContextCanceled="Items_OnContextCanceled"
|
|
ContextRequested="Items_OnContextRequested"
|
|
DoubleTapped="Items_DoubleTapped"
|
|
IsDoubleTapEnabled="True"
|
|
IsItemClickEnabled="True"
|
|
ItemClick="Items_ItemClick"
|
|
ItemTemplateSelector="{StaticResource GridItemTemplateSelector}"
|
|
ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
|
|
RightTapped="Items_RightTapped"
|
|
SelectionChanged="Items_SelectionChanged">
|
|
<GridView.ItemContainerTransitions>
|
|
<TransitionCollection />
|
|
</GridView.ItemContainerTransitions>
|
|
</GridView>
|
|
</controls:Case>
|
|
</controls:SwitchPresenter>
|
|
</controls:Case>
|
|
<controls:Case Value="True">
|
|
<StackPanel
|
|
Margin="24"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
Orientation="Vertical"
|
|
Spacing="4">
|
|
<cpcontrols:IconBox
|
|
x:Name="IconBorder"
|
|
Width="48"
|
|
Height="48"
|
|
Margin="8"
|
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
SourceKey="{x:Bind ViewModel.EmptyContent.Icon, Mode=OneWay}"
|
|
SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
|
|
<TextBlock
|
|
Margin="0,4,0,0"
|
|
HorizontalAlignment="Center"
|
|
FontWeight="SemiBold"
|
|
Text="{x:Bind ViewModel.EmptyContent.Title, Mode=OneWay}"
|
|
TextAlignment="Center"
|
|
TextWrapping="Wrap" />
|
|
<TextBlock
|
|
HorizontalAlignment="Center"
|
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
Text="{x:Bind ViewModel.EmptyContent.Subtitle, Mode=OneWay}"
|
|
TextAlignment="Center"
|
|
TextWrapping="Wrap" />
|
|
</StackPanel>
|
|
</controls:Case>
|
|
</controls:SwitchPresenter>
|
|
</Grid>
|
|
</Page>
|