From c0ea19c78c30bf9c38f23a2e576016672f3ef3d5 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 16 Mar 2024 23:39:56 +0800
Subject: [PATCH 1/3] feat: make sure not all children are removed.

---
 demo/Ursa.Demo/Pages/ToolBarDemo.axaml    |  5 +++
 src/Ursa/Controls/ToolBar/ToolBarPanel.cs | 54 +++++++++++++++--------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/ToolBarDemo.axaml b/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
index b00fc45..c852b9c 100644
--- a/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
@@ -26,6 +26,11 @@
             Orientation="{Binding #Orientation.Value}">
             <Button u:ToolBar.OverflowMode="Never" Content="Button 1" />
             <u:ToolBarSeparator />
+            <TextBox Width="100" VerticalAlignment="Center"></TextBox>
+            <StackPanel Orientation="Horizontal">
+                <RadioButton Content="A" VerticalAlignment="Center"></RadioButton>
+                <RadioButton Content="B" VerticalAlignment="Center"></RadioButton>
+            </StackPanel>
             <Button u:ToolBar.OverflowMode="AsNeeded" Content="Button 2" />
             <Button u:ToolBar.OverflowMode="AsNeeded" Content="Button 3" />
             <ToggleButton Content="Toggle" />
diff --git a/src/Ursa/Controls/ToolBar/ToolBarPanel.cs b/src/Ursa/Controls/ToolBar/ToolBarPanel.cs
index cea2ae4..df3971d 100644
--- a/src/Ursa/Controls/ToolBar/ToolBarPanel.cs
+++ b/src/Ursa/Controls/ToolBar/ToolBarPanel.cs
@@ -100,37 +100,53 @@ public class ToolBarPanel: StackPanel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        Children.Clear();
-        OverflowPanel?.Children.Clear();
+        //Children.Clear();
+        //OverflowPanel?.Children.Clear();
         var logicalChildren = _parent?.GetLogicalChildren().OfType<Control>().ToList();
+        List<Control> thisPanel = new List<Control>();
+        List<Control> thatPanel = new List<Control>();
         if(logicalChildren is null) return finalSize;
         bool overflow = false;
-        foreach (var child in logicalChildren)
+        for (int i = 0; i < logicalChildren.Count; i++)
         {
-            if (ToolBar.GetIsOverflowItem(child))
+            var child = logicalChildren[i];
+            var isItemOverflow = ToolBar.GetIsOverflowItem(child);
+            if(isItemOverflow) overflow = true;
+            if (Children?.Contains(child) == true)
             {
-                OverflowPanel?.Children.Add(child);
-                overflow = true;
+                if (isItemOverflow)
+                {
+                    Children.Remove(child);
+                    var overflowIndex = -1;
+                    if (i > 1)
+                    {
+                        var last = logicalChildren[i - 1];
+                        overflowIndex = OverflowPanel?.Children?.IndexOf(last) ?? -1;
+                    }
+                    OverflowPanel?.Children?.Insert(overflowIndex + 1, child);
+                }
             }
-            else
+            else if (OverflowPanel?.Children?.Contains(child) == true)
             {
-                Children.Add(child);
-            }
-
-            if (child is ToolBarSeparator s)
-            {
-                s.IsVisible = true;
+                if (!isItemOverflow)
+                {
+                    OverflowPanel.Children.Remove(child);
+                    var index = -1;
+                    if (i > 1)
+                    {
+                        var last = logicalChildren[i - 1];
+                        index = Children?.IndexOf(last) ?? -1;
+                    }
+                    Children?.Insert(index + 1, child);
+                }
             }
         }
-
-        var thisLast = this.Children.LastOrDefault();
-        if (thisLast is ToolBarSeparator s2)
+        
+        if (this.Children?.LastOrDefault() is ToolBarSeparator s2)
         {
             s2.IsVisible = false;
         }
-
-        var thatFirst = OverflowPanel?.Children.FirstOrDefault();
-        if (thatFirst is ToolBarSeparator s3)
+        if (OverflowPanel?.Children?.FirstOrDefault() is ToolBarSeparator s3)
         {
             s3.IsVisible = false;
         }

From 951184925f60c647fc9dcadd14548017d8fbb197 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 16 Mar 2024 23:42:41 +0800
Subject: [PATCH 2/3] fix: fix separator visibility.

---
 src/Ursa/Controls/ToolBar/ToolBarPanel.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Ursa/Controls/ToolBar/ToolBarPanel.cs b/src/Ursa/Controls/ToolBar/ToolBarPanel.cs
index df3971d..6b547bc 100644
--- a/src/Ursa/Controls/ToolBar/ToolBarPanel.cs
+++ b/src/Ursa/Controls/ToolBar/ToolBarPanel.cs
@@ -100,16 +100,13 @@ public class ToolBarPanel: StackPanel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        //Children.Clear();
-        //OverflowPanel?.Children.Clear();
         var logicalChildren = _parent?.GetLogicalChildren().OfType<Control>().ToList();
-        List<Control> thisPanel = new List<Control>();
-        List<Control> thatPanel = new List<Control>();
         if(logicalChildren is null) return finalSize;
         bool overflow = false;
         for (int i = 0; i < logicalChildren.Count; i++)
         {
             var child = logicalChildren[i];
+            if(child is ToolBarSeparator s) s.IsVisible = true;
             var isItemOverflow = ToolBar.GetIsOverflowItem(child);
             if(isItemOverflow) overflow = true;
             if (Children?.Contains(child) == true)

From 486f09d0faeae407ef0a0a3bedd5ceefc6a179e7 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Sun, 17 Mar 2024 11:55:12 +0800
Subject: [PATCH 3/3] feat: remove default background

---
 src/Ursa.Themes.Semi/Controls/ToolBar.axaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
index 9fe7cfb..90746f1 100644
--- a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
@@ -28,6 +28,7 @@
     <ControlTheme x:Key="{x:Type u:ToolBar}" TargetType="u:ToolBar">
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="ItemsPanel">
             <ItemsPanelTemplate>
                 <u:ToolBarPanel />
@@ -36,12 +37,14 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ToolBar">
                 <Border
-                    Padding="2"
-                    Margin="0"
+                    Name="PART_BackgroundBorder"
+                    Padding="{TemplateBinding Padding}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                    CornerRadius="4"
-                    Theme="{DynamicResource CardBorder}">
+                    CornerRadius="4">
                     <DockPanel LastChildFill="True">
                         <ContentPresenter
                             Name="PART_Header"