From 04305234a107199c3e786c669a6de982630c7eca Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 9 Mar 2024 18:38:22 +0800
Subject: [PATCH 1/8] feat: prototype.

---
 demo/Ursa.Demo/Pages/BannerDemo.axaml      |  1 +
 src/Ursa.Themes.Semi/Controls/NumPad.axaml | 14 ++++
 src/Ursa.Themes.Semi/Controls/_index.axaml |  1 +
 src/Ursa/Controls/NumPad/NumPad.cs         | 78 ++++++++++++++++++++++
 4 files changed, 94 insertions(+)
 create mode 100644 src/Ursa.Themes.Semi/Controls/NumPad.axaml
 create mode 100644 src/Ursa/Controls/NumPad/NumPad.cs

diff --git a/demo/Ursa.Demo/Pages/BannerDemo.axaml b/demo/Ursa.Demo/Pages/BannerDemo.axaml
index d7a275e..c518be6 100644
--- a/demo/Ursa.Demo/Pages/BannerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml
@@ -47,5 +47,6 @@
                 </Grid>
             </Border>
         </Grid>
+        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Controls/NumPad.axaml b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
new file mode 100644
index 0000000..b7a4d55
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:u="https://irihi.tech/ursa">
+    <!-- Add Resources Here -->
+    <ControlTheme x:Key="{x:Type u:NumPad}" TargetType="{x:Type u:NumPad}">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:NumPad">
+                <Border Padding="48">
+                    <Button Focusable="False" Name="{x:Static u:NumPad.PART_Seven}" Content="7" Width="32"></Button>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index ddb53fd..8db1c2b 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -22,6 +22,7 @@
         <ResourceInclude Source="MessageBox.axaml" />
         <ResourceInclude Source="NavMenu.axaml" />
         <ResourceInclude Source="NumericUpDown.axaml" />
+        <ResourceInclude Source="NumPad.axaml" />
         <ResourceInclude Source="NumberDisplayer.axaml" />
         <ResourceInclude Source="Pagination.axaml" />
         <ResourceInclude Source="RangeSlider.axaml" />
diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
new file mode 100644
index 0000000..12bbcfb
--- /dev/null
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -0,0 +1,78 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Irihi.Avalonia.Shared.Helpers;
+
+namespace Ursa.Controls;
+
+[TemplatePart(NumPad.PART_Seven, typeof(Button))]
+public class NumPad: TemplatedControl
+{
+    public const string PART_Seven = "PART_Seven";
+    private Button? _sevenButton;
+    public static readonly StyledProperty<InputElement?> TargetProperty = AvaloniaProperty.Register<NumPad, InputElement?>(
+        nameof(Target));
+
+    public InputElement? Target
+    {
+        get => GetValue(TargetProperty);
+        set => SetValue(TargetProperty, value);
+    }
+
+    public static readonly AttachedProperty<bool> AttachProperty =
+        AvaloniaProperty.RegisterAttached<NumPad, InputElement, bool>("Attach");
+
+    public static void SetAttach(InputElement obj, bool value) => obj.SetValue(AttachProperty, value);
+    public static bool GetAttach(InputElement obj) => obj.GetValue(AttachProperty);
+
+    static NumPad()
+    {
+        TargetProperty.Changed.AddClassHandler<NumPad, InputElement?>((n, args) => n.OnTargetChanged(args));
+        AttachProperty.Changed.AddClassHandler<InputElement, bool>((input, args)=> OnAttachNumPad(input, args));
+    }
+
+    private static void OnAttachNumPad(InputElement input, AvaloniaPropertyChangedEventArgs<bool> args)
+    {
+        if (args.NewValue.Value)
+        {
+            GotFocusEvent.AddHandler(OnTargetGotFocus, input);
+        }
+        else
+        {
+            GotFocusEvent.RemoveHandler(OnTargetGotFocus, input);
+        }
+    }
+
+    private void OnTargetChanged(AvaloniaPropertyChangedEventArgs<InputElement?> args)
+    {
+        //GotFocusEvent.RemoveHandler(OnTargetGotFocus, args.OldValue.Value);
+        //GotFocusEvent.AddHandler(OnTargetGotFocus, args.NewValue.Value);
+    }
+    
+    private static void OnTargetGotFocus(object sender, GotFocusEventArgs e)
+    {
+        var numPad = new NumPad() { Target = sender as InputElement };
+        OverlayDialog.ShowCustom(numPad, new object());
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        Button.ClickEvent.RemoveHandler(OnSevenButtonClick, _sevenButton);
+        _sevenButton = e.NameScope.Find<Button>(PART_Seven);
+        Button.ClickEvent.AddHandler(OnSevenButtonClick, _sevenButton);
+    }
+
+    private void OnSevenButtonClick(object sender, RoutedEventArgs e)
+    {
+        Target?.RaiseEvent(new TextInputEventArgs()
+        {
+            Source = this,
+            RoutedEvent = TextInputEvent,
+            Text = "7",
+        });
+    }
+}
\ No newline at end of file

From 51d7c3c870a37713d1f72f3fd0df0a80a188b52b Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 9 Mar 2024 18:52:26 +0800
Subject: [PATCH 2/8] feat: add recall as internal function to overlay dialog.

---
 demo/Ursa.Demo/Pages/BannerDemo.axaml                  |  3 +++
 src/Ursa/Controls/Dialog/OverlayDialog.cs              | 10 ++++++++--
 src/Ursa/Controls/NumPad/NumPad.cs                     |  7 +++++++
 src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs   |  7 ++++++-
 .../Controls/OverlayShared/OverlayDialogHost.Shared.cs |  6 ++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/BannerDemo.axaml b/demo/Ursa.Demo/Pages/BannerDemo.axaml
