feat: improve styling.

src/Ursa/Controls/ComboBox/TreeComboBox.cs

@@ -6,6 +6,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Layout;
+using Avalonia.LogicalTree;
 using Avalonia.OpenGL.Controls;
 using Irihi.Avalonia.Shared.Common;
 
@@ -115,24 +116,31 @@ public class TreeComboBox: SelectingItemsControl
         return CreateContainerForItemOverride(item, index, recycleKey);
     }
 
-    protected override void ContainerForItemPreparedOverride(Control container, object? item, int index)
-    {
-        base.ContainerForItemPreparedOverride(container, item, index);
-    }
-
     internal void ContainerForItemPreparedInternal(Control container, object? item, int index)
     {
         ContainerForItemPreparedOverride(container, item, index);
     }
-
+    
     protected override void OnPointerReleased(PointerReleasedEventArgs e)
     {
         base.OnPointerReleased(e);
         if (e.InitialPressMouseButton == MouseButton.Left)
         {
-            if (_popup is not null && _popup.IsOpen && e.Source is TextBlock v && _popup.IsInsidePopup(v))
+            if (_popup is not null && _popup.IsOpen && e.Source is Visual v && _popup.IsInsidePopup(v))
             {
-                SelectionBoxItem = v.Text;
+                var container = v.FindLogicalAncestorOfType<TreeComboBoxItem>();
+                container?.SetValue(IsSelectedProperty, true);
+                if (container?.Header is Control control)
+                {
+                    SelectionBoxItem = control.DataContext ?? control.ToString();
+                    // UpdateSelectionFromEventSource(e.Source);
+                    
+                }
+                else
+                {
+                    SelectionBoxItem = container?.Header; 
+                    // UpdateSelectionFromEventSource(e.Source);
+                }
                 SetCurrentValue(IsDropDownOpenProperty, false);
             }
             else

src/Ursa/Controls/ComboBox/TreeComboBoxItem.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -45,6 +46,13 @@ public class TreeComboBoxItem: HeaderedItemsControl, ISelectable
         protected set => SetAndRaise(LevelProperty, ref _level, value);
     }
 
+    static TreeComboBoxItem()
+    {
+        IsSelectedProperty.AffectsPseudoClass<TreeComboBoxItem>(PseudoClassName.PC_Selected,
+            SelectingItemsControl.IsSelectedChangedEvent);
+        PressedMixin.Attach<TreeComboBoxItem>();
+    }
+
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
@@ -57,14 +65,15 @@ public class TreeComboBoxItem: HeaderedItemsControl, ISelectable
     {
         base.OnAttachedToLogicalTree(e);
         _treeComboBox = this.FindLogicalAncestorOfType<TreeComboBox>();
-        Level = CalculateDistanceFromLogicalParent<TreeComboBox>(this);
+        Level = CalculateDistanceFromLogicalParent<TreeComboBox>(this) - 1;
         if (this.ItemTemplate is null && this._treeComboBox?.ItemTemplate is not null)
         {
             SetCurrentValue(ItemTemplateProperty, this._treeComboBox.ItemTemplate);
         }
-        
-        
-        
+        if(this.ItemContainerTheme is null && this._treeComboBox?.ItemContainerTheme is not null)
+        {
+            SetCurrentValue(ItemContainerThemeProperty, this._treeComboBox.ItemContainerTheme);
+        }
     }
 
     private void OnDoubleTapped(object sender, TappedEventArgs e)
@@ -76,6 +85,8 @@ public class TreeComboBoxItem: HeaderedItemsControl, ISelectable
 
     protected override bool NeedsContainerOverride(object? item, int index, out object? recycleKey)
     {
+        TreeViewItem t = new TreeViewItem();
+        ComboBox c = new ComboBox();
         return EnsureParent().NeedsContainerInternal(item, index, out recycleKey);
     }
 

src/Ursa/Converters/SelectionBoxTemplateConverter.cs

@@ -0,0 +1,16 @@
+using System.Globalization;
+using Avalonia.Controls.Templates;
+using Avalonia.Data.Converters;
+
+namespace Ursa.Converters;
+
+public class SelectionBoxTemplateConverter: IMultiValueConverter
+{
+    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        var selectedItemTemplate = values.Count > 0 ? values[0] as IDataTemplate : null;
+        if (selectedItemTemplate is not null) return selectedItemTemplate;
+        var itemTemplate = values.Count > 1 ? values[1] as IDataTemplate : null;
+        return itemTemplate;
+    }
+}

src/Ursa/Ursa.csproj

@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.1.6" />
+        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.1.7" />
     </ItemGroup>
 
     <ItemGroup>