From c15177dbc1d26c517f67921ad6f7e18cfeaafbf8 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sun, 15 Sep 2024 01:37:55 +0800
Subject: [PATCH 1/4] feat: WIP fix xaml updates in 11.2.0

---
 demo/Directory.Build.props                    |  2 +-
 src/Package.props                             |  4 +-
 src/Ursa.Themes.Semi/Controls/Divider.axaml   | 32 ++++++++++++----
 .../Controls/UrsaWindow.axaml                 | 37 ++++---------------
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index e25d59c..4c822ae 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.1.3</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Package.props b/src/Package.props
index d5410e3..4e1a968 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <Version>1.4.0</Version>
-        <AvaloniaVersion>11.1.1</AvaloniaVersion>
+        <Version>1.6.0</Version>
+        <AvaloniaVersion>11.2.0</AvaloniaVersion>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/src/Ursa.Themes.Semi/Controls/Divider.axaml b/src/Ursa.Themes.Semi/Controls/Divider.axaml
index 9a8eda6..eb6ff1c 100644
--- a/src/Ursa.Themes.Semi/Controls/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Divider.axaml
@@ -49,8 +49,12 @@
                             <Rectangle Theme="{StaticResource DividerLeftLine}" />
                             <ContentPresenter
                                 Grid.Column="1"
-                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Theme="{StaticResource DividerContentPresenter}" />
+                                Content="{TemplateBinding Content}"
+                                Background="{TemplateBinding Background}"
+                                Foreground="{TemplateBinding Foreground}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Margin="{DynamicResource ThicknessDividerTextMargin}"
+                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/>
                             <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
                         </Grid>
                     </ControlTemplate>
@@ -66,8 +70,12 @@
                             <Rectangle Theme="{StaticResource DividerLeftLine}" />
                             <ContentPresenter
                                 Grid.Column="1"
-                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Theme="{StaticResource DividerContentPresenter}" />
+                                Content="{TemplateBinding Content}"
+                                Background="{TemplateBinding Background}"
+                                Foreground="{TemplateBinding Foreground}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Margin="{DynamicResource ThicknessDividerTextMargin}"
+                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/>
                             <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
                         </Grid>
                     </ControlTemplate>
@@ -83,8 +91,12 @@
                             <Rectangle Theme="{StaticResource DividerLeftLine}" />
                             <ContentPresenter
                                 Grid.Column="1"
-                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Theme="{StaticResource DividerContentPresenter}" />
+                                Content="{TemplateBinding Content}"
+                                Background="{TemplateBinding Background}"
+                                Foreground="{TemplateBinding Foreground}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Margin="{DynamicResource ThicknessDividerTextMargin}"
+                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/>
                             <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
                         </Grid>
                     </ControlTemplate>
@@ -100,8 +112,12 @@
                             <Rectangle Theme="{StaticResource DividerLeftLine}" />
                             <ContentPresenter
                                 Grid.Column="1"
-                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Theme="{StaticResource DividerContentPresenter}" />
+                                Content="{TemplateBinding Content}"
+                                Background="{TemplateBinding Background}"
+                                Foreground="{TemplateBinding Foreground}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Margin="{DynamicResource ThicknessDividerTextMargin}"
+                                IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/>
                             <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
                         </Grid>
                     </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
index 23b2602..ecdaeb6 100644
--- a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
@@ -11,36 +11,13 @@
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
         <Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" />
-        <Setter Property="IsMinimizeButtonVisible">
-            <OnPlatform>
-                <On Options="Default, Windows, Linux">
-                    <x:Boolean>True</x:Boolean>
-                </On>
-                <On Options="macOS">
-                    <x:Boolean>False</x:Boolean>
-                </On>
-            </OnPlatform>
-        </Setter>
-        <Setter Property="IsRestoreButtonVisible">
-            <OnPlatform>
-                <On Options="Default, Windows, Linux">
-                    <x:Boolean>True</x:Boolean>
-                </On>
-                <On Options="macOS">
-                    <x:Boolean>False</x:Boolean>
-                </On>
-            </OnPlatform>
-        </Setter>
-        <Setter Property="IsCloseButtonVisible">
-            <OnPlatform>
-                <On Options="Default, Windows, Linux">
-                    <x:Boolean>True</x:Boolean>
-                </On>
-                <On Options="macOS">
-                    <x:Boolean>False</x:Boolean>
-                </On>
-            </OnPlatform>
-        </Setter>
+        <!--
+        <Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
+
+        <Setter Property="IsRestoreButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
+        
+        <Setter Property="IsCloseButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
+        -->
         <Setter Property="SystemDecorations">
             <OnPlatform>
                 <On Options="Default, Windows, macOS">