index c518be6..f94f5a4 100644
--- a/demo/Ursa.Demo/Pages/BannerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml
@@ -48,5 +48,8 @@
             </Border>
         </Grid>
         <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
+        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
+        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
+        <u:NumericIntUpDown u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></u:NumericIntUpDown>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa/Controls/Dialog/OverlayDialog.cs b/src/Ursa/Controls/Dialog/OverlayDialog.cs
index 8d16e5f..7d69047 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialog.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialog.cs
@@ -211,6 +211,12 @@ public static class OverlayDialog
         control.CanLightDismiss = options.CanLightDismiss;
         control.CanDragMove = options.CanDragMove;
     }
-    
-    
+
+    internal static T? Recall<T>(string? hostId) where T: Control
+    {
+        var host = OverlayDialogManager.GetHost(hostId);
+        if (host is null) return null;
+        var item = host.Recall<T>();
+        return item;
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
index 12bbcfb..817841a 100644
--- a/src/Ursa/Controls/NumPad/NumPad.cs
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -54,6 +54,13 @@ public class NumPad: TemplatedControl
     
     private static void OnTargetGotFocus(object sender, GotFocusEventArgs e)
     {
+        if (sender is not InputElement) return;
+        var existing = OverlayDialog.Recall<NumPad>(null);
+        if (existing is not null)
+        {
+            existing.Target = sender as InputElement;
+            return;
+        }
         var numPad = new NumPad() { Target = sender as InputElement };
         OverlayDialog.ShowCustom(numPad, new object());
     }
diff --git a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
index 198aa64..54aa1e9 100644
--- a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
+++ b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
@@ -215,7 +215,12 @@ public abstract class NumericUpDown : TemplatedControl, IClearControl
         }
         
     }
-    
+
+    protected override void OnTextInput(TextInputEventArgs e)
+    {
+        _textBox?.RaiseEvent(e);
+    }
+
     private void OnDragPanelPointerReleased(object sender, PointerReleasedEventArgs e)
     {
         _point = null;
diff --git a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
index da2a894..f2bdfa9 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
@@ -189,4 +189,10 @@ public partial class OverlayDialogHost: Canvas
         }
         return result;
     }
+
+    internal T? Recall<T>()
+    {
+        var element = _layers.LastOrDefault(a => a.Element.Content?.GetType() == typeof(T));
+        return element?.Element.Content is T t ? t : default;
+    }
 }
\ No newline at end of file

From 24dd00d5527d2635a079b66f02c2ecec92b79c8b Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 9 Mar 2024 19:28:18 +0800
Subject: [PATCH 3/8] feat: implement more buttons.

---
 demo/Ursa.Demo/Pages/BannerDemo.axaml         |  1 +
 src/Ursa.Themes.Semi/Controls/NumPad.axaml    | 75 +++++++++++++++++--
 src/Ursa/Controls/NumPad/NumPad.cs            | 15 ++--
 .../NumericUpDown/NumericUpDownBase.cs        |  1 -
 4 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/BannerDemo.axaml b/demo/Ursa.Demo/Pages/BannerDemo.axaml
index f94f5a4..5cdb150 100644
--- a/demo/Ursa.Demo/Pages/BannerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml
@@ -50,6 +50,7 @@
         <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
         <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
         <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
+        <u:IPv4Box u:NumPad.Attach="True" Width="200" ></u:IPv4Box>
         <u:NumericIntUpDown u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></u:NumericIntUpDown>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Controls/NumPad.axaml b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
index b7a4d55..887ee38 100644
--- a/src/Ursa.Themes.Semi/Controls/NumPad.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
@@ -1,12 +1,77 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:u="https://irihi.tech/ursa">
-    <!-- Add Resources Here -->
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:NumPad}" TargetType="{x:Type u:NumPad}">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:NumPad">
                 <Border Padding="48">
-                    <Button Focusable="False" Name="{x:Static u:NumPad.PART_Seven}" Content="7" Width="32"></Button>
+                    <Border.Styles>
+                        <Style Selector="Button">
+                            <Setter Property="Command" Value="{Binding $parent[u:NumPad].InputNumber}" />
+                            <Setter Property="CommandParameter" Value="{Binding $self.Content}" />
+                        </Style>
+                    </Border.Styles>
+                    <Grid ColumnDefinitions="*,*,*" RowDefinitions="*,*,*,*">
+                        <Button
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Content="7"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Content="8"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="0"
+                            Grid.Column="2"
+                            Content="9"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Content="4"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Content="5"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Content="6"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Content="1"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Content="2"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            Content="3"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="3"
+                            Grid.ColumnSpan="2"
+                            Grid.Column="0"
+                            Content="0"
+                            Focusable="False" />
+                        <Button
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            Content="."
+                            Focusable="False" />
+                    </Grid>
+
                 </Border>
             </ControlTemplate>
         </Setter>
diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
index 817841a..c1e0c1a 100644
--- a/src/Ursa/Controls/NumPad/NumPad.cs
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -8,10 +8,8 @@ using Irihi.Avalonia.Shared.Helpers;
 
 namespace Ursa.Controls;
 
-[TemplatePart(NumPad.PART_Seven, typeof(Button))]
 public class NumPad: TemplatedControl
 {
-    public const string PART_Seven = "PART_Seven";
     private Button? _sevenButton;
     public static readonly StyledProperty<InputElement?> TargetProperty = AvaloniaProperty.Register<NumPad, InputElement?>(
         nameof(Target));
@@ -68,9 +66,6 @@ public class NumPad: TemplatedControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        Button.ClickEvent.RemoveHandler(OnSevenButtonClick, _sevenButton);
-        _sevenButton = e.NameScope.Find<Button>(PART_Seven);
-        Button.ClickEvent.AddHandler(OnSevenButtonClick, _sevenButton);
     }
 
     private void OnSevenButtonClick(object sender, RoutedEventArgs e)
