From eb797a944040c3b7fbf0dabedf102b66c39f2e05 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Mon, 22 Jul 2024 15:59:54 +0800 Subject: [PATCH] feat: add compile binding. --- demo/Ursa.Demo/Ursa.Demo.csproj | 1 - .../Controls/DateRangePicker.axaml | 11 +++++----- src/Ursa.Themes.Semi/Controls/Divider.axaml | 21 ++++++++++++++----- .../Controls/MessageBox.axaml | 2 +- .../Controls/RangeSlider.axaml | 8 +++---- src/Ursa.Themes.Semi/Controls/TagInput.axaml | 2 +- .../ControlClassesInput.cs | 2 +- src/Ursa/Controls/NavMenu/NavMenuItem.cs | 2 +- 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj index b537deb..15eefb0 100644 --- a/demo/Ursa.Demo/Ursa.Demo.csproj +++ b/demo/Ursa.Demo/Ursa.Demo.csproj @@ -12,7 +12,6 @@ - diff --git a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml index 1ec994c..74fcf4e 100644 --- a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml +++ b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml @@ -2,7 +2,8 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:contracts="https://irihi.tech/shared" - xmlns:u="https://irihi.tech/ursa"> + xmlns:u="https://irihi.tech/ursa" + x:CompileBindings="True"> @@ -68,9 +69,9 @@ Name="{x:Static u:DateRangePicker.PART_Button}" Grid.Column="3" Padding="8,0" - IsVisible="{Binding !#ClearButton.IsVisible}" Content="{DynamicResource CalendarDatePickerIconGlyph}" Focusable="False" + IsVisible="{Binding !#ClearButton.IsVisible}" Theme="{DynamicResource InnerIconButton}" /> @@ -144,7 +145,7 @@ diff --git a/src/Ursa.Themes.Semi/Controls/Divider.axaml b/src/Ursa.Themes.Semi/Controls/Divider.axaml index 9b4af1c..2469b3b 100644 --- a/src/Ursa.Themes.Semi/Controls/Divider.axaml +++ b/src/Ursa.Themes.Semi/Controls/Divider.axaml @@ -30,7 +30,6 @@ - @@ -48,7 +47,10 @@ Height="{TemplateBinding Height}" ColumnDefinitions="Auto,Auto,*"> - + @@ -62,7 +64,10 @@ Height="{TemplateBinding Height}" ColumnDefinitions="*,Auto,Auto"> - + @@ -76,7 +81,10 @@ Height="{TemplateBinding Height}" ColumnDefinitions="*,Auto,*"> - + @@ -90,7 +98,10 @@ Height="{TemplateBinding Height}" ColumnDefinitions="*,Auto,*"> - + diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml index ad58ead..ae2e07a 100644 --- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml +++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml @@ -248,7 +248,7 @@ - + diff --git a/src/Ursa/Controls/ControlClassesInput/ControlClassesInput.cs b/src/Ursa/Controls/ControlClassesInput/ControlClassesInput.cs index 78cf60d..a9251d9 100644 --- a/src/Ursa/Controls/ControlClassesInput/ControlClassesInput.cs +++ b/src/Ursa/Controls/ControlClassesInput/ControlClassesInput.cs @@ -39,7 +39,7 @@ public class ControlClassesInput: TemplatedControl internal static readonly DirectProperty> TargetClassesProperty = AvaloniaProperty.RegisterDirect>( nameof(TargetClasses), o => o.TargetClasses, (o, v) => o.TargetClasses = v); - internal ObservableCollection TargetClasses + public ObservableCollection TargetClasses { get => _targetClasses; set => SetAndRaise(TargetClassesProperty, ref _targetClasses, value); diff --git a/src/Ursa/Controls/NavMenu/NavMenuItem.cs b/src/Ursa/Controls/NavMenu/NavMenuItem.cs index eed50bf..fc39aa7 100644 --- a/src/Ursa/Controls/NavMenu/NavMenuItem.cs +++ b/src/Ursa/Controls/NavMenu/NavMenuItem.cs @@ -124,7 +124,7 @@ public class NavMenuItem: HeaderedItemsControl internal static readonly DirectProperty LevelProperty = AvaloniaProperty.RegisterDirect( nameof(Level), o => o.Level, (o, v) => o.Level = v); private int _level; - internal int Level + public int Level { get => _level; set => SetAndRaise(LevelProperty, ref _level, value);