mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-19 15:03:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[PTRun]Fix tooltip closing and improve Registry tooltip spacing (#31361)

Browse Source
This commit is contained in:
Davide Giacometti 2024-02-16 15:26:48 +01:00 committed by GitHub
parent 3e58382637
commit 37867e008b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Helper/ResultHelper.cs
View File

@ -58,7 +58,7 @@ namespace Microsoft.PowerToys.Run.Plugin.Registry.Helper
result.Action = (_) => ContextMenuHelper.TryToOpenInRegistryEditor(entry);
result.ContextData = entry;
result.ToolTipData = new ToolTipData(Resources.RegistryKey, $"{Resources.KeyName}\t{result.Title}");
result.ToolTipData = new ToolTipData(Resources.RegistryKey, $"{Resources.KeyName} {result.Title}");
resultList.Add(result);
}
@ -198,10 +198,10 @@ namespace Microsoft.PowerToys.Run.Plugin.Registry.Helper
/// <returns>A tool-tip text</returns>
private static string GetToolTipTextForRegistryValue(RegistryKey key, KeyValuePair<string, object> valueEntry)
{
return $"{Resources.KeyName}\t{key.Name}{Environment.NewLine}"
+ $"{Resources.Name}\t{valueEntry.Key}{Environment.NewLine}"
+ $"{Resources.Type}\t{ValueHelper.GetType(key, valueEntry.Key)}{Environment.NewLine}"
+ $"{Resources.Value}\t{ValueHelper.GetValue(key, valueEntry.Key)}";
return $"{Resources.KeyName} {key.Name}{Environment.NewLine}"
+ $"{Resources.Name} {valueEntry.Key}{Environment.NewLine}"
+ $"{Resources.Type} {ValueHelper.GetType(key, valueEntry.Key)}{Environment.NewLine}"
+ $"{Resources.Value} {ValueHelper.GetValue(key, valueEntry.Key)}";
}
/// <summary>

2
src/modules/launcher/PowerLauncher/ResultList.xaml
View File

@ -85,12 +85,14 @@
FontWeight="SemiBold"
Style="{DynamicResource CollapsableTextblock}"
Text="{Binding Result.ToolTipData.Title}"
TextAlignment="Left"
TextWrapping="Wrap" />
<TextBlock
Margin="0,4,0,0"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Style="{DynamicResource CollapsableTextblock}"
Text="{Binding Result.ToolTipData.Text}"
TextAlignment="Left"
TextWrapping="Wrap" />
</StackPanel>
</ToolTip>

16
src/modules/launcher/PowerLauncher/ResultList.xaml.cs
View File

@ -22,7 +22,7 @@ namespace PowerLauncher
// From https://learn.microsoft.com/dotnet/desktop/wpf/data/how-to-find-datatemplate-generated-elements
private TypeChildItem FindVisualChild<TypeChildItem>(DependencyObject obj)
where TypeChildItem : DependencyObject
where TypeChildItem : DependencyObject
{
for (int i = 0; i < VisualTreeHelper.GetChildrenCount(obj); i++)
{
@ -80,20 +80,22 @@ namespace PowerLauncher
}
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1309:Use ordinal string comparison", Justification = "Using StringComparison.InvariantCulture since this is user facing")]
private void ToolTip_Opened(object sender, RoutedEventArgs e)
{
if (string.Equals(sender.GetType().FullName, "System.Windows.Controls.ToolTip", System.StringComparison.InvariantCulture))
if (string.Equals(sender.GetType().FullName, "System.Windows.Controls.ToolTip", System.StringComparison.Ordinal))
{
HideCurrentToolTip();
_previouslyOpenedToolTip = (ToolTip)sender;
var openedToolTip = (ToolTip)sender;
if (_previouslyOpenedToolTip != openedToolTip)
{
HideCurrentToolTip();
_previouslyOpenedToolTip = openedToolTip;
}
}
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1309:Use ordinal string comparison", Justification = "Using StringComparison.InvariantCulture since this is user facing")]
private void SuggestionsListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (string.Equals(((ListView)e.OriginalSource).Name, "SuggestionsList", System.StringComparison.InvariantCulture))
if (string.Equals(((ListView)e.OriginalSource).Name, "SuggestionsList", System.StringComparison.Ordinal))
{
HideCurrentToolTip();
}