@@ -82,4 +77,14 @@ public class NumPad: TemplatedControl
             Text = "7",
         });
     }
+
+    public void InputNumber(object o)
+    {
+        Target?.RaiseEvent(new TextInputEventArgs()
+        {
+            Source = this,
+            RoutedEvent = TextInputEvent,
+            Text = o.ToString(),
+        });
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
index 54aa1e9..a8dbd14 100644
--- a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
+++ b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
@@ -213,7 +213,6 @@ public abstract class NumericUpDown : TemplatedControl, IClearControl
             _textBox?.Focus();
             _textBox!.IsReadOnly = true;
         }
-        
     }
 
     protected override void OnTextInput(TextInputEventArgs e)

From 93b55aae5e4f2f6c4868463ef75cee9bf459fb13 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 9 Mar 2024 21:50:15 +0800
Subject: [PATCH 4/8] feat: use repeat button

---
 src/Ursa.Themes.Semi/Controls/NumPad.axaml | 28 ++++++++++++----------
 src/Ursa/Controls/NumPad/NumPad.cs         |  7 +-----
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/NumPad.axaml b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
index 887ee38..5104b42 100644
--- a/src/Ursa.Themes.Semi/Controls/NumPad.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
@@ -6,66 +6,68 @@
     <ControlTheme x:Key="{x:Type u:NumPad}" TargetType="{x:Type u:NumPad}">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:NumPad">
-                <Border Padding="48">
+                <Border>
                     <Border.Styles>
-                        <Style Selector="Button">
+                        <Style Selector="RepeatButton">
                             <Setter Property="Command" Value="{Binding $parent[u:NumPad].InputNumber}" />
                             <Setter Property="CommandParameter" Value="{Binding $self.Content}" />
+                            <Setter Property="Width" Value="48"/>
+                            <Setter Property="Height" Value="48"/>
                         </Style>
                     </Border.Styles>
                     <Grid ColumnDefinitions="*,*,*" RowDefinitions="*,*,*,*">
-                        <Button
+                        <RepeatButton
                             Grid.Row="0"
                             Grid.Column="0"
                             Content="7"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="0"
                             Grid.Column="1"
                             Content="8"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="0"
                             Grid.Column="2"
                             Content="9"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="1"
                             Grid.Column="0"
                             Content="4"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="1"
                             Grid.Column="1"
                             Content="5"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="1"
                             Grid.Column="2"
                             Content="6"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="2"
                             Grid.Column="0"
                             Content="1"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="2"
                             Grid.Column="1"
                             Content="2"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="2"
                             Grid.Column="2"
                             Content="3"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="3"
                             Grid.ColumnSpan="2"
                             Grid.Column="0"
                             Content="0"
                             Focusable="False" />
-                        <Button
+                        <RepeatButton
                             Grid.Row="3"
                             Grid.Column="2"
                             Content="."
diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
index c1e0c1a..e1bcb7f 100644
--- a/src/Ursa/Controls/NumPad/NumPad.cs
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -60,12 +60,7 @@ public class NumPad: TemplatedControl
             return;
         }
         var numPad = new NumPad() { Target = sender as InputElement };
-        OverlayDialog.ShowCustom(numPad, new object());
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
+        OverlayDialog.Show(numPad, new object(), options: new OverlayDialogOptions() { Buttons = DialogButton.None });
     }
 
     private void OnSevenButtonClick(object sender, RoutedEventArgs e)

From dd31df874a2f3d1dd52e1188cc1209c0c37ded1d Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Sun, 10 Mar 2024 01:50:20 +0800
Subject: [PATCH 5/8] feat: use numpad button.

---
 demo/Ursa.Demo/Pages/BannerDemo.axaml         |   5 -
 demo/Ursa.Demo/Pages/NumPadDemo.axaml         |  15 +++
 demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs      |  14 ++
 .../Ursa.Demo/ViewModels/MainViewViewModel.cs |   1 +
 demo/Ursa.Demo/ViewModels/MenuViewModel.cs    |   2 +
 .../ViewModels/NumPadDemoViewModel.cs         |   6 +
 src/Ursa.Themes.Semi/Controls/NumPad.axaml    | 122 ++++++++++--------
 src/Ursa/Controls/NumPad/NumPad.cs            |  78 +++++++----
 src/Ursa/Controls/NumPad/NumPadButton.cs      |  54 ++++++++
 9 files changed, 214 insertions(+), 83 deletions(-)
 create mode 100644 demo/Ursa.Demo/Pages/NumPadDemo.axaml
 create mode 100644 demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs
 create mode 100644 demo/Ursa.Demo/ViewModels/NumPadDemoViewModel.cs
 create mode 100644 src/Ursa/Controls/NumPad/NumPadButton.cs

diff --git a/demo/Ursa.Demo/Pages/BannerDemo.axaml b/demo/Ursa.Demo/Pages/BannerDemo.axaml
index 5cdb150..d7a275e 100644
--- a/demo/Ursa.Demo/Pages/BannerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml
@@ -47,10 +47,5 @@
                 </Grid>
             </Border>
         </Grid>
-        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
-        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
-        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
-        <u:IPv4Box u:NumPad.Attach="True" Width="200" ></u:IPv4Box>
-        <u:NumericIntUpDown u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></u:NumericIntUpDown>
     </StackPanel>
 </UserControl>
