Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 09:46:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

CmdPal: Single-row list items (#45763)

Browse Source 
## Summary of the Pull Request

This PR changes default style of list items to a single-row. As a flyby
it also ensures that all item containers have a constant height.

<img width="848" height="509" alt="image"
src="https://github.com/user-attachments/assets/832db0dd-d270-4745-b83a-c8ad2ec12c02"
/>

<img width="828" height="515" alt="image"
src="https://github.com/user-attachments/assets/6596a6ae-9056-4177-bafa-47df7d39ad3e"
/>


<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [x] Related to: #44407
- [x] Closes: #45091
<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [ ] **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
This commit is contained in:
Jiří Polášek
2026-02-24 03:46:09 +01:00
committed by GitHub
parent 65254cec76
commit 15cad8ca18
1 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
View File

@@ -32,9 +32,13 @@
<x:Double x:Key="MediumGridContainerSize">100</x:Double> <x:Double x:Key="MediumGridContainerSize">100</x:Double>
<x:Double x:Key="GalleryGridSize">160</x:Double> <x:Double x:Key="GalleryGridSize">160</x:Double>
<x:Double x:Key="ListViewItemMinHeight">40</x:Double> <!--
<x:Double x:Key="ListViewSectionMinHeight">0</x:Double> BEAR LOADING: The list view is virtualized and the item container style is set to a fixed height
<x:Double x:Key="ListViewSeparatorMinHeight">0</x:Double> to ensure the virtualization works correctly.
-->
<x:Double x:Key="SingleRowListViewItemHeight">44</x:Double>
<x:Double x:Key="ListViewSectionHeight">28</x:Double>
<x:Double x:Key="ListViewSeparatorHeight">28</x:Double>
<Style x:Key="IconGridViewItemStyle" TargetType="GridViewItem"> <Style x:Key="IconGridViewItemStyle" TargetType="GridViewItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -172,11 +176,12 @@
<Setter Property="IsHitTestVisible" Value="False" /> <Setter Property="IsHitTestVisible" Value="False" />
<Setter Property="IsTabStop" Value="False" /> <Setter Property="IsTabStop" Value="False" />
<Setter Property="IsHoldingEnabled" Value="False" /> <Setter Property="IsHoldingEnabled" Value="False" />
<Setter Property="Padding" Value="4,8,12,0" /> <Setter Property="Padding" Value="4,0,12,0" />
<Setter Property="Margin" Value="0" /> <Setter Property="Margin" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Bottom" /> <Setter Property="VerticalContentAlignment" Value="Bottom" />
<Setter Property="MinHeight" Value="{StaticResource ListViewSectionMinHeight}" /> <Setter Property="MinHeight" Value="{StaticResource ListViewSectionHeight}" />
<Setter Property="Height" Value="{StaticResource ListViewSectionHeight}" />
<Setter Property="cpcontrols:WrapPanel.IsFullLine" Value="True" /> <Setter Property="cpcontrols:WrapPanel.IsFullLine" Value="True" />
</Style> </Style>
@@ -187,11 +192,12 @@
<Setter Property="IsHitTestVisible" Value="False" /> <Setter Property="IsHitTestVisible" Value="False" />
<Setter Property="IsTabStop" Value="False" /> <Setter Property="IsTabStop" Value="False" />
<Setter Property="IsHoldingEnabled" Value="False" /> <Setter Property="IsHoldingEnabled" Value="False" />
<Setter Property="Padding" Value="4,4,12,4" /> <Setter Property="Padding" Value="4,0,12,0" />
<Setter Property="Margin" Value="0" /> <Setter Property="Margin" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="MinHeight" Value="{StaticResource ListViewSeparatorMinHeight}" /> <Setter Property="MinHeight" Value="{StaticResource ListViewSeparatorHeight}" />
<Setter Property="Height" Value="{StaticResource ListViewSeparatorHeight}" />
<Setter Property="cpcontrols:WrapPanel.IsFullLine" Value="True" /> <Setter Property="cpcontrols:WrapPanel.IsFullLine" Value="True" />
</Style> </Style>
@@ -199,7 +205,8 @@
x:Key="ListDefaultContainerStyle" x:Key="ListDefaultContainerStyle"
BasedOn="{StaticResource DefaultListViewItemStyle}" BasedOn="{StaticResource DefaultListViewItemStyle}"
TargetType="ListViewItem"> TargetType="ListViewItem">
<Setter Property="MinHeight" Value="{StaticResource ListViewItemMinHeight}" /> <Setter Property="MinHeight" Value="{StaticResource SingleRowListViewItemHeight}" />
<Setter Property="Height" Value="{StaticResource SingleRowListViewItemHeight}" />
</Style> </Style>
<Style <Style
@@ -213,10 +220,11 @@
<Setter Property="IsTabStop" Value="False" /> <Setter Property="IsTabStop" Value="False" />
<Setter Property="IsHoldingEnabled" Value="False" /> <Setter Property="IsHoldingEnabled" Value="False" />
<Setter Property="AllowDrop" Value="False" /> <Setter Property="AllowDrop" Value="False" />
<Setter Property="Padding" Value="16,8,12,0" /> <Setter Property="Padding" Value="16,0,12,0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Bottom" /> <Setter Property="VerticalContentAlignment" Value="Bottom" />
<Setter Property="MinHeight" Value="{StaticResource ListViewSectionMinHeight}" /> <Setter Property="MinHeight" Value="{StaticResource ListViewSectionHeight}" />
<Setter Property="Height" Value="{StaticResource ListViewSectionHeight}" />
</Style> </Style>
<Style <Style
@@ -230,10 +238,11 @@
<Setter Property="IsTabStop" Value="False" /> <Setter Property="IsTabStop" Value="False" />
<Setter Property="IsHoldingEnabled" Value="False" /> <Setter Property="IsHoldingEnabled" Value="False" />
<Setter Property="AllowDrop" Value="False" /> <Setter Property="AllowDrop" Value="False" />
<Setter Property="Padding" Value="16,4,12,4" /> <Setter Property="Padding" Value="16,0,12,0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="MinHeight" Value="{StaticResource ListViewSeparatorMinHeight}" /> <Setter Property="MinHeight" Value="{StaticResource ListViewSeparatorHeight}" />
<Setter Property="Height" Value="{StaticResource ListViewSeparatorHeight}" />
</Style> </Style>
<DataTemplate x:Key="TagTemplate" x:DataType="viewModels:TagViewModel"> <DataTemplate x:Key="TagTemplate" x:DataType="viewModels:TagViewModel">
@@ -250,7 +259,7 @@
<cmdpalUI:ListItemTemplateSelector <cmdpalUI:ListItemTemplateSelector
x:Key="ListItemTemplateSelector" x:Key="ListItemTemplateSelector"
x:DataType="viewModels:ListItemViewModel" x:DataType="viewModels:ListItemViewModel"
ListItem="{StaticResource ListItemViewModelTemplate}" ListItem="{StaticResource ListItemSingleRowViewModelTemplate}"
Section="{StaticResource ListSectionViewModelTemplate}" Section="{StaticResource ListSectionViewModelTemplate}"
Separator="{StaticResource ListSeparatorViewModelTemplate}" /> Separator="{StaticResource ListSeparatorViewModelTemplate}" />
@@ -279,12 +288,8 @@
Separator="{StaticResource GridViewSeparatorItemStyle}" Separator="{StaticResource GridViewSeparatorItemStyle}"
Small="{StaticResource IconGridViewItemStyle}" /> Small="{StaticResource IconGridViewItemStyle}" />
<!-- https://learn.microsoft.com/windows/apps/design/controls/itemsview#specify-the-look-of-the-items --> <DataTemplate x:Key="ListItemSingleRowViewModelTemplate" x:DataType="viewModels:ListItemViewModel">
<DataTemplate x:Key="ListItemViewModelTemplate" x:DataType="viewModels:ListItemViewModel"> <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}" ColumnSpacing="12">
<Grid
Padding="0,12,0,12"
AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
ColumnSpacing="12">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="28" /> <ColumnDefinition Width="28" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
@@ -296,36 +301,54 @@
Grid.Column="0" Grid.Column="0"
Width="20" Width="20"
Height="20" Height="20"
Margin="4,0,4,0"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" Foreground="{ThemeResource TextFillColorSecondaryBrush}"
SourceKey="{x:Bind Icon, Mode=OneWay}" SourceKey="{x:Bind Icon, Mode=OneWay}"
SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested20}" /> SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested20}" />
<StackPanel <!--
Title and subtitle are intentionally in a nested Grid instead in the outer container,
to avoid pushing the following element (tags) out of bounds.
-->
<Grid
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Vertical" ColumnSpacing="12">
Spacing="1"> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
CharacterSpacing="12" CharacterSpacing="12"
FontSize="14" FontSize="14"
MaxLines="1"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind Title, Mode=OneWay}" Text="{x:Bind Title, Mode=OneWay}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap" /> TextWrapping="NoWrap" />
<TextBlock <TextBlock
Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
CharacterSpacing="12"
FontSize="14"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" Foreground="{ThemeResource TextFillColorSecondaryBrush}"
MaxLines="1"
Style="{StaticResource CaptionTextBlockStyle}" Style="{StaticResource CaptionTextBlockStyle}"
Text="{x:Bind Subtitle, Mode=OneWay}" Text="{x:Bind Subtitle, Mode=OneWay}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap" TextWrapping="NoWrap"
Visibility="{x:Bind ShowSubtitle, Mode=OneWay}" /> Visibility="{x:Bind ShowSubtitle, Mode=OneWay}" />
</StackPanel> </Grid>
<!--
8px right margin is added to visually match the spacing between then icon,
and the left margin of the list, as there's
-->
<ItemsControl <ItemsControl
Grid.RowSpan="2"
Grid.Column="2" Grid.Column="2"
Margin="0,0,8,0" Margin="0,0,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"