zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-04-08 18:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync upstream update. (#764)

Browse Source
This commit is contained in:
Zhang Dian
2026-03-13 16:28:44 +08:00
parent c84c8a3c90
commit 141eeefd2e
2 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Semi.Avalonia/Controls/SplitView.axaml
View File

@@ -52,7 +52,7 @@
<Style Selector="^:overlay"> <Style Selector="^:overlay">
<Style Selector="^ /template/ Panel#PART_PaneRoot"> <Style Selector="^ /template/ Panel#PART_PaneRoot">
<Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" /> <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
<Setter Property="Grid.ColumnSpan" Value="1" /> <Setter Property="Grid.ColumnSpan" Value="2" />
<Setter Property="Grid.Column" Value="0" /> <Setter Property="Grid.Column" Value="0" />
</Style> </Style>
<Style Selector="^ /template/ Panel#ContentRoot"> <Style Selector="^ /template/ Panel#ContentRoot">
@@ -75,8 +75,7 @@
<Style Selector="^:compactoverlay"> <Style Selector="^:compactoverlay">
<Style Selector="^ /template/ Panel#PART_PaneRoot"> <Style Selector="^ /template/ Panel#PART_PaneRoot">
<!-- ColumnSpan should be 2 --> <Setter Property="Grid.ColumnSpan" Value="2" />
<Setter Property="Grid.ColumnSpan" Value="1" />
<Setter Property="Grid.Column" Value="0" /> <Setter Property="Grid.Column" Value="0" />
<Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" /> <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
</Style> </Style>

80
src/Semi.Avalonia/Controls/TabControl.axaml
View File

@@ -36,13 +36,19 @@
ItemsPanel="{TemplateBinding ItemsPanel}" /> ItemsPanel="{TemplateBinding ItemsPanel}" />
<Border Name="PART_BorderSeparator" /> <Border Name="PART_BorderSeparator" />
</Panel> </Panel>
<ContentPresenter <Panel ClipToBounds="True">
Name="PART_SelectedContentHost" <ContentPresenter
Margin="{TemplateBinding Padding}" Name="PART_SelectedContentHost2"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Content="{TemplateBinding SelectedContent}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}" /> IsVisible="False" />
<ContentPresenter
Name="PART_SelectedContentHost"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
</Panel>
</DockPanel> </DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@@ -149,13 +155,19 @@
Name="PART_ItemsPresenter" Name="PART_ItemsPresenter"
ItemsPanel="{TemplateBinding ItemsPanel}" /> ItemsPanel="{TemplateBinding ItemsPanel}" />
</Panel> </Panel>
<ContentPresenter <Panel ClipToBounds="True">
Name="PART_SelectedContentHost" <ContentPresenter
Margin="{TemplateBinding Padding}" Name="PART_SelectedContentHost2"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Content="{TemplateBinding SelectedContent}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}" /> IsVisible="False" />
<ContentPresenter
Name="PART_SelectedContentHost"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
</Panel>
</DockPanel> </DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@@ -200,13 +212,19 @@
</ScrollViewer> </ScrollViewer>
<Border Name="PART_BorderSeparator" /> <Border Name="PART_BorderSeparator" />
</Panel> </Panel>
<ContentPresenter <Panel ClipToBounds="True">
Name="PART_SelectedContentHost" <ContentPresenter
Margin="{TemplateBinding Padding}" Name="PART_SelectedContentHost2"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Content="{TemplateBinding SelectedContent}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}" /> IsVisible="False" />
<ContentPresenter
Name="PART_SelectedContentHost"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
</Panel>
</DockPanel> </DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@@ -335,13 +353,19 @@
ItemsPanel="{TemplateBinding ItemsPanel}" /> ItemsPanel="{TemplateBinding ItemsPanel}" />
</ScrollViewer> </ScrollViewer>
</Panel> </Panel>
<ContentPresenter <Panel ClipToBounds="True">
Name="PART_SelectedContentHost" <ContentPresenter
Margin="{TemplateBinding Padding}" Name="PART_SelectedContentHost2"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Content="{TemplateBinding SelectedContent}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}" /> IsVisible="False" />
<ContentPresenter
Name="PART_SelectedContentHost"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
</Panel>
</DockPanel> </DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>