mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-09 04:37:30 +02:00
Search UX improvements (#41386)
### 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>
This commit is contained in:
@@ -17,7 +17,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers;
|
|||||||
public abstract partial class NavigablePage : Page
|
public abstract partial class NavigablePage : Page
|
||||||
{
|
{
|
||||||
private const int ExpandWaitDuration = 500;
|
private const int ExpandWaitDuration = 500;
|
||||||
private const int AnimationDuration = 2000;
|
private const int AnimationDuration = 1850;
|
||||||
|
|
||||||
private NavigationParams _pendingNavigationParams;
|
private NavigationParams _pendingNavigationParams;
|
||||||
|
|
||||||
@@ -92,9 +92,9 @@ public abstract partial class NavigablePage : Page
|
|||||||
dropShadow.Offset = new Vector3(0, 0, 0);
|
dropShadow.Offset = new Vector3(0, 0, 0);
|
||||||
|
|
||||||
var spriteVisual = compositor.CreateSpriteVisual();
|
var spriteVisual = compositor.CreateSpriteVisual();
|
||||||
spriteVisual.Size = new Vector2((float)target.ActualWidth, (float)target.ActualHeight);
|
spriteVisual.Size = new Vector2((float)target.ActualWidth + 8, (float)target.ActualHeight + 8);
|
||||||
spriteVisual.Shadow = dropShadow;
|
spriteVisual.Shadow = dropShadow;
|
||||||
spriteVisual.Offset = new Vector3(0, 0, 0);
|
spriteVisual.Offset = new Vector3(-4, -4, 0);
|
||||||
|
|
||||||
// Insert the shadow visual behind the target element
|
// Insert the shadow visual behind the target element
|
||||||
ElementCompositionPreview.SetElementChildVisual(target, spriteVisual);
|
ElementCompositionPreview.SetElementChildVisual(target, spriteVisual);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using CommunityToolkit.WinUI.Controls;
|
||||||
using Microsoft.PowerToys.Settings.UI.Helpers;
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
||||||
using Microsoft.PowerToys.Settings.UI.Services;
|
using Microsoft.PowerToys.Settings.UI.Services;
|
||||||
using Microsoft.PowerToys.Settings.UI.ViewModels;
|
using Microsoft.PowerToys.Settings.UI.ViewModels;
|
||||||
@@ -32,7 +33,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
if (e.Parameter is SearchResultsNavigationParams searchParams)
|
if (e.Parameter is SearchResultsNavigationParams searchParams)
|
||||||
{
|
{
|
||||||
ViewModel.SetSearchResults(searchParams.Query, searchParams.Results);
|
ViewModel.SetSearchResults(searchParams.Query, searchParams.Results);
|
||||||
PageControl.ModuleDescription = string.Empty;
|
PageControl.ModuleDescription = $"{ResourceLoaderInstance.ResourceLoader.GetString("Search_ResultsFor")} '{searchParams.Query}'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,7 +44,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
private void ModuleButton_Click(object sender, RoutedEventArgs e)
|
private void ModuleButton_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is CommunityToolkit.WinUI.Controls.SettingsCard card && card.DataContext is SettingEntry tagEntry)
|
if (sender is SettingsCard card && card.DataContext is SettingEntry tagEntry)
|
||||||
{
|
{
|
||||||
NavigateToModule(tagEntry);
|
NavigateToModule(tagEntry);
|
||||||
}
|
}
|
||||||
@@ -51,7 +52,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
|
|||||||
|
|
||||||
private void SettingButton_Click(object sender, RoutedEventArgs e)
|
private void SettingButton_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is CommunityToolkit.WinUI.Controls.SettingsCard card && card.DataContext is SettingEntry tagEntry)
|
if (sender is SettingsCard card && card.DataContext is SettingEntry tagEntry)
|
||||||
{
|
{
|
||||||
NavigateToSetting(tagEntry);
|
NavigateToSetting(tagEntry);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,12 +57,6 @@
|
|||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
<DataTemplate x:Key="NoResultSearchResultTemplate" x:DataType="models:SuggestionItem">
|
<DataTemplate x:Key="NoResultSearchResultTemplate" x:DataType="models:SuggestionItem">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Rectangle
|
|
||||||
Height="1"
|
|
||||||
Margin="0,-4,0,0"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Top"
|
|
||||||
Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="8"
|
Margin="8"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
@@ -71,10 +65,10 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
<DataTemplate x:Key="ShowAllSearchResultTemplate" x:DataType="models:SuggestionItem">
|
<DataTemplate x:Key="ShowAllSearchResultTemplate" x:DataType="models:SuggestionItem">
|
||||||
<Grid Padding="16,8">
|
<Grid>
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Height="1"
|
Height="1"
|
||||||
Margin="0,-4,0,0"
|
Margin="0,-12,0,0"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
|
Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
|
||||||
@@ -92,7 +86,6 @@
|
|||||||
<ic:InvokeCommandAction Command="{x:Bind ViewModel.LoadedCommand}" />
|
<ic:InvokeCommandAction Command="{x:Bind ViewModel.LoadedCommand}" />
|
||||||
</ic:EventTriggerBehavior>
|
</ic:EventTriggerBehavior>
|
||||||
</i:Interaction.Behaviors>
|
</i:Interaction.Behaviors>
|
||||||
|
|
||||||
<Grid x:Name="RootGrid">
|
<Grid x:Name="RootGrid">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="48" />
|
<RowDefinition Height="48" />
|
||||||
|
|||||||
@@ -2902,20 +2902,19 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
|
|||||||
<data name="MouseUtils_GlidingCursor.Description" xml:space="preserve">
|
<data name="MouseUtils_GlidingCursor.Description" xml:space="preserve">
|
||||||
<value>An accessibility feature that lets you control the mouse with a single button using guided horizontal and vertical lines</value>
|
<value>An accessibility feature that lets you control the mouse with a single button using guided horizontal and vertical lines</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="MouseUtils_GlidingCursor_InitialSpeed.Header" xml:space="preserve">
|
<data name="MouseUtils_GlidingCursor_InitialSpeed.Header" xml:space="preserve">
|
||||||
<value>Initial line speed</value>
|
<value>Initial line speed</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="MouseUtils_GlidingCursor_InitialSpeed.Description" xml:space="preserve">
|
<data name="MouseUtils_GlidingCursor_InitialSpeed.Description" xml:space="preserve">
|
||||||
<value>Speed of the horizontal or vertical line when it begins moving</value>
|
<value>Speed of the horizontal or vertical line when it begins moving</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="MouseUtils_GlidingCursor_DelaySpeed.Header" xml:space="preserve">
|
<data name="MouseUtils_GlidingCursor_DelaySpeed.Header" xml:space="preserve">
|
||||||
<value>Reduced line speed</value>
|
<value>Reduced line speed</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="MouseUtils_GlidingCursor_DelaySpeed.Description" xml:space="preserve">
|
<data name="MouseUtils_GlidingCursor_DelaySpeed.Description" xml:space="preserve">
|
||||||
<value>Speed after slowing down the line with a second shortcut press</value>
|
<value>Speed after slowing down the line with a second shortcut press</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="FancyZones_Radio_Custom_Colors.Content" xml:space="preserve">
|
||||||
<data name="FancyZones_Radio_Custom_Colors.Content" xml:space="preserve">
|
|
||||||
<value>Custom colors</value>
|
<value>Custom colors</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FancyZones_Radio_Default_Theme.Content" xml:space="preserve">
|
<data name="FancyZones_Radio_Default_Theme.Content" xml:space="preserve">
|
||||||
@@ -5272,7 +5271,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
|
|||||||
<value>All shortcuts function correctly</value>
|
<value>All shortcuts function correctly</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ResolveConflicts_Button.Content" xml:space="preserve">
|
<data name="ResolveConflicts_Button.Content" xml:space="preserve">
|
||||||
<value>Resolve conflicts</value>
|
<value>Resolve conflicts</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ShortcutConflictControl_Title.Text" xml:space="preserve">
|
<data name="ShortcutConflictControl_Title.Text" xml:space="preserve">
|
||||||
<value>Shortcut conflicts</value>
|
<value>Shortcut conflicts</value>
|
||||||
@@ -5293,4 +5292,8 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
|
|||||||
<data name="Hosts_NoLeadingSpaces.Description" xml:space="preserve">
|
<data name="Hosts_NoLeadingSpaces.Description" xml:space="preserve">
|
||||||
<value>Do not prepend spaces to active lines when saving the hosts file</value>
|
<value>Do not prepend spaces to active lines when saving the hosts file</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Search_ResultsFor" xml:space="preserve">
|
||||||
|
<value>Results for</value>
|
||||||
|
<comment>Prefix for search string. E.g. "Results for 'shortcut'"</comment>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
Reference in New Issue
Block a user