zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update style to make it feels a bit better.

Browse Source
This commit is contained in:
rabbitism 2022-12-13 00:30:05 +08:00
parent 392f432a7b
commit 6b2fd3caae
3 changed files with 93 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml
View File

@ -4,25 +4,33 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450"
d:DesignWidth="800" mc:Ignorable="d"> d:DesignWidth="800" mc:Ignorable="d">
<StackPanel> <StackPanel>
<TabControl TabStripPlacement="Top"> <Border Theme="{StaticResource CardBorder}">
<TabItem Content="Hello 1" Header="Tab 1" /> <TabControl TabStripPlacement="Top">
<TabItem Content="Hello 2" Header="Tab 2" /> <TabItem Content="Hello 1" Header="Tab 1" />
<TabItem Content="Hello 3" Header="Tab 3" /> <TabItem Content="Hello 2" Header="Tab 2" />
</TabControl> <TabItem Content="Hello 3" Header="Tab 3" />
<TabControl TabStripPlacement="Left"> </TabControl>
<TabItem Content="Hello 1" Header="Tab 1" /> </Border>
<TabItem Content="Hello 2" Header="Tab 2" /> <Border Theme="{StaticResource CardBorder}">
<TabItem Content="Hello 3" Header="Tab 3" /> <TabControl TabStripPlacement="Left">
</TabControl> <TabItem Content="Hello 1" Header="Tab 1" />
<TabControl TabStripPlacement="Right"> <TabItem Content="Hello 2" Header="Tab 2" />
<TabItem Content="Hello 1" Header="Tab 1" /> <TabItem Content="Hello 3" Header="Tab 3" />
<TabItem Content="Hello 2" Header="Tab 2" /> </TabControl>
<TabItem Content="Hello 3" Header="Tab 3" /> </Border>
</TabControl> <Border Theme="{StaticResource CardBorder}">
<TabControl TabStripPlacement="Bottom"> <TabControl TabStripPlacement="Right">
<TabItem Content="Hello 1" Header="Tab 1" /> <TabItem Content="Hello 1" Header="Tab 1" />
<TabItem Content="Hello 2" Header="Tab 2" /> <TabItem Content="Hello 2" Header="Tab 2" />
<TabItem Content="Hello 3" Header="Tab 3" /> <TabItem Content="Hello 3" Header="Tab 3" />
</TabControl> </TabControl>
</Border>
<Border Theme="{StaticResource CardBorder}">
<TabControl TabStripPlacement="Bottom">
<TabItem Content="Hello 1" Header="Tab 1" />
<TabItem Content="Hello 2" Header="Tab 2" />
<TabItem Content="Hello 3" Header="Tab 3" />
</TabControl>
</Border>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

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

