mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 17:56:44 +02:00
### Fixing visual glitch in the 'Show all results' template: Before <img width="588" height="103" alt="image" src="https://github.com/user-attachments/assets/00da60ea-d0ab-4ffe-8f69-75be7e537d63" /> After <img width="598" height="70" alt="image" src="https://github.com/user-attachments/assets/dc859731-8783-494a-b561-ea6396ca69b3" /> ### Displaying "Show results for * search term *" on search results page Before <img width="716" height="239" alt="image" src="https://github.com/user-attachments/assets/a80e6e58-df88-47b2-85ab-c39cbdc88690" /> After <img width="349" height="264" alt="image" src="https://github.com/user-attachments/assets/99029ee6-94f7-4454-a443-640c22f9e6f3" /> ### Using Accent Color for the search highlight for better visibility and fixing a bug Before  After  --------- Co-authored-by: vanzue <vanzue@outlook.com>
360 lines
19 KiB
XML
360 lines
19 KiB
XML
<UserControl
|
|
x:Class="Microsoft.PowerToys.Settings.UI.Views.ShellPage"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
|
|
xmlns:animations="using:CommunityToolkit.WinUI.Animations"
|
|
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
|
|
xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:helpers="using:Microsoft.PowerToys.Settings.UI.Helpers"
|
|
xmlns:i="using:Microsoft.Xaml.Interactivity"
|
|
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:models="using:Microsoft.PowerToys.Settings.UI.ViewModels"
|
|
xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
|
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
|
xmlns:views="using:Microsoft.PowerToys.Settings.UI.Views"
|
|
HighContrastAdjustment="None"
|
|
Loaded="ShellPage_Loaded"
|
|
mc:Ignorable="d">
|
|
<UserControl.Resources>
|
|
<converters:IconConverter x:Key="IconConverter" />
|
|
<converters:SearchSuggestionTemplateSelector
|
|
x:Key="SearchSuggestionTemplateSelector"
|
|
DefaultSuggestionTemplate="{StaticResource DefaultSearchResultTemplate}"
|
|
NoResultsSuggestionTemplate="{StaticResource NoResultSearchResultTemplate}"
|
|
ShowAllSuggestionTemplate="{StaticResource ShowAllSearchResultTemplate}" />
|
|
<DataTemplate x:Key="DefaultSearchResultTemplate" x:DataType="models:SuggestionItem">
|
|
<Grid Padding="16,8">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="Auto" />
|
|
<ColumnDefinition Width="*" />
|
|
</Grid.ColumnDefinitions>
|
|
<Viewbox
|
|
Width="16"
|
|
Height="16"
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
Stretch="Uniform">
|
|
<ContentPresenter
|
|
HorizontalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
Content="{x:Bind Icon, Converter={StaticResource IconConverter}, ConverterParameter=}" />
|
|
</Viewbox>
|
|
<StackPanel
|
|
Grid.Column="1"
|
|
Margin="12,0,0,0"
|
|
VerticalAlignment="Center">
|
|
<TextBlock Text="{x:Bind Header}" />
|
|
<TextBlock
|
|
FontSize="12"
|
|
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
Text="{x:Bind Subtitle}"
|
|
Visibility="{x:Bind Subtitle, Converter={StaticResource StringVisibilityConverter}}" />
|
|
</StackPanel>
|
|
</Grid>
|
|
</DataTemplate>
|
|
<DataTemplate x:Key="NoResultSearchResultTemplate" x:DataType="models:SuggestionItem">
|
|
<Grid>
|
|
<TextBlock
|
|
Margin="8"
|
|
HorizontalAlignment="Center"
|
|
Text="{x:Bind Header}"
|
|
TextAlignment="Center" />
|
|
</Grid>
|
|
</DataTemplate>
|
|
<DataTemplate x:Key="ShowAllSearchResultTemplate" x:DataType="models:SuggestionItem">
|
|
<Grid>
|
|
<Rectangle
|
|
Height="1"
|
|
Margin="0,-12,0,0"
|
|
HorizontalAlignment="Stretch"
|
|
VerticalAlignment="Top"
|
|
Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
|
|
<TextBlock
|
|
x:Uid="Shell_Search_ShowAll"
|
|
HorizontalAlignment="Stretch"
|
|
VerticalAlignment="Center"
|
|
Text="Show all results"
|
|
TextAlignment="Center" />
|
|
</Grid>
|
|
</DataTemplate>
|
|
</UserControl.Resources>
|
|
<i:Interaction.Behaviors>
|
|
<ic:EventTriggerBehavior EventName="Loaded">
|
|
<ic:InvokeCommandAction Command="{x:Bind ViewModel.LoadedCommand}" />
|
|
</ic:EventTriggerBehavior>
|
|
</i:Interaction.Behaviors>
|
|
<Grid x:Name="RootGrid">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="48" />
|
|
<RowDefinition Height="*" />
|
|
</Grid.RowDefinitions>
|
|
<controls:TitleBar
|
|
x:Name="AppTitleBar"
|
|
AutoConfigureCustomTitleBar="True"
|
|
PaneButtonClick="PaneToggleBtn_Click">
|
|
<controls:TitleBar.Resources>
|
|
<x:Double x:Key="TitleBarContentMinWidth">516</x:Double>
|
|
</controls:TitleBar.Resources>
|
|
<controls:TitleBar.Icon>
|
|
<BitmapIcon ShowAsMonochrome="False" UriSource="/Assets/Settings/icon.ico" />
|
|
</controls:TitleBar.Icon>
|
|
<controls:TitleBar.Content>
|
|
<AutoSuggestBox
|
|
x:Name="SearchBox"
|
|
x:Uid="Shell_SearchBox"
|
|
HorizontalAlignment="Stretch"
|
|
VerticalAlignment="Center"
|
|
GotFocus="SearchBox_GotFocus"
|
|
ItemTemplateSelector="{StaticResource SearchSuggestionTemplateSelector}"
|
|
QueryIcon="Find"
|
|
QuerySubmitted="SearchBox_QuerySubmitted"
|
|
SuggestionChosen="SearchBox_SuggestionChosen"
|
|
TextChanged="SearchBox_TextChanged"
|
|
TextMemberPath="Header"
|
|
UpdateTextOnSelect="False">
|
|
<AutoSuggestBox.KeyboardAccelerators>
|
|
<KeyboardAccelerator
|
|
Key="F"
|
|
Invoked="CtrlF_Invoked"
|
|
Modifiers="Control" />
|
|
</AutoSuggestBox.KeyboardAccelerators>
|
|
</AutoSuggestBox>
|
|
</controls:TitleBar.Content>
|
|
</controls:TitleBar>
|
|
<NavigationView
|
|
x:Name="navigationView"
|
|
Grid.Row="1"
|
|
Canvas.ZIndex="0"
|
|
CompactModeThresholdWidth="1007"
|
|
DisplayModeChanged="NavigationView_DisplayModeChanged"
|
|
ExpandedModeThresholdWidth="1007"
|
|
IsBackButtonVisible="Collapsed"
|
|
IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}"
|
|
IsPaneToggleButtonVisible="False"
|
|
IsSettingsVisible="False"
|
|
IsTitleBarAutoPaddingEnabled="False"
|
|
PaneClosed="NavigationView_PaneClosed"
|
|
PaneOpened="NavigationView_PaneOpened"
|
|
SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
|
|
SelectionChanged="NavigationView_SelectionChanged">
|
|
<NavigationView.Resources>
|
|
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
|
|
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
|
|
</NavigationView.Resources>
|
|
<NavigationView.MenuItems>
|
|
<NavigationViewItem
|
|
x:Uid="Shell_Dashboard"
|
|
helpers:NavHelper.NavigateTo="views:DashboardPage"
|
|
Icon="{ui:FontIcon Glyph=}" />
|
|
|
|
<NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
|
|
<NavigationViewItem.Icon>
|
|
<AnimatedIcon>
|
|
<AnimatedIcon.Source>
|
|
<animatedVisuals:AnimatedSettingsVisualSource />
|
|
</AnimatedIcon.Source>
|
|
<AnimatedIcon.FallbackIconSource>
|
|
<SymbolIconSource Symbol="Setting" />
|
|
</AnimatedIcon.FallbackIconSource>
|
|
</AnimatedIcon>
|
|
</NavigationViewItem.Icon>
|
|
</NavigationViewItem>
|
|
<NavigationViewItemSeparator />
|
|
|
|
<!-- System Tools -->
|
|
<NavigationViewItem
|
|
x:Uid="Shell_TopLevelSystemTools"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/SystemTools.png}"
|
|
SelectsOnInvoked="False">
|
|
<NavigationViewItem.MenuItems>
|
|
<NavigationViewItem
|
|
x:Uid="Shell_AdvancedPaste"
|
|
helpers:NavHelper.NavigateTo="views:AdvancedPastePage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AdvancedPaste.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_Awake"
|
|
helpers:NavHelper.NavigateTo="views:AwakePage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_CmdPal"
|
|
helpers:NavHelper.NavigateTo="views:CmdPalPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_ColorPicker"
|
|
helpers:NavHelper.NavigateTo="views:ColorPickerPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_PowerLauncher"
|
|
helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_MeasureTool"
|
|
helpers:NavHelper.NavigateTo="views:MeasureToolPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_ShortcutGuide"
|
|
helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_TextExtractor"
|
|
helpers:NavHelper.NavigateTo="views:PowerOcrPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_ZoomIt"
|
|
helpers:NavHelper.NavigateTo="views:ZoomItPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ZoomIt.png}" />
|
|
</NavigationViewItem.MenuItems>
|
|
</NavigationViewItem>
|
|
|
|
<!-- Windowing & Layouts -->
|
|
<NavigationViewItem
|
|
x:Uid="Shell_TopLevelWindowsAndLayouts "
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/WindowingAndLayouts.png}"
|
|
SelectsOnInvoked="False">
|
|
<NavigationViewItem.MenuItems>
|
|
<NavigationViewItem
|
|
x:Uid="Shell_AlwaysOnTop"
|
|
helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_CropAndLock"
|
|
helpers:NavHelper.NavigateTo="views:CropAndLockPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_FancyZones"
|
|
helpers:NavHelper.NavigateTo="views:FancyZonesPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_Workspaces"
|
|
helpers:NavHelper.NavigateTo="views:WorkspacesPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Workspaces.png}" />
|
|
</NavigationViewItem.MenuItems>
|
|
</NavigationViewItem>
|
|
|
|
<!-- Input / Output -->
|
|
<NavigationViewItem
|
|
x:Uid="Shell_TopLevelInputOutput"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/InputOutput.png}"
|
|
SelectsOnInvoked="False">
|
|
<NavigationViewItem.MenuItems>
|
|
<NavigationViewItem
|
|
x:Uid="Shell_KeyboardManager"
|
|
helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
|
|
<!-- Find my mouse -->
|
|
<!-- Mouse Highlighter -->
|
|
<NavigationViewItem
|
|
x:Uid="Shell_MouseUtilities"
|
|
helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_MouseWithoutBorders"
|
|
helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_QuickAccent"
|
|
helpers:NavHelper.NavigateTo="views:PowerAccentPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
|
|
</NavigationViewItem.MenuItems>
|
|
</NavigationViewItem>
|
|
|
|
<!-- File Management -->
|
|
<NavigationViewItem
|
|
x:Uid="Shell_TopLevelFileManagement"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileManagement.png}"
|
|
SelectsOnInvoked="False">
|
|
<NavigationViewItem.MenuItems>
|
|
<NavigationViewItem
|
|
x:Uid="Shell_PowerPreview"
|
|
helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
|
|
<!-- File Explorer Thumbnails -->
|
|
<NavigationViewItem
|
|
x:Uid="Shell_FileLocksmith"
|
|
helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_ImageResizer"
|
|
helpers:NavHelper.NavigateTo="views:ImageResizerPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="NewPlus_Product_Name"
|
|
helpers:NavHelper.NavigateTo="views:NewPlusPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_Peek"
|
|
helpers:NavHelper.NavigateTo="views:PeekPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_PowerRename"
|
|
helpers:NavHelper.NavigateTo="views:PowerRenamePage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
|
|
</NavigationViewItem.MenuItems>
|
|
</NavigationViewItem>
|
|
|
|
<!-- Advanced -->
|
|
<NavigationViewItem
|
|
x:Uid="Shell_TopLevelAdvanced"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Advanced.png}"
|
|
SelectsOnInvoked="False">
|
|
<NavigationViewItem.MenuItems>
|
|
<NavigationViewItem
|
|
x:Uid="Shell_CmdNotFound"
|
|
helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_EnvironmentVariables"
|
|
helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_Hosts"
|
|
helpers:NavHelper.NavigateTo="views:HostsPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
|
|
<NavigationViewItem
|
|
x:Uid="Shell_RegistryPreview"
|
|
helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
|
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
|
|
</NavigationViewItem.MenuItems>
|
|
</NavigationViewItem>
|
|
</NavigationView.MenuItems>
|
|
<NavigationView.PaneFooter>
|
|
<StackPanel Orientation="Vertical">
|
|
<NavigationViewItem
|
|
x:Uid="OOBE_NavViewItem"
|
|
Icon="{ui:FontIcon Glyph=}"
|
|
Tapped="OOBEItem_Tapped" />
|
|
<NavigationViewItem
|
|
x:Uid="WhatIsNew_NavViewItem"
|
|
Icon="{ui:FontIcon Glyph=}"
|
|
Tapped="WhatIsNewItem_Tapped" />
|
|
<NavigationViewItem
|
|
x:Uid="Feedback_NavViewItem"
|
|
Icon="{ui:FontIcon Glyph=}"
|
|
Tapped="FeedbackItem_Tapped" />
|
|
<NavigationViewItem
|
|
x:Uid="Close_NavViewItem"
|
|
Icon="{ui:FontIcon Glyph=}"
|
|
Tapped="Close_Tapped"
|
|
Visibility="{x:Bind ViewModel.ShowCloseMenu, Mode=OneWay}" />
|
|
</StackPanel>
|
|
</NavigationView.PaneFooter>
|
|
<i:Interaction.Behaviors>
|
|
<ic:EventTriggerBehavior EventName="ItemInvoked">
|
|
<ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" />
|
|
</ic:EventTriggerBehavior>
|
|
</i:Interaction.Behaviors>
|
|
<Frame x:Name="shellFrame" />
|
|
</NavigationView>
|
|
<ContentDialog
|
|
x:Name="CloseDialog"
|
|
x:Uid="CloseDialog"
|
|
IsPrimaryButtonEnabled="True"
|
|
IsSecondaryButtonEnabled="True"
|
|
PrimaryButtonClick="CloseDialog_Click"
|
|
PrimaryButtonStyle="{StaticResource AccentButtonStyle}" />
|
|
</Grid>
|
|
</UserControl>
|