From f7a316340b57b6e29025f220575a9763095921bf Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sat, 20 Apr 2024 01:20:04 +0800 Subject: [PATCH] feat: add inner contents. --- demo/Ursa.Demo/Pages/TreeComboBoxDemo.axaml | 25 +- .../Controls/TreeComboBox.axaml | 276 ++++++++++++------ .../SelectedItemTemplateConverter.cs | 24 -- src/Ursa/Controls/ComboBox/TreeComboBox.cs | 46 ++- .../SelectionBoxTemplateConverter.cs | 11 +- 5 files changed, 257 insertions(+), 125 deletions(-) delete mode 100644 src/Ursa.Themes.Semi/Converters/SelectedItemTemplateConverter.cs diff --git a/demo/Ursa.Demo/Pages/TreeComboBoxDemo.axaml b/demo/Ursa.Demo/Pages/TreeComboBoxDemo.axaml index 06d7241..e204bff 100644 --- a/demo/Ursa.Demo/Pages/TreeComboBoxDemo.axaml +++ b/demo/Ursa.Demo/Pages/TreeComboBoxDemo.axaml @@ -41,13 +41,22 @@ - - - - - - - - + + + + + + + diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml index 42dbb78..3f12f48 100644 --- a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml +++ b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml @@ -1,68 +1,92 @@ - - - - - - + + + + + - - - - - - - + + + + + + + + - - - + + + - + - - - + + + - + + - + IsHitTestVisible="True"> - - + - - - + CornerRadius="6"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + - - + - + + Content="{TemplateBinding Header}" + ContentTemplate="{TemplateBinding HeaderTemplate}" + Focusable="False" + Foreground="{TemplateBinding Foreground}" /> - + - +