@ -1,32 +1,34 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme TargetType="TabControl" x:Key="{x:Type TabControl}"> <ControlTheme x:Key="{x:Type TabControl}" TargetType="TabControl">
<Setter Property="Margin" Value="0" /> <Setter Property="Margin" Value="0" />
<Setter Property="Padding" Value="{DynamicResource TabItemMargin}" /> <Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="{DynamicResource TabControlBackground}" /> <Setter Property="Background" Value="{DynamicResource TabControlBackground}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="TabControl"> <ControlTemplate TargetType="TabControl">
<Border <Border
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}">
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}">
<DockPanel> <DockPanel>
<ItemsPresenter <Panel DockPanel.Dock="{TemplateBinding TabStripPlacement}">
DockPanel.Dock="{TemplateBinding TabStripPlacement}" <ItemsPresenter
ItemTemplate="{TemplateBinding ItemTemplate}" Name="PART_ItemsPresenter"
Items="{TemplateBinding Items}" ItemTemplate="{TemplateBinding ItemTemplate}"
ItemsPanel="{TemplateBinding ItemsPanel}" Items="{TemplateBinding Items}"
Name="PART_ItemsPresenter" /> ItemsPanel="{TemplateBinding ItemsPanel}" />
<Border Name="PART_BorderSeparator" Background="{DynamicResource TabItemLinePipePressedBorderBrush}" />
</Panel>
<ContentPresenter <ContentPresenter
Content="{TemplateBinding SelectedContent}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Margin="{TemplateBinding Padding}"
Name="PART_SelectedContentHost" Name="PART_SelectedContentHost"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" /> Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding SelectedContent}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
</DockPanel> </DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@ -38,8 +40,30 @@
<Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel"> <Style Selector="^[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel">
<Setter Property="Orientation" Value="Vertical" /> <Setter Property="Orientation" Value="Vertical" />
</Style> </Style>
<Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter"> <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
<Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" /> <Setter Property="Border.Width" Value="2" />
<Setter Property="Border.VerticalAlignment" Value="Stretch" />
<Setter Property="Border.HorizontalAlignment" Value="Left" />
</Style> </Style>
<Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_BorderSeparator">
<Setter Property="Border.Width" Value="2" />
<Setter Property="Border.VerticalAlignment" Value="Stretch" />
<Setter Property="Border.HorizontalAlignment" Value="Right" />
</Style>
<Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_BorderSeparator">
<Setter Property="Border.Height" Value="2" />
<Setter Property="Border.HorizontalAlignment" Value="Stretch" />
<Setter Property="Border.VerticalAlignment" Value="Bottom" />
</Style>
<Style Selector="^[TabStripPlacement=Bottom] /template/ Border#PART_BorderSeparator">
<Setter Property="Border.Height" Value="2" />
<Setter Property="Border.HorizontalAlignment" Value="Stretch" />
<Setter Property="Border.VerticalAlignment" Value="Top" />
</Style>
<!--
<Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
<Setter Property="Margin" Value="8" />
</Style>
-->
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

30
src/Semi.Avalonia/Controls/TabItem.axaml
View File

@ -16,17 +16,17 @@
<Setter Property="TabItem.MinHeight" Value="5" /> <Setter Property="TabItem.MinHeight" Value="5" />
<Setter Property="TabItem.VerticalContentAlignment" Value="Center" /> <Setter Property="TabItem.VerticalContentAlignment" Value="Center" />
<Setter Property="TabItem.Template"> <Setter Property="TabItem.Template">
<ControlTemplate> <ControlTemplate TargetType="TabItem">
<Border <Border
Name="PART_LayoutRoot" Name="PART_LayoutRoot"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Panel>
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
@ -39,7 +39,7 @@
Background="{DynamicResource TabItemLinePipeSelectedBackground}" Background="{DynamicResource TabItemLinePipeSelectedBackground}"
CornerRadius="{DynamicResource ControlCornerRadius}" CornerRadius="{DynamicResource ControlCornerRadius}"
IsVisible="False" /> IsVisible="False" />
</Grid> </Panel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
@ -50,13 +50,16 @@
<Setter Property="Foreground" Value="Blue" /> <Setter Property="Foreground" Value="Blue" />
</Style> </Style>
<Style Selector="^:not(:selected)">
<Setter Property="Cursor" Value="Hand" />
</Style>
<Style Selector="^:selected /template/ Border#PART_SelectedPipe"> <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
<!-- PointerOver state --> <!-- PointerOver state -->
<Style Selector="^:pointerover /template/ Border#PART_LayoutRoot"> <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
<Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselectedPointerOver}" />
<Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" /> <Setter Property="TextElement.Foreground" Value="{DynamicResource TabItemHeaderForegroundUnselectedPointerOver}" />
</Style> </Style>
@ -87,7 +90,7 @@
<!-- TabStripPlacement States Group --> <!-- TabStripPlacement States Group -->
<Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe"> <Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_SelectedPipe">
<Setter Property="Border.Width" Value="2" /> <Setter Property="Border.Width" Value="2" />
<Setter Property="Border.Margin" Value="0,0,2,0" /> <Setter Property="Border.Margin" Value="0,0,8,0" />
<Setter Property="Border.HorizontalAlignment" Value="Left" /> <Setter Property="Border.HorizontalAlignment" Value="Left" />
<Setter Property="Border.VerticalAlignment" Value="Stretch" /> <Setter Property="Border.VerticalAlignment" Value="Stretch" />
</Style> </Style>
@ -97,11 +100,24 @@
<Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, ^[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe"> <Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe, ^[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
<Setter Property="Height" Value="2" /> <Setter Property="Height" Value="2" />
<Setter Property="Margin" Value="0,0,0,2" /> <Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
</Style>
<Style Selector="^[TabStripPlacement=Bottom] /template/ Border#PART_SelectedPipe">
<Setter Property="VerticalAlignment" Value="Top" />
</Style>
<Style Selector="^[TabStripPlacement=Top] /template/ Border#PART_SelectedPipe">
<Setter Property="VerticalAlignment" Value="Bottom" /> <Setter Property="VerticalAlignment" Value="Bottom" />
</Style> </Style>
<Style Selector="^[TabStripPlacement=Top] /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Margin" Value="0,0,0,8" />
</Style>
<Style Selector="^[TabStripPlacement=Bottom] /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Margin" Value="0,0,0,8" />
</Style>
<Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe"> <Style Selector="^[TabStripPlacement=Right] /template/ Border#PART_SelectedPipe">
<Setter Property="Width" Value="2" /> <Setter Property="Width" Value="2" />
<Setter Property="Margin" Value="2,0,0,0" /> <Setter Property="Margin" Value="2,0,0,0" />