Fix KeyVisual Issue

ghost1372 · ghost1372 · commit f0cf800b4e46 · 2025-10-17T17:54:17.000+03:30
diff --git a/dev/DevWinUI.Controls/Controls/KeyVisual/KeyVisual.cs b/dev/DevWinUI.Controls/Controls/KeyVisual/KeyVisual.cs
@@ -22,23 +22,24 @@ public object Content
         set => SetValue(ContentProperty, value);
     }
 
-    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(KeyVisual), new PropertyMetadata(default(string), OnContentChanged));
+    public static readonly DependencyProperty ContentProperty =
+        DependencyProperty.Register(nameof(Content), typeof(object), typeof(KeyVisual), new PropertyMetadata(null, OnContentChanged));
 
     public VisualType VisualType
     {
         get => (VisualType)GetValue(VisualTypeProperty);
         set => SetValue(VisualTypeProperty, value);
     }
 
-    public static readonly DependencyProperty VisualTypeProperty = DependencyProperty.Register("VisualType", typeof(VisualType), typeof(KeyVisual), new PropertyMetadata(default(VisualType), OnSizeChanged));
+    public static readonly DependencyProperty VisualTypeProperty = DependencyProperty.Register(nameof(VisualType), typeof(VisualType), typeof(KeyVisual), new PropertyMetadata(default(VisualType), OnSizeChanged));
 
     public bool IsError
     {
         get => (bool)GetValue(IsErrorProperty);
         set => SetValue(IsErrorProperty, value);
     }
 
-    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register("IsError", typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnIsErrorChanged));
+    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(nameof(IsError), typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnIsErrorChanged));
 
     public KeyVisual()
     {
@@ -82,13 +83,21 @@ private void Update()
 
         if (_keyVisual.Content != null)
         {
-            object content = _keyVisual.Content;
-            VirtualKey key = content switch
+            VirtualKey key = VirtualKey.None;
+
+            var content = _keyVisual.Content;
+            string keyName = null;
+
+            if (content is string strContent)
             {
-                string str => GetVirtualKeyFromString(str),
-                VirtualKey vk => vk,
-                _ => (VirtualKey)(int)content
-            };
+                key = GetVirtualKeyFromString(strContent);
+                keyName = strContent;
+            }
+            else if (content is KeyVisualInfo keyVisualInfo)
+            {
+                key = (VirtualKey)keyVisualInfo.Key;
+                keyName = keyVisualInfo.KeyName;
+            }
 
             if (TryGetIconForKey((int)key, out object iconContent))
             {
@@ -98,7 +107,7 @@ private void Update()
             else
             {
                 _keyVisual.Style = GetStyleSize("TextKeyVisualStyle");
-                _keyVisual._keyPresenter.Content = content.ToString();
+                _keyVisual._keyPresenter.Content = keyName;
             }
         }
     }
diff --git a/dev/DevWinUI.Controls/Controls/KeyVisual/KeyVisualInfo.cs b/dev/DevWinUI.Controls/Controls/KeyVisual/KeyVisualInfo.cs
@@ -0,0 +1,14 @@
+﻿using Windows.System;
+
+namespace DevWinUI;
+
+public partial class KeyVisualInfo
+{
+    public VirtualKey? Key { get; set; }
+    public string KeyName { get; set; }
+
+    public override string ToString()
+    {
+        return KeyName;
+    }
+}
diff --git a/dev/DevWinUI.Controls/Controls/Shortcut/Shortcut.cs b/dev/DevWinUI.Controls/Controls/Shortcut/Shortcut.cs
@@ -261,8 +261,7 @@ private void OnKeyDown(object sender, KeyRoutedEventArgs e)
             _keyOrder.Add(key);
         }
 
-        // Now use _keyOrder for display — but only include keys still in _pressedKeys
-        var keyNames = _keyOrder.Where(_pressedKeys.Contains).Select(GetKeyName).ToList();
+        var keyNames = _keyOrder.Where(_pressedKeys.Contains).Select(key=> new KeyVisualInfo { Key = key, KeyName = GetKeyName(key) }).ToList();
         shortcut.Keys = keyNames.Cast<object>().ToList();
 
         int modifierCount = _pressedKeys.Count(IsModifierKey);