From 9b8c3c78cc935614a8f1f72791443e29ebdbe923 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 24 Sep 2024 16:53:36 +0800
Subject: [PATCH 2/4] feat: upgrade to beta2.

---
 demo/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index 4c822ae..b0ea723 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0-beta2</AvaloniaVersion>
   </PropertyGroup>
 </Project>

From c79c21ab87b0f07d5bf99619763239c6cf63d13e Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Mon, 7 Oct 2024 18:18:33 +0800
Subject: [PATCH 3/4] feat: upgrade to 11.2-rc1

---
 demo/Directory.Build.props                    |  2 +-
 .../Controls/UrsaWindow.axaml                 | 37 +++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index b0ea723..7d912bb 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.2.0-beta2</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0-rc1</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
index ecdaeb6..23b2602 100644
--- a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
@@ -11,13 +11,36 @@
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
         <Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" />
-        <!--
-        <Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
-
-        <Setter Property="IsRestoreButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
-        
-        <Setter Property="IsCloseButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
-        -->
+        <Setter Property="IsMinimizeButtonVisible">
+            <OnPlatform>
+                <On Options="Default, Windows, Linux">
+                    <x:Boolean>True</x:Boolean>
+                </On>
+                <On Options="macOS">
+                    <x:Boolean>False</x:Boolean>
+                </On>
+            </OnPlatform>
+        </Setter>
+        <Setter Property="IsRestoreButtonVisible">
+            <OnPlatform>
+                <On Options="Default, Windows, Linux">
+                    <x:Boolean>True</x:Boolean>
+                </On>
+                <On Options="macOS">
+                    <x:Boolean>False</x:Boolean>
+                </On>
+            </OnPlatform>
+        </Setter>
+        <Setter Property="IsCloseButtonVisible">
+            <OnPlatform>
+                <On Options="Default, Windows, Linux">
+                    <x:Boolean>True</x:Boolean>
+                </On>
+                <On Options="macOS">
+                    <x:Boolean>False</x:Boolean>
+                </On>
+            </OnPlatform>
+        </Setter>
         <Setter Property="SystemDecorations">
             <OnPlatform>
                 <On Options="Default, Windows, macOS">

From 9c96ffeb8ce28abb2768324fad11b8af3bd7ef5a Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 31 Oct 2024 20:43:40 +0800
Subject: [PATCH 4/4] fix: fix merge issue.

---
 demo/Directory.Build.props                  |  2 +-
 src/Package.props                           |  4 ++--
 src/Ursa.Themes.Semi/Controls/Divider.axaml | 24 ++++++---------------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index 7d912bb..48fa85e 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.2.0-rc1</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Package.props b/src/Package.props
index 4e1a968..8364df1 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <Version>1.6.0</Version>
-        <AvaloniaVersion>11.2.0</AvaloniaVersion>
+        <Version>1.5.0</Version>
+        <AvaloniaVersion>11.1.4</AvaloniaVersion>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/src/Ursa.Themes.Semi/Controls/Divider.axaml b/src/Ursa.Themes.Semi/Controls/Divider.axaml
index eb6ff1c..07401ea 100644
--- a/src/Ursa.Themes.Semi/Controls/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Divider.axaml
@@ -9,28 +9,16 @@
     </Design.PreviewWith>
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="DividerLeftLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
+        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
     <ControlTheme x:Key="DividerRightLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-    </ControlTheme>
-
-    <ControlTheme x:Key="DividerContentPresenter" TargetType="{x:Type ContentPresenter}">
-        <Setter Property="Content" Value="{TemplateBinding Content}" />
-        <Setter Property="Background" Value="{TemplateBinding Background}" />
-        <Setter Property="Foreground" Value="{TemplateBinding Foreground}" />
-        <Setter Property="ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
-        <Setter Property="FontFamily" Value="{TemplateBinding FontFamily}" />
-        <Setter Property="FontWeight" Value="{TemplateBinding FontWeight}" />
-        <Setter Property="FontSize" Value="{TemplateBinding FontSize}" />
-        <Setter Property="Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
+        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>