forked from unoplatform/uno
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add support for Keyboard Accelerator tooltips
- Loading branch information
1 parent
1860843
commit 5643e23
Showing
4 changed files
with
117 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. See LICENSE in the project root for license information. | ||
| // MUX Reference dxaml\xcp\dxaml\lib\ToolTipService_Partial.cpp, tag winui3/release/1.5.4, commit 98a60c8f30c84f297a175dd2884d54ecd1c8a4a9 | ||
| // Contains ported portions of dxaml\xcp\dxaml\lib\ToolTipService_Partial.cpp | ||
|
|
||
| #nullable enable | ||
|
|
||
| using static Uno.UI.FeatureConfiguration; | ||
|
|
||
| namespace Microsoft.UI.Xaml.Controls; | ||
|
|
||
| partial class ToolTipService | ||
| { | ||
| private static void OnToolTipChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args) | ||
| { | ||
| if (sender is FrameworkElement senderAsFe) | ||
| { | ||
| bool isKeyboardAcceleratorToolTip = args.Property == ToolTipService.KeyboardAcceleratorToolTipProperty; | ||
| if (args.OldValue is not UnsetValue && args.OldValue is not null) | ||
| { | ||
| ToolTipService.UnregisterToolTip(sender, senderAsFe, isKeyboardAcceleratorToolTip); | ||
| } | ||
|
|
||
| if (args.NewValue is { } toolTip) | ||
| { | ||
| ToolTipService.RegisterToolTip(sender, senderAsFe, toolTip, isKeyboardAcceleratorToolTip); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static ToolTip ConvertToToolTip(object objectIn) | ||
| { | ||
| if (objectIn is not ToolTip toolTip) | ||
| { | ||
| if (objectIn is FrameworkElement frameworkElement) | ||
| { | ||
| var objectInParent = objectIn.GetParent(); | ||
| if (objectInParent is ToolTip parentToolTip) | ||
| { | ||
| return parentToolTip; | ||
| } | ||
| } | ||
|
|
||
| var newToolTip = new ToolTip | ||
| { | ||
| Content = objectIn | ||
| }; | ||
|
|
||
| toolTip = newToolTip; | ||
| } | ||
|
|
||
| return toolTip; | ||
| } | ||
|
|
||
| internal static ToolTip? GetActualToolTipObject(DependencyObject element) | ||
| { | ||
| // Try to get the actual public tooltip object | ||
| var toolTip = ToolTipService.GetToolTipReference(element); | ||
|
|
||
| // If public tooltip doesn't exist, then look for keyboard accelerator tooltip. | ||
| if (toolTip is null) | ||
| { | ||
| toolTip = ToolTipService.GetKeyboardAcceleratorToolTipObject(element); | ||
| } | ||
|
|
||
| return toolTip; | ||
| } | ||
| } |