diff --git a/demo/Ursa.Demo/Pages/NumPadDemo.axaml b/demo/Ursa.Demo/Pages/NumPadDemo.axaml
new file mode 100644
index 0000000..b593e7b
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/NumPadDemo.axaml
@@ -0,0 +1,15 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:u="https://irihi.tech/ursa"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ursa.Demo.Pages.NumPadDemo">
+    <StackPanel HorizontalAlignment="Left">
+        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
+        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
+        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
+        <u:IPv4Box u:NumPad.Attach="True" Width="200" ></u:IPv4Box>
+        <u:NumericIntUpDown u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></u:NumericIntUpDown>
+    </StackPanel>
+</UserControl>
diff --git a/demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs b/demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs
new file mode 100644
index 0000000..b82a6ae
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/NumPadDemo.axaml.cs
@@ -0,0 +1,14 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Pages;
+
+public partial class NumPadDemo : UserControl
+{
+    public NumPadDemo()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
index 5a0cd77..514ee9a 100644
--- a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
@@ -46,6 +46,7 @@ public class MainViewViewModel : ViewModelBase
             MenuKeys.MenuKeyNavMenu => new NavMenuDemoViewModel(),
             MenuKeys.MenuKeyNumberDisplayer => new NumberDisplayerDemoViewModel(),
             MenuKeys.MenuKeyNumericUpDown => new NumericUpDownDemoViewModel(),
+            MenuKeys.MenuKeyNumPad => new NumPadDemoViewModel(),
             MenuKeys.MenuKeyPagination => new PaginationDemoViewModel(),
             MenuKeys.MenuKeyRangeSlider => new RangeSliderDemoViewModel(),
             MenuKeys.MenuKeyScrollToButton => new ScrollToButtonDemoViewModel(),
diff --git a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
index a48238e..888e74d 100644
--- a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
@@ -33,6 +33,7 @@ public class MenuViewModel: ViewModelBase
             new() { MenuHeader = "Nav Menu", Key = MenuKeys.MenuKeyNavMenu, Status = "New"},
             // new() { MenuHeader = "Number Displayer", Key = MenuKeys.MenuKeyNumberDisplayer, Status = "New" }, 
             new() { MenuHeader = "Numeric UpDown", Key = MenuKeys.MenuKeyNumericUpDown },
+            new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad, Status = "New" },
             new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination },
             new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider },
             new() { MenuHeader = "Scroll To", Key = MenuKeys.MenuKeyScrollToButton, Status = "New" },
@@ -71,6 +72,7 @@ public static class MenuKeys
     public const string MenuKeyNavMenu = "NavMenu";
     public const string MenuKeyNumberDisplayer = "NumberDisplayer";
     public const string MenuKeyNumericUpDown = "NumericUpDown";
+    public const string MenuKeyNumPad = "NumPad";
     public const string MenuKeyPagination = "Pagination";
     public const string MenuKeyRangeSlider = "RangeSlider";
     public const string MenuKeyScrollToButton = "ScrollToButton";
diff --git a/demo/Ursa.Demo/ViewModels/NumPadDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/NumPadDemoViewModel.cs
new file mode 100644
index 0000000..88fcfb1
--- /dev/null
+++ b/demo/Ursa.Demo/ViewModels/NumPadDemoViewModel.cs
@@ -0,0 +1,6 @@
+namespace Ursa.Demo.ViewModels;
+
+public class NumPadDemoViewModel
+{
+    
+}
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/NumPad.axaml b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
index 5104b42..c5339e4 100644
--- a/src/Ursa.Themes.Semi/Controls/NumPad.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
@@ -9,73 +9,85 @@
                 <Border>
                     <Border.Styles>
                         <Style Selector="RepeatButton">
-                            <Setter Property="Command" Value="{Binding $parent[u:NumPad].InputNumber}" />
+                            <Setter Property="Command" Value="{Binding $parent[u:NumPad].ProcessClick}" />
                             <Setter Property="CommandParameter" Value="{Binding $self.Content}" />
-                            <Setter Property="Width" Value="48"/>
-                            <Setter Property="Height" Value="48"/>
+                            <Setter Property="Width" Value="48" />
+                            <Setter Property="Height" Value="48" />
+                        </Style>
+                        <Style Selector="u|NumPadButton">
+                            <Setter Property="NumMode" Value="{Binding $parent[u:NumPad].NumMode}" />
+                            <Setter Property="Command" Value="{Binding $parent[u:NumPad].ProcessClick}" />
+                            <Setter Property="Focusable" Value="False"></Setter>
+                            <Setter Property="CommandParameter" Value="{Binding $self}" />
+                            <Setter Property="Width" Value="54" />
+                            <Setter Property="Height" Value="54" />
                         </Style>
                     </Border.Styles>
-                    <Grid ColumnDefinitions="*,*,*" RowDefinitions="*,*,*,*">
-                        <RepeatButton
+                    <Grid ColumnDefinitions="*,*,*,*" RowDefinitions="*,*,*,*,*">
+                        <ToggleButton
                             Grid.Row="0"
                             Grid.Column="0"
-                            Content="7"
-                            Focusable="False" />
-                        <RepeatButton
+                            Width="54"
+                            Focusable="False"
+                            Height="54"
+                            Padding="0"
+                            IsChecked="{TemplateBinding NumMode,
+                                                        Mode=TwoWay}">
+                            <TextBlock>
+                                <Run Text="Num" />
+                                <LineBreak />
+                                <Run Text="Lock" />
+                            </TextBlock>
+                        </ToggleButton>
+                        <u:NumPadButton
                             Grid.Row="0"
                             Grid.Column="1"
-                            Content="8"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="0"
-                            Grid.Column="2"
-                            Content="9"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Content="4"
-                            Focusable="False" />
-                        <RepeatButton
+                            FunctionContent="/"
+                            NumContent="/"
+                            NumKey="OemQuestion" />
+                        <u:NumPadButton
                             Grid.Row="1"
                             Grid.Column="1"
