chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: simplify axaml code.

Browse Source
This commit is contained in:
NaBian committed 2025-02-22 16:27:50 +08:00
1 parent aa5a8de6fb
commit 2c05bcedf1
5 files changed
+189 -227
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Avalonia/HandyControl_Avalonia/Themes/Basic/Paths.axaml
+8 -10
View File
@@ -136,16 +136,14 @@
<Setter Property="RenderTransformOrigin" <Setter Property="RenderTransformOrigin"
Value="0.5, 0.5" /> Value="0.5, 0.5" />
<Setter Property="RenderTransform"> <Setter Property="RenderTransform">
<Setter.Value> <TransformGroup>
<TransformGroup> <ScaleTransform ScaleY="1"
<ScaleTransform ScaleY="1" ScaleX="-1" />
ScaleX="-1" /> <SkewTransform AngleY="0"
<SkewTransform AngleY="0" AngleX="0" />
AngleX="0" /> <RotateTransform Angle="0" />
<RotateTransform Angle="0" /> <TranslateTransform />
<TranslateTransform /> </TransformGroup>
</TransformGroup>
</Setter.Value>
</Setter> </Setter>
<Setter Property="Data" <Setter Property="Data"
Value="{StaticResource LeftGeometry}" /> Value="{StaticResource LeftGeometry}" />
src/Avalonia/HandyControl_Avalonia/Themes/Styles/Border.axaml
+14 -18
View File
@@ -99,16 +99,14 @@
<ControlTheme x:Key="BorderClip" <ControlTheme x:Key="BorderClip"
TargetType="Border"> TargetType="Border">
<Setter Property="Clip"> <Setter Property="Clip">
<Setter.Value> <MultiBinding Converter="{StaticResource BorderClipConverter}">
<MultiBinding Converter="{StaticResource BorderClipConverter}"> <Binding Path="Bounds.Width"
<Binding Path="Bounds.Width" RelativeSource="{RelativeSource Self}" />
RelativeSource="{RelativeSource Self}" /> <Binding Path="Bounds.Height"
<Binding Path="Bounds.Height" RelativeSource="{RelativeSource Self}" />
RelativeSource="{RelativeSource Self}" /> <Binding Path="CornerRadius"
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
RelativeSource="{RelativeSource Self}" /> </MultiBinding>
</MultiBinding>
</Setter.Value>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
@@ -116,14 +114,12 @@
BasedOn="{StaticResource BorderCircular}" BasedOn="{StaticResource BorderCircular}"
TargetType="Border"> TargetType="Border">
<Setter Property="Clip"> <Setter Property="Clip">
<Setter.Value> <MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
<MultiBinding Converter="{StaticResource BorderCircularClipConverter}"> <Binding Path="Bounds"
<Binding Path="Bounds" RelativeSource="{RelativeSource Self}" />
RelativeSource="{RelativeSource Self}" /> <Binding Path="CornerRadius"
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
RelativeSource="{RelativeSource Self}" /> </MultiBinding>
</MultiBinding>
</Setter.Value>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>
src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml
+21 -23
View File
@@ -67,29 +67,27 @@
<Setter Property="VerticalContentAlignment" <Setter Property="VerticalContentAlignment"
Value="Center" /> Value="Center" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <ControlTemplate>
<ControlTemplate> <Panel>
<Panel> <Rectangle x:Name="TodayBackground"
<Rectangle x:Name="TodayBackground" Fill="{DynamicResource DangerBrush}"
Fill="{DynamicResource DangerBrush}" RadiusX="16"
RadiusX="16" RadiusY="16"
RadiusY="16" IsVisible="False" />
IsVisible="False" /> <Rectangle x:Name="SelectedBackground"
<Rectangle x:Name="SelectedBackground" Fill="{DynamicResource PrimaryBrush}"
Fill="{DynamicResource PrimaryBrush}" RadiusY="16"
RadiusY="16" RadiusX="16"
RadiusX="16" Opacity="0" />
Opacity="0" /> <ContentPresenter Name="PART_ContentPresenter"
<ContentPresenter Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}"
Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplate="{TemplateBinding ContentTemplate}" FontSize="{TemplateBinding FontSize}"
FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" />
Foreground="{TemplateBinding Foreground}" /> </Panel>
</Panel> </ControlTemplate>
</ControlTemplate>
</Setter.Value>
</Setter> </Setter>
<Style Selector="^:today"> <Style Selector="^:today">
src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
+61 -71
View File
@@ -117,9 +117,7 @@
<Style Selector="^ /template/ LayoutTransformControl"> <Style Selector="^ /template/ LayoutTransformControl">
<Setter Property="LayoutTransform"> <Setter Property="LayoutTransform">
<Setter.Value> <RotateTransform Angle="-90" />
<RotateTransform Angle="-90" />
</Setter.Value>
</Setter> </Setter>
</Style> </Style>
@@ -360,23 +358,21 @@
BasedOn="{StaticResource ProgressBarStripeBaseStyle}" BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar"> TargetType="ProgressBar">
<Setter Property="Foreground"> <Setter Property="Foreground">
<Setter.Value> <DrawingBrush TileMode="Tile"
<DrawingBrush TileMode="Tile" SourceRect="0,0,20,32"
SourceRect="0,0,20,32" DestinationRect="0,0,20,32"
DestinationRect="0,0,20,32" Stretch="None">
Stretch="None"> <DrawingBrush.Transform>
<DrawingBrush.Transform> <RotateTransform Angle="20" />
<RotateTransform Angle="20" /> </DrawingBrush.Transform>
</DrawingBrush.Transform> <DrawingBrush.Drawing>
<DrawingBrush.Drawing> <GeometryDrawing Brush="{StaticResource SuccessStripeBrush}">
<GeometryDrawing Brush="{StaticResource SuccessStripeBrush}"> <GeometryDrawing.Geometry>
<GeometryDrawing.Geometry> <RectangleGeometry Rect="0,0,20,32" />
<RectangleGeometry Rect="0,0,20,32" /> </GeometryDrawing.Geometry>
</GeometryDrawing.Geometry> </GeometryDrawing>
</GeometryDrawing> </DrawingBrush.Drawing>
</DrawingBrush.Drawing> </DrawingBrush>
</DrawingBrush>
</Setter.Value>
</Setter> </Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator"> <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -417,23 +413,21 @@
BasedOn="{StaticResource ProgressBarStripeBaseStyle}" BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar"> TargetType="ProgressBar">
<Setter Property="Foreground"> <Setter Property="Foreground">
<Setter.Value> <DrawingBrush TileMode="Tile"
<DrawingBrush TileMode="Tile" SourceRect="0,0,20,32"
SourceRect="0,0,20,32" DestinationRect="0,0,20,32"
DestinationRect="0,0,20,32" Stretch="None">
Stretch="None"> <DrawingBrush.Transform>
<DrawingBrush.Transform> <RotateTransform Angle="20" />
<RotateTransform Angle="20" /> </DrawingBrush.Transform>
</DrawingBrush.Transform> <DrawingBrush.Drawing>
<DrawingBrush.Drawing> <GeometryDrawing Brush="{StaticResource InfoStripeBrush}">
<GeometryDrawing Brush="{StaticResource InfoStripeBrush}"> <GeometryDrawing.Geometry>
<GeometryDrawing.Geometry> <RectangleGeometry Rect="0,0,20,32" />
<RectangleGeometry Rect="0,0,20,32" /> </GeometryDrawing.Geometry>
</GeometryDrawing.Geometry> </GeometryDrawing>
</GeometryDrawing> </DrawingBrush.Drawing>
</DrawingBrush.Drawing> </DrawingBrush>
</DrawingBrush>
</Setter.Value>
</Setter> </Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator"> <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -474,23 +468,21 @@
BasedOn="{StaticResource ProgressBarStripeBaseStyle}" BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar"> TargetType="ProgressBar">
<Setter Property="Foreground"> <Setter Property="Foreground">
<Setter.Value> <DrawingBrush TileMode="Tile"
<DrawingBrush TileMode="Tile" SourceRect="0,0,20,32"
SourceRect="0,0,20,32" DestinationRect="0,0,20,32"
DestinationRect="0,0,20,32" Stretch="None">
Stretch="None"> <DrawingBrush.Transform>
<DrawingBrush.Transform> <RotateTransform Angle="20" />
<RotateTransform Angle="20" /> </DrawingBrush.Transform>
</DrawingBrush.Transform> <DrawingBrush.Drawing>
<DrawingBrush.Drawing> <GeometryDrawing Brush="{StaticResource WarningStripeBrush}">
<GeometryDrawing Brush="{StaticResource WarningStripeBrush}"> <GeometryDrawing.Geometry>
<GeometryDrawing.Geometry> <RectangleGeometry Rect="0,0,20,32" />
<RectangleGeometry Rect="0,0,20,32" /> </GeometryDrawing.Geometry>
</GeometryDrawing.Geometry> </GeometryDrawing>
</GeometryDrawing> </DrawingBrush.Drawing>
</DrawingBrush.Drawing> </DrawingBrush>
</DrawingBrush>
</Setter.Value>
</Setter> </Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator"> <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -531,23 +523,21 @@
BasedOn="{StaticResource ProgressBarStripeBaseStyle}" BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar"> TargetType="ProgressBar">
<Setter Property="Foreground"> <Setter Property="Foreground">
<Setter.Value> <DrawingBrush TileMode="Tile"
<DrawingBrush TileMode="Tile" SourceRect="0,0,20,32"
SourceRect="0,0,20,32" DestinationRect="0,0,20,32"
DestinationRect="0,0,20,32" Stretch="None">
Stretch="None"> <DrawingBrush.Transform>
<DrawingBrush.Transform> <RotateTransform Angle="20" />
<RotateTransform Angle="20" /> </DrawingBrush.Transform>
</DrawingBrush.Transform> <DrawingBrush.Drawing>
<DrawingBrush.Drawing> <GeometryDrawing Brush="{StaticResource DangerStripeBrush}">
<GeometryDrawing Brush="{StaticResource DangerStripeBrush}"> <GeometryDrawing.Geometry>
<GeometryDrawing.Geometry> <RectangleGeometry Rect="0,0,20,32" />
<RectangleGeometry Rect="0,0,20,32" /> </GeometryDrawing.Geometry>
</GeometryDrawing.Geometry> </GeometryDrawing>
</GeometryDrawing> </DrawingBrush.Drawing>
</DrawingBrush.Drawing> </DrawingBrush>
</DrawingBrush>
</Setter.Value>
</Setter> </Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator"> <Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
src/Avalonia/HandyControl_Avalonia/Themes/Styles/TabControl.axaml
+85 -105
View File
@@ -151,23 +151,19 @@
<Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]"> <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<Setter.Value> <ItemsPanelTemplate>
<ItemsPanelTemplate> <UniformGrid Rows="0"
<UniformGrid Rows="0" Columns="1" />
Columns="1" /> </ItemsPanelTemplate>
</ItemsPanelTemplate>
</Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]"> <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<Setter.Value> <ItemsPanelTemplate>
<ItemsPanelTemplate> <UniformGrid Rows="1"
<UniformGrid Rows="1" Columns="0" />
Columns="0" /> </ItemsPanelTemplate>
</ItemsPanelTemplate>
</Setter.Value>
</Setter> </Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>
@@ -308,9 +304,7 @@
<Setter Property="hc:TitleElement.Foreground" <Setter Property="hc:TitleElement.Foreground"
Value="{DynamicResource PrimaryBrush}" /> Value="{DynamicResource PrimaryBrush}" />
<Setter Property="hc:ItemsControlAttach.ItemsContainerThemeSelector"> <Setter Property="hc:ItemsControlAttach.ItemsContainerThemeSelector">
<Setter.Value> <tools:TabItemCapsuleThemeSelector />
<tools:TabItemCapsuleThemeSelector />
</Setter.Value>
</Setter> </Setter>
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
@@ -366,27 +360,23 @@
<Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]"> <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<Setter.Value> <ItemsPanelTemplate>
<ItemsPanelTemplate> <UniformGrid Rows="0"
<UniformGrid Rows="0" Columns="1"
Columns="1" HorizontalAlignment="Center"
HorizontalAlignment="Center" VerticalAlignment="Center" />
VerticalAlignment="Center" /> </ItemsPanelTemplate>
</ItemsPanelTemplate>
</Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]"> <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<Setter.Value> <ItemsPanelTemplate>
<ItemsPanelTemplate> <UniformGrid Rows="1"
<UniformGrid Rows="1" Columns="0"
Columns="0" HorizontalAlignment="Center"
HorizontalAlignment="Center" VerticalAlignment="Center" />
VerticalAlignment="Center" /> </ItemsPanelTemplate>
</ItemsPanelTemplate>
</Setter.Value>
</Setter> </Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>
@@ -413,27 +403,25 @@
<Setter Property="Padding" <Setter Property="Padding"
Value="2" /> Value="2" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <ControlTemplate>
<ControlTemplate> <Border HorizontalAlignment="Center"
<Border HorizontalAlignment="Center" VerticalAlignment="Center"
VerticalAlignment="Center" Padding="{TemplateBinding Padding}"
Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}"
Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"> <Panel>
<Panel> <Border x:Name="PART_Sliding"
<Border x:Name="PART_Sliding" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Width="0"
Width="0" Height="0"
Height="0" Effect="{StaticResource EffectShadow1}"
Effect="{StaticResource EffectShadow1}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}"
Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Left"
HorizontalAlignment="Left" VerticalAlignment="Top" />
VerticalAlignment="Top" /> <ContentPresenter Content="{TemplateBinding Content}" />
<ContentPresenter Content="{TemplateBinding Content}" /> </Panel>
</Panel> </Border>
</Border> </ControlTemplate>
</ControlTemplate>
</Setter.Value>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
@@ -464,24 +452,22 @@
<Setter Property="hc:BorderElement.CornerRadius" <Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" /> Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <ControlTemplate>
<ControlTemplate> <Border x:Name="rootBorder"
<Border x:Name="rootBorder" CornerRadius="{TemplateBinding CornerRadius}"
CornerRadius="{TemplateBinding CornerRadius}" Background="{TemplateBinding Background}"
Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
BorderBrush="{TemplateBinding BorderBrush}"> <ContentPresenter Name="PART_ContentPresenter"
<ContentPresenter Name="PART_ContentPresenter" Padding="{TemplateBinding Padding}"
Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Header}"
Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplate="{TemplateBinding HeaderTemplate}" CornerRadius="{TemplateBinding CornerRadius}"
CornerRadius="{TemplateBinding CornerRadius}" RecognizesAccessKey="True" />
RecognizesAccessKey="True" /> </Border>
</Border> </ControlTemplate>
</ControlTemplate>
</Setter.Value>
</Setter> </Setter>
<Style Selector="^:disabled"> <Style Selector="^:disabled">
@@ -519,31 +505,29 @@
<Setter Property="hc:TitleElement.Foreground" <Setter Property="hc:TitleElement.Foreground"
Value="{DynamicResource PrimaryTextBrush}" /> Value="{DynamicResource PrimaryTextBrush}" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <ControlTemplate>
<ControlTemplate> <DockPanel>
<DockPanel> <hc:SlidingTabContainer x:Name="tabContainer"
<hc:SlidingTabContainer x:Name="tabContainer" Background="{TemplateBinding Background}">
Background="{TemplateBinding Background}"> <ItemsPresenter Name="PART_ItemsPresenter"
<ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}"
ItemsPanel="{TemplateBinding ItemsPanel}" VerticalAlignment="Center"
VerticalAlignment="Center" HorizontalAlignment="Center" />
HorizontalAlignment="Center" /> </hc:SlidingTabContainer>
</hc:SlidingTabContainer> <Border Padding="{TemplateBinding Padding}"
<Border Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}" BorderBrush="{TemplateBinding BorderBrush}"
BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
BorderThickness="{TemplateBinding BorderThickness}"> <ContentPresenter Name="PART_SelectedContentHost"
<ContentPresenter Name="PART_SelectedContentHost" Margin="{TemplateBinding Padding}"
Margin="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding SelectedContent}"
Content="{TemplateBinding SelectedContent}" ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
ContentTemplate="{TemplateBinding SelectedContentTemplate}" /> </Border>
</Border> </DockPanel>
</DockPanel> </ControlTemplate>
</ControlTemplate>
</Setter.Value>
</Setter> </Setter>
<Style Selector="^[TabStripPlacement=Top] /template/ hc|SlidingTabContainer#tabContainer"> <Style Selector="^[TabStripPlacement=Top] /template/ hc|SlidingTabContainer#tabContainer">
@@ -576,21 +560,17 @@
<Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]"> <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<Setter.Value> <ItemsPanelTemplate>
<ItemsPanelTemplate> <StackPanel Orientation="Vertical" />
<StackPanel Orientation="Vertical" /> </ItemsPanelTemplate>
</ItemsPanelTemplate>
</Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]"> <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<Setter.Value> <ItemsPanelTemplate>
<ItemsPanelTemplate> <StackPanel Orientation="Horizontal" />
<StackPanel Orientation="Horizontal" /> </ItemsPanelTemplate>
</ItemsPanelTemplate>
</Setter.Value>
</Setter> </Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>