chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #453 from irihitech/11.2-beta

Browse Source 
11.2 compatibility
This commit is contained in:
Juster Zhu
2024-10-31 21:40:21 +08:00
committed by GitHub
parent f07531aeb9 9c96ffeb8c
commit 474eb9326f
3 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Directory.Build.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<AvaloniaVersion>11.1.3</AvaloniaVersion>
<AvaloniaVersion>11.2.0</AvaloniaVersion>
</PropertyGroup>
</Project>

4
src/Package.props
View File

@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<Version>1.4.0</Version>
<AvaloniaVersion>11.1.1</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>

56
src/Ursa.Themes.Semi/Controls/Divider.axaml
View File

@@ -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>
@@ -49,8 +37,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 +58,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 +79,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 +100,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>