-                            Content="5"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="1"
-                            Grid.Column="2"
-                            Content="6"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Content="1"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            Content="2"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="2"
-                            Grid.Column="2"
-                            Content="3"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="3"
-                            Grid.ColumnSpan="2"
-                            Grid.Column="0"
-                            Content="0"
-                            Focusable="False" />
-                        <RepeatButton
-                            Grid.Row="3"
-                            Grid.Column="2"
-                            Content="."
-                            Focusable="False" />
+                            FunctionContent="Home"
+                            FunctionKey="Home"
+                            NumContent="7"
+                            NumKey="NumPad7" />
                     </Grid>
-
                 </Border>
             </ControlTemplate>
         </Setter>
     </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:NumPadButton}" TargetType="u:NumPadButton">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:NumPadButton">
+                <Border Name="PART_Background" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
+                    <Panel>
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding NumContent}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=NumMode}" />
+                        <ContentPresenter
+                            Name="PART_FunctionContentPresenter"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding FunctionContent}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=!NumMode}" />
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}"></Setter>
+        </Style>
+        <Style Selector="^:pressed /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}"></Setter>
+        </Style>
+    </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
index e1bcb7f..ae8d8da 100644
--- a/src/Ursa/Controls/NumPad/NumPad.cs
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -10,7 +10,6 @@ namespace Ursa.Controls;
 
 public class NumPad: TemplatedControl
 {
-    private Button? _sevenButton;
     public static readonly StyledProperty<InputElement?> TargetProperty = AvaloniaProperty.Register<NumPad, InputElement?>(
         nameof(Target));
 
@@ -20,6 +19,15 @@ public class NumPad: TemplatedControl
         set => SetValue(TargetProperty, value);
     }
 
+    public static readonly StyledProperty<bool> NumModeProperty = AvaloniaProperty.Register<NumPad, bool>(
+        nameof(NumMode), defaultValue: true);
+
+    public bool NumMode
+    {
+        get => GetValue(NumModeProperty);
+        set => SetValue(NumModeProperty, value);
+    }
+
     public static readonly AttachedProperty<bool> AttachProperty =
         AvaloniaProperty.RegisterAttached<NumPad, InputElement, bool>("Attach");
 
@@ -28,8 +36,7 @@ public class NumPad: TemplatedControl
 
     static NumPad()
     {
-        TargetProperty.Changed.AddClassHandler<NumPad, InputElement?>((n, args) => n.OnTargetChanged(args));
-        AttachProperty.Changed.AddClassHandler<InputElement, bool>((input, args)=> OnAttachNumPad(input, args));
+        AttachProperty.Changed.AddClassHandler<InputElement, bool>(OnAttachNumPad);
     }
 
     private static void OnAttachNumPad(InputElement input, AvaloniaPropertyChangedEventArgs<bool> args)
@@ -43,12 +50,6 @@ public class NumPad: TemplatedControl
             GotFocusEvent.RemoveHandler(OnTargetGotFocus, input);
         }
     }
-
-    private void OnTargetChanged(AvaloniaPropertyChangedEventArgs<InputElement?> args)
-    {
-        //GotFocusEvent.RemoveHandler(OnTargetGotFocus, args.OldValue.Value);
-        //GotFocusEvent.AddHandler(OnTargetGotFocus, args.NewValue.Value);
-    }
     
     private static void OnTargetGotFocus(object sender, GotFocusEventArgs e)
     {
@@ -63,23 +64,54 @@ public class NumPad: TemplatedControl
         OverlayDialog.Show(numPad, new object(), options: new OverlayDialogOptions() { Buttons = DialogButton.None });
     }
 
-    private void OnSevenButtonClick(object sender, RoutedEventArgs e)
+    private Dictionary<Key, string> _keyInputMapping = new()
     {
-        Target?.RaiseEvent(new TextInputEventArgs()
-        {
-            Source = this,
-            RoutedEvent = TextInputEvent,
-            Text = "7",
-        });
-    }
+        [Key.NumPad0] = "0",
+        [Key.NumPad1] = "1",
+        [Key.NumPad2] = "2",
+        [Key.NumPad3] = "3",
+        [Key.NumPad4] = "4",
+        [Key.NumPad5] = "5",
+        [Key.NumPad6] = "6",
+        [Key.NumPad7] = "7",
+        [Key.NumPad8] = "8",
+        [Key.NumPad9] = "9",
+        [Key.OemPlus] = "+",
+        [Key.OemMinus] = "-",
+    };
 
