chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: implement more buttons.

Browse Source
This commit is contained in:
rabbitism
2024-03-09 19:28:18 +08:00
parent 51d7c3c870
commit 24dd00d552
4 changed files with 81 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/Ursa.Demo/Pages/BannerDemo.axaml
View File

@@ -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>

75
src/Ursa.Themes.Semi/Controls/NumPad.axaml
View File

@@ -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>

15
src/Ursa/Controls/NumPad/NumPad.cs
View File

@@ -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(),
});
}
}

1
src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
View File

@@ -213,7 +213,6 @@ public abstract class NumericUpDown : TemplatedControl, IClearControl
_textBox?.Focus();
_textBox!.IsReadOnly = true;
}
}
protected override void OnTextInput(TextInputEventArgs e)