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] 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 7d912bbb..48fa85e1 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 4e1a9688..8364df1f 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 eb6ff1cd..07401eac 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>