-    public void InputNumber(object o)
+    public void ProcessClick(object o)
     {
-        Target?.RaiseEvent(new TextInputEventArgs()
+        if (o is NumPadButton b)
         {
-            Source = this,
-            RoutedEvent = TextInputEvent,
-            Text = o.ToString(),
-        });
+            if (b is { NumMode: true, NumKey: not null })
+            {
+                Target?.RaiseEvent(new TextInputEventArgs()
+                {
+                    Source = this,
+                    RoutedEvent = TextInputEvent,
+                    Text = _keyInputMapping.TryGetValue(b.NumKey.Value, out var text)? text:string.Empty,
+                });
+            }
+            else if (b is { NumMode: false, FunctionKey: null, NumKey: not null })
+            {
+                Target?.RaiseEvent(new TextInputEventArgs()
+                {
+                    Source = this,
+                    RoutedEvent = TextInputEvent,
+                    Text = _keyInputMapping.TryGetValue(b.NumKey.Value, out var text)? text:string.Empty,
+                });
+            }
+            else
+            {
+                Target?.RaiseEvent(new KeyEventArgs()
+                {
+                    Source = this,
+                    RoutedEvent = KeyDownEvent,
+                    Key = b.FunctionKey ?? Key.None,
+                });
+            }
+        }
+        
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/NumPad/NumPadButton.cs b/src/Ursa/Controls/NumPad/NumPadButton.cs
new file mode 100644
index 0000000..0aa368f
--- /dev/null
+++ b/src/Ursa/Controls/NumPad/NumPadButton.cs
@@ -0,0 +1,54 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+
+namespace Ursa.Controls;
+
+public class NumPadButton: RepeatButton
+{
+    public static readonly StyledProperty<Key?> NumKeyProperty = AvaloniaProperty.Register<NumPadButton, Key?>(
+        nameof(NumKey));
+
+    public Key? NumKey
+    {
+        get => GetValue(NumKeyProperty);
+        set => SetValue(NumKeyProperty, value);
+    }
+
+    public static readonly StyledProperty<Key?> FunctionKeyProperty = AvaloniaProperty.Register<NumPadButton, Key?>(
+        nameof(FunctionKey));
+
+    public Key? FunctionKey
+    {
+        get => GetValue(FunctionKeyProperty);
+        set => SetValue(FunctionKeyProperty, value);
+    }
+    
+    public static readonly StyledProperty<bool> NumModeProperty = AvaloniaProperty.Register<NumPadButton, bool>(
+        nameof(NumMode));
+    
+    public bool NumMode
+    {
+        get => GetValue(NumModeProperty);
+        set => SetValue(NumModeProperty, value);
+    }
+
+    public static readonly StyledProperty<object?> NumContentProperty = AvaloniaProperty.Register<NumPadButton, object?>(
+        nameof(NumContent));
+
+    public object? NumContent
+    {
+        get => GetValue(NumContentProperty);
+        set => SetValue(NumContentProperty, value);
+    }
+    
+    public static readonly StyledProperty<object?> FunctionContentProperty = AvaloniaProperty.Register<NumPadButton, object?>(
+        nameof(FunctionContent));
+    
+    public object? FunctionContent
+    {
+        get => GetValue(FunctionContentProperty);
+        set => SetValue(FunctionContentProperty, value);
+    }
+    
+}
\ No newline at end of file

From 7e7c020b57a45a7efcc7c1ed313a6dd82db2b77d Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Sun, 10 Mar 2024 12:33:26 +0800
Subject: [PATCH 6/8] feat: upgrade version. implement more keys.

---
 demo/Directory.Build.props                 |   2 +-
 demo/Ursa.Demo/Pages/NumPadDemo.axaml      |  45 +++++--
 src/Ursa.Themes.Semi/Controls/NumPad.axaml | 148 ++++++++++++++++++---
 src/Ursa/Controls/NumPad/NumPad.cs         |  20 ++-
 4 files changed, 183 insertions(+), 32 deletions(-)

diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index c950d6a..3a82054 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.9</AvaloniaVersion>
+    <AvaloniaVersion>11.0.10</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/demo/Ursa.Demo/Pages/NumPadDemo.axaml b/demo/Ursa.Demo/Pages/NumPadDemo.axaml
index b593e7b..dbd997a 100644
--- a/demo/Ursa.Demo/Pages/NumPadDemo.axaml
+++ b/demo/Ursa.Demo/Pages/NumPadDemo.axaml
@@ -1,15 +1,36 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:u="https://irihi.tech/ursa"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ursa.Demo.Pages.NumPadDemo">
+<UserControl
+    x:Class="Ursa.Demo.Pages.NumPadDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:u="https://irihi.tech/ursa"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left">
-        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
-        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
-        <TextBox u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></TextBox>
-        <u:IPv4Box u:NumPad.Attach="True" Width="200" ></u:IPv4Box>
-        <u:NumericIntUpDown u:NumPad.Attach="True" Width="100" Watermark="Invoke NumPad"></u:NumericIntUpDown>
+        <TextBox
+            HorizontalAlignment="Stretch"
+            u:NumPad.Attach="True"
+            Watermark="Invoke NumPad" />
+        <TextBox
+            HorizontalAlignment="Stretch"
+            u:NumPad.Attach="True"
+            Watermark="Invoke NumPad" />
+        <TextBox
+            HorizontalAlignment="Stretch"
+            u:NumPad.Attach="True"
+            Watermark="Invoke NumPad" />
+        <u:IPv4Box Width="200" u:NumPad.Attach="True" />
+        <u:NumericIntUpDown
+            HorizontalAlignment="Stretch"
+            u:NumPad.Attach="True"
+            Watermark="Invoke NumPad" />
+        <Border Theme="{DynamicResource CardBorder}">
+            <StackPanel>
+                <TextBox Name="text" Width="200" />
+                <u:NumPad Target="{Binding #text}" />
+            </StackPanel>
+        </Border>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Controls/NumPad.axaml b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
index c5339e4..853d45d 100644
--- a/src/Ursa.Themes.Semi/Controls/NumPad.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
@@ -3,34 +3,37 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
+    <Design.PreviewWith>
+        <u:NumPad></u:NumPad>
+    </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type u:NumPad}" TargetType="{x:Type u:NumPad}">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:NumPad">
                 <Border>
                     <Border.Styles>
-                        <Style Selector="RepeatButton">
-                            <Setter Property="Command" Value="{Binding $parent[u:NumPad].ProcessClick}" />
-                            <Setter Property="CommandParameter" Value="{Binding $self.Content}" />
-                            <Setter Property="Width" Value="48" />
-                            <Setter Property="Height" Value="48" />
-                        </Style>
                         <Style Selector="u|NumPadButton">
                             <Setter Property="NumMode" Value="{Binding $parent[u:NumPad].NumMode}" />
                             <Setter Property="Command" Value="{Binding $parent[u:NumPad].ProcessClick}" />
