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

feat: WIP fix xaml updates in 11.2.0

Browse Source
This commit is contained in:
rabbitism
2024-09-15 01:37:55 +08:00
parent f07531aeb9
commit c15177dbc1
4 changed files with 34 additions and 41 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> <Project>
<PropertyGroup> <PropertyGroup>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AvaloniaVersion>11.1.3</AvaloniaVersion> <AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
src/Package.props
View File

@@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>1.4.0</Version> <Version>1.6.0</Version>
<AvaloniaVersion>11.1.1</AvaloniaVersion> <AvaloniaVersion>11.2.0</AvaloniaVersion>
<Authors>IRIHI Technology Co., Ltd.</Authors> <Authors>IRIHI Technology Co., Ltd.</Authors>
<RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl> <RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>

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

@@ -49,8 +49,12 @@
<Rectangle Theme="{StaticResource DividerLeftLine}" /> <Rectangle Theme="{StaticResource DividerLeftLine}" />
<ContentPresenter <ContentPresenter
Grid.Column="1" Grid.Column="1"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" Content="{TemplateBinding Content}"
Theme="{StaticResource DividerContentPresenter}" /> 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}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@@ -66,8 +70,12 @@
<Rectangle Theme="{StaticResource DividerLeftLine}" /> <Rectangle Theme="{StaticResource DividerLeftLine}" />
<ContentPresenter <ContentPresenter
Grid.Column="1" Grid.Column="1"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" Content="{TemplateBinding Content}"
Theme="{StaticResource DividerContentPresenter}" /> 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}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@@ -83,8 +91,12 @@
<Rectangle Theme="{StaticResource DividerLeftLine}" /> <Rectangle Theme="{StaticResource DividerLeftLine}" />
<ContentPresenter <ContentPresenter
Grid.Column="1" Grid.Column="1"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" Content="{TemplateBinding Content}"
Theme="{StaticResource DividerContentPresenter}" /> 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}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@@ -100,8 +112,12 @@
<Rectangle Theme="{StaticResource DividerLeftLine}" /> <Rectangle Theme="{StaticResource DividerLeftLine}" />
<ContentPresenter <ContentPresenter
Grid.Column="1" Grid.Column="1"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" Content="{TemplateBinding Content}"
Theme="{StaticResource DividerContentPresenter}" /> 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}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>

37
src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
View File

@@ -11,36 +11,13 @@
<Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" /> <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
<Setter Property="ExtendClientAreaToDecorationsHint" Value="True" /> <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
<Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" /> <Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" />
<Setter Property="IsMinimizeButtonVisible"> <!--
<OnPlatform> <Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
<On Options="Default, Windows, Linux">
<x:Boolean>True</x:Boolean> <Setter Property="IsRestoreButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
</On>
<On Options="macOS"> <Setter Property="IsCloseButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
<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"> <Setter Property="SystemDecorations">
<OnPlatform> <OnPlatform>
<On Options="Default, Windows, macOS"> <On Options="Default, Windows, macOS">