Original file line number	Diff line number	Diff line change
`@@ -22,23 +22,24 @@ public object Content`
`22`	`22`	`set => SetValue(ContentProperty, value);`
`23`	`23`	`}`
`24`	`24`
`25`		`- public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(KeyVisual), new PropertyMetadata(default(string), OnContentChanged));`
	`25`	`+ public static readonly DependencyProperty ContentProperty =`
	`26`	`+ DependencyProperty.Register(nameof(Content), typeof(object), typeof(KeyVisual), new PropertyMetadata(null, OnContentChanged));`
`26`	`27`
`27`	`28`	`public VisualType VisualType`
`28`	`29`	`{`
`29`	`30`	`get => (VisualType)GetValue(VisualTypeProperty);`
`30`	`31`	`set => SetValue(VisualTypeProperty, value);`
`31`	`32`	`}`
`32`	`33`
`33`		`- public static readonly DependencyProperty VisualTypeProperty = DependencyProperty.Register("VisualType", typeof(VisualType), typeof(KeyVisual), new PropertyMetadata(default(VisualType), OnSizeChanged));`
	`34`	`+ public static readonly DependencyProperty VisualTypeProperty = DependencyProperty.Register(nameof(VisualType), typeof(VisualType), typeof(KeyVisual), new PropertyMetadata(default(VisualType), OnSizeChanged));`
`34`	`35`
`35`	`36`	`public bool IsError`
`36`	`37`	`{`
`37`	`38`	`get => (bool)GetValue(IsErrorProperty);`
`38`	`39`	`set => SetValue(IsErrorProperty, value);`
`39`	`40`	`}`
`40`	`41`
`41`		`- public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register("IsError", typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnIsErrorChanged));`
	`42`	`+ public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(nameof(IsError), typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnIsErrorChanged));`
`42`	`43`
`43`	`44`	`public KeyVisual()`
`44`	`45`	`{`
`@@ -82,13 +83,21 @@ private void Update()`
`82`	`83`
`83`	`84`	`if (_keyVisual.Content != null)`
`84`	`85`	`{`
`85`		`- object content = _keyVisual.Content;`
`86`		`- VirtualKey key = content switch`
	`86`	`+ VirtualKey key = VirtualKey.None;`
	`87`	`+`
	`88`	`+ var content = _keyVisual.Content;`
	`89`	`+ string keyName = null;`
	`90`	`+`
	`91`	`+ if (content is string strContent)`
`87`	`92`	`{`
`88`		`- string str => GetVirtualKeyFromString(str),`
`89`		`- VirtualKey vk => vk,`
`90`		`- _ => (VirtualKey)(int)content`
`91`		`- };`
	`93`	`+ key = GetVirtualKeyFromString(strContent);`
	`94`	`+ keyName = strContent;`
	`95`	`+ }`
	`96`	`+ else if (content is KeyVisualInfo keyVisualInfo)`
	`97`	`+ {`
	`98`	`+ key = (VirtualKey)keyVisualInfo.Key;`
	`99`	`+ keyName = keyVisualInfo.KeyName;`
	`100`	`+ }`
`92`	`101`
`93`	`102`	`if (TryGetIconForKey((int)key, out object iconContent))`
`94`	`103`	`{`
`@@ -98,7 +107,7 @@ private void Update()`
`98`	`107`	`else`
`99`	`108`	`{`
`100`	`109`	`_keyVisual.Style = GetStyleSize("TextKeyVisualStyle");`
`101`		`- _keyVisual._keyPresenter.Content = content.ToString();`
	`110`	`+ _keyVisual._keyPresenter.Content = keyName;`
`102`	`111`	`}`
`103`	`112`	`}`
`104`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,7 @@ private void OnKeyDown(object sender, KeyRoutedEventArgs e)`
`261`	`261`	`_keyOrder.Add(key);`
`262`	`262`	`}`
`263`	`263`
`264`		`- // Now use _keyOrder for display — but only include keys still in _pressedKeys`
`265`		`- var keyNames = _keyOrder.Where(_pressedKeys.Contains).Select(GetKeyName).ToList();`
	`264`	`+ var keyNames = _keyOrder.Where(_pressedKeys.Contains).Select(key=> new KeyVisualInfo { Key = key, KeyName = GetKeyName(key) }).ToList();`
`266`	`265`	`shortcut.Keys = keyNames.Cast<object>().ToList();`
`267`	`266`
`268`	`267`	`int modifierCount = _pressedKeys.Count(IsModifierKey);`