-                            <Setter Property="Focusable" Value="False"></Setter>
+                            <Setter Property="Focusable" Value="False" />
                             <Setter Property="CommandParameter" Value="{Binding $self}" />
                             <Setter Property="Width" Value="54" />
                             <Setter Property="Height" Value="54" />
+                            <Setter Property="UseLayoutRounding" Value="False"></Setter>
+                            <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
+                            <Setter Property="VerticalAlignment" Value="Stretch"></Setter>
+                            <Setter Property="Margin" Value="1" />
                         </Style>
                     </Border.Styles>
-                    <Grid ColumnDefinitions="*,*,*,*" RowDefinitions="*,*,*,*,*">
+                    <Grid ColumnDefinitions="*,*,*,*" RowDefinitions="*,*,*,*,*" HorizontalAlignment="Left" VerticalAlignment="Top">
                         <ToggleButton
                             Grid.Row="0"
                             Grid.Column="0"
-                            Width="54"
-                            Focusable="False"
-                            Height="54"
+                            MinWidth="54"
+                            MinHeight="54"
                             Padding="0"
+                            Focusable="False"
+                            FontWeight="Regular"
+                            Margin="1"
                             IsChecked="{TemplateBinding NumMode,
                                                         Mode=TwoWay}">
                             <TextBlock>
@@ -44,14 +47,122 @@
                             Grid.Column="1"
                             FunctionContent="/"
                             NumContent="/"
-                            NumKey="OemQuestion" />
+                            NumKey="Divide" />
+                        <u:NumPadButton
+                            Grid.Row="0"
+                            Grid.Column="2"
+                            FunctionContent="*"
+                            NumContent="*"
+                            NumKey="Multiply" />
+                        <u:NumPadButton
+                            Grid.Row="0"
+                            Grid.Column="3"
+                            FunctionContent="-"
+                            NumContent="-"
+                            NumKey="Subtract" />
                         <u:NumPadButton
                             Grid.Row="1"
-                            Grid.Column="1"
+                            Grid.Column="0"
                             FunctionContent="Home"
                             FunctionKey="Home"
                             NumContent="7"
                             NumKey="NumPad7" />
+                        <u:NumPadButton
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            FunctionContent="Up"
+                            FunctionKey="Up"
+                            NumContent="8"
+                            NumKey="NumPad8" />
+                        <u:NumPadButton
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            FunctionKey="PageUp"
+                            NumContent="9"
+                            NumKey="NumPad9">
+                            <u:NumPadButton.FunctionContent>
+                                <TextBlock><Run Text="Page"/><LineBreak/><Run Text="Up"/></TextBlock>
+                            </u:NumPadButton.FunctionContent>
+                        </u:NumPadButton>
+                        <u:NumPadButton
+                            Grid.Row="1"
+                            Grid.RowSpan="2"
+                            Grid.Column="3"
+                            Height="{x:Static x:Double.NaN}"
+                            VerticalAlignment="Stretch"
+                            FunctionContent="+"
+                            NumContent="+"
+                            NumKey="Add" />
+                        <u:NumPadButton
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            FunctionContent="Left"
+                            FunctionKey="Left"
+                            NumContent="4"
+                            NumKey="NumPad4" />
+                        <u:NumPadButton
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            FunctionContent=" "
+                            FunctionKey="None"
+                            NumContent="5"
+                            NumKey="NumPad5" />
+                        <u:NumPadButton
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            FunctionContent="Right"
+                            FunctionKey="Right"
+                            NumContent="6"
+                            NumKey="NumPad6" />
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            FunctionContent="End"
+                            FunctionKey="End"
+                            NumContent="1"
+                            NumKey="NumPad1" />
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            FunctionContent="Down"
+                            FunctionKey="Down"
+                            NumContent="2"
+                            NumKey="NumPad2" />
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            FunctionKey="PageDown"
+                            NumContent="3"
+                            NumKey="NumPad3">
+                            <u:NumPadButton.FunctionContent>
+                                <TextBlock><Run Text="Page"/><LineBreak/><Run Text="Down"/></TextBlock>
+                            </u:NumPadButton.FunctionContent>
+                        </u:NumPadButton>
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.RowSpan="2"
+                            Grid.Column="3"
+                            Height="{x:Static x:Double.NaN}"
+                            VerticalAlignment="Stretch"
+                            FunctionContent="Enter"
+                            FunctionKey="Enter"
+                            NumContent="Enter" />
+                        <u:NumPadButton
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            FunctionContent="Insert"
+                            FunctionKey="Insert"
+                            NumContent="0"
+                            Width="{x:Static x:Double.NaN}"
+                            NumKey="NumPad0" />
+                        <u:NumPadButton
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            FunctionContent="Delete"
+                            FunctionKey="Delete"
+                            NumContent="."
+                            NumKey="Decimal"/>
                     </Grid>
                 </Border>
             </ControlTemplate>
@@ -62,10 +173,13 @@
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
-        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:NumPadButton">
-                <Border Name="PART_Background" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
+                <Border
+                    Name="PART_Background"
+                    Background="{TemplateBinding Background}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
                     <Panel>
                         <ContentPresenter
                             Name="PART_ContentPresenter"
@@ -84,10 +198,10 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover /template/ Border#PART_Background">
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}"></Setter>
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_Background">
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}"></Setter>
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
index ae8d8da..783eda9 100644
--- a/src/Ursa/Controls/NumPad/NumPad.cs
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -76,14 +76,30 @@ public class NumPad: TemplatedControl
         [Key.NumPad7] = "7",
         [Key.NumPad8] = "8",
         [Key.NumPad9] = "9",
-        [Key.OemPlus] = "+",
-        [Key.OemMinus] = "-",
+        [Key.Add] = "+",
+        [Key.Subtract] = "-",
+        [Key.Multiply] = "*",
+        [Key.Divide] = "/",
+        [Key.Decimal] = ".",
     };
 
     public void ProcessClick(object o)
     {
+        if (Target?.IsFocused != true)
+        {
+            return;
+        }
         if (o is NumPadButton b)
         {
+            if (b.NumKey is null)
+            {
+                Target?.RaiseEvent(new KeyEventArgs()
+                {
+                    Source = this,
+                    RoutedEvent = KeyDownEvent,
+                    Key = b.FunctionKey ?? Key.None,
+                });
+            }
             if (b is { NumMode: true, NumKey: not null })
             {
                 Target?.RaiseEvent(new TextInputEventArgs()

From ccaf36177b71b4db57881a531bf84aa1f8a589b0 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sun, 10 Mar 2024 14:30:41 +0800
Subject: [PATCH 7/8] feat: make sure un focused target works.

---
 src/Ursa/Controls/NumPad/NumPad.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
index 783eda9..af301ae 100644
--- a/src/Ursa/Controls/NumPad/NumPad.cs
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -85,10 +85,6 @@ public class NumPad: TemplatedControl
 
     public void ProcessClick(object o)
     {
-        if (Target?.IsFocused != true)
-        {
-            return;
-        }
         if (o is NumPadButton b)
         {
             if (b.NumKey is null)

From 9960bfabf17d4d32e7ebd3e70644bba7a4f82ce8 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sun, 10 Mar 2024 14:49:55 +0800
Subject: [PATCH 8/8] feat: simplify key code.

---
 src/Ursa.Themes.Semi/Controls/NumPad.axaml |  4 ++
 src/Ursa/Controls/NumPad/NumPad.cs         | 56 +++++++---------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/NumPad.axaml b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
index 853d45d..bc6c8e6 100644
--- a/src/Ursa.Themes.Semi/Controls/NumPad.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NumPad.axaml
@@ -46,18 +46,21 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             FunctionContent="/"
+                            FunctionKey="Divide"
                             NumContent="/"
                             NumKey="Divide" />
                         <u:NumPadButton
                             Grid.Row="0"
                             Grid.Column="2"
                             FunctionContent="*"
+                            FunctionKey="Multiply"
                             NumContent="*"
                             NumKey="Multiply" />
                         <u:NumPadButton
                             Grid.Row="0"
                             Grid.Column="3"
                             FunctionContent="-"
+                            FunctionKey="Subtract"
                             NumContent="-"
                             NumKey="Subtract" />
                         <u:NumPadButton
@@ -92,6 +95,7 @@
                             VerticalAlignment="Stretch"
                             FunctionContent="+"
                             NumContent="+"
+                            FunctionKey="Add"
                             NumKey="Add" />
                         <u:NumPadButton
                             Grid.Row="2"
diff --git a/src/Ursa/Controls/NumPad/NumPad.cs b/src/Ursa/Controls/NumPad/NumPad.cs
index af301ae..0b0ffc3 100644
--- a/src/Ursa/Controls/NumPad/NumPad.cs
+++ b/src/Ursa/Controls/NumPad/NumPad.cs
@@ -64,7 +64,7 @@ public class NumPad: TemplatedControl
         OverlayDialog.Show(numPad, new object(), options: new OverlayDialogOptions() { Buttons = DialogButton.None });
     }
 
-    private Dictionary<Key, string> _keyInputMapping = new()
+    private static readonly Dictionary<Key, string> KeyInputMapping = new()
     {
         [Key.NumPad0] = "0",
         [Key.NumPad1] = "1",
@@ -85,45 +85,25 @@ public class NumPad: TemplatedControl
 
     public void ProcessClick(object o)
     {
-        if (o is NumPadButton b)
+        if (Target is null || o is not NumPadButton b) return;
+        var key = (b.NumMode ? b.NumKey : b.FunctionKey)?? Key.None;
+        if (KeyInputMapping.TryGetValue(key, out string s))
         {
-            if (b.NumKey is null)
+            Target.RaiseEvent(new TextInputEventArgs()
             {
-                Target?.RaiseEvent(new KeyEventArgs()
-                {
-                    Source = this,
-                    RoutedEvent = KeyDownEvent,
-                    Key = b.FunctionKey ?? Key.None,
-                });
-            }
-            if (b is { NumMode: true, NumKey: not null })
-            {
-                Target?.RaiseEvent(new TextInputEventArgs()
-                {
-                    Source = this,
-                    RoutedEvent = TextInputEvent,
-                    Text = _keyInputMapping.TryGetValue(b.NumKey.Value, out var text)? text:string.Empty,
-                });
-            }
-            else if (b is { NumMode: false, FunctionKey: null, NumKey: not null })
-            {
-                Target?.RaiseEvent(new TextInputEventArgs()
-                {
-                    Source = this,
-                    RoutedEvent = TextInputEvent,
-                    Text = _keyInputMapping.TryGetValue(b.NumKey.Value, out var text)? text:string.Empty,
-                });
-            }
-            else
-            {
-                Target?.RaiseEvent(new KeyEventArgs()
-                {
-                    Source = this,
-                    RoutedEvent = KeyDownEvent,
-                    Key = b.FunctionKey ?? Key.None,
-                });
-            }
+                Source = this,
+                RoutedEvent = TextInputEvent,
+                Text = s,
+            });
+        }
+        else
+        {
+            Target.RaiseEvent(new KeyEventArgs()
+            {
+                Source = this,
+                RoutedEvent = KeyDownEvent,
+                Key = key,
+            });
         }
-        
     }
 }
\ No newline at end of file