Skip to content

Commit 2c05bce

Browse files
NaBianNaBian
committed
chore: simplify axaml code.
1 parent aa5a8de commit 2c05bce

File tree

5 files changed

+189
-227
lines changed

5 files changed

+189
-227
lines changed

‎src/Avalonia/HandyControl_Avalonia/Themes/Basic/Paths.axaml

+8-10
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,14 @@
136136
<Setter Property="RenderTransformOrigin"
137137
Value="0.5, 0.5" />
138138
<Setter Property="RenderTransform">
139-
<Setter.Value>
140-
<TransformGroup>
141-
<ScaleTransform ScaleY="1"
142-
ScaleX="-1" />
143-
<SkewTransform AngleY="0"
144-
AngleX="0" />
145-
<RotateTransform Angle="0" />
146-
<TranslateTransform />
147-
</TransformGroup>
148-
</Setter.Value>
139+
<TransformGroup>
140+
<ScaleTransform ScaleY="1"
141+
ScaleX="-1" />
142+
<SkewTransform AngleY="0"
143+
AngleX="0" />
144+
<RotateTransform Angle="0" />
145+
<TranslateTransform />
146+
</TransformGroup>
149147
</Setter>
150148
<Setter Property="Data"
151149
Value="{StaticResource LeftGeometry}" />

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/Border.axaml

+14-18
Original file line numberDiff line numberDiff line change
@@ -99,31 +99,27 @@
9999
<ControlTheme x:Key="BorderClip"
100100
TargetType="Border">
101101
<Setter Property="Clip">
102-
<Setter.Value>
103-
<MultiBinding Converter="{StaticResource BorderClipConverter}">
104-
<Binding Path="Bounds.Width"
105-
RelativeSource="{RelativeSource Self}" />
106-
<Binding Path="Bounds.Height"
107-
RelativeSource="{RelativeSource Self}" />
108-
<Binding Path="CornerRadius"
109-
RelativeSource="{RelativeSource Self}" />
110-
</MultiBinding>
111-
</Setter.Value>
102+
<MultiBinding Converter="{StaticResource BorderClipConverter}">
103+
<Binding Path="Bounds.Width"
104+
RelativeSource="{RelativeSource Self}" />
105+
<Binding Path="Bounds.Height"
106+
RelativeSource="{RelativeSource Self}" />
107+
<Binding Path="CornerRadius"
108+
RelativeSource="{RelativeSource Self}" />
109+
</MultiBinding>
112110
</Setter>
113111
</ControlTheme>
114112

115113
<ControlTheme x:Key="BorderCircularClip"
116114
BasedOn="{StaticResource BorderCircular}"
117115
TargetType="Border">
118116
<Setter Property="Clip">
119-
<Setter.Value>
120-
<MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
121-
<Binding Path="Bounds"
122-
RelativeSource="{RelativeSource Self}" />
123-
<Binding Path="CornerRadius"
124-
RelativeSource="{RelativeSource Self}" />
125-
</MultiBinding>
126-
</Setter.Value>
117+
<MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
118+
<Binding Path="Bounds"
119+
RelativeSource="{RelativeSource Self}" />
120+
<Binding Path="CornerRadius"
121+
RelativeSource="{RelativeSource Self}" />
122+
</MultiBinding>
127123
</Setter>
128124
</ControlTheme>
129125
</ResourceDictionary>

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/Calendar.axaml

+21-23
Original file line numberDiff line numberDiff line change
@@ -67,29 +67,27 @@
6767
<Setter Property="VerticalContentAlignment"
6868
Value="Center" />
6969
<Setter Property="Template">
70-
<Setter.Value>
71-
<ControlTemplate>
72-
<Panel>
73-
<Rectangle x:Name="TodayBackground"
74-
Fill="{DynamicResource DangerBrush}"
75-
RadiusX="16"
76-
RadiusY="16"
77-
IsVisible="False" />
78-
<Rectangle x:Name="SelectedBackground"
79-
Fill="{DynamicResource PrimaryBrush}"
80-
RadiusY="16"
81-
RadiusX="16"
82-
Opacity="0" />
83-
<ContentPresenter Name="PART_ContentPresenter"
84-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
85-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
86-
Content="{TemplateBinding Content}"
87-
ContentTemplate="{TemplateBinding ContentTemplate}"
88-
FontSize="{TemplateBinding FontSize}"
89-
Foreground="{TemplateBinding Foreground}" />
90-
</Panel>
91-
</ControlTemplate>
92-
</Setter.Value>
70+
<ControlTemplate>
71+
<Panel>
72+
<Rectangle x:Name="TodayBackground"
73+
Fill="{DynamicResource DangerBrush}"
74+
RadiusX="16"
75+
RadiusY="16"
76+
IsVisible="False" />
77+
<Rectangle x:Name="SelectedBackground"
78+
Fill="{DynamicResource PrimaryBrush}"
79+
RadiusY="16"
80+
RadiusX="16"
81+
Opacity="0" />
82+
<ContentPresenter Name="PART_ContentPresenter"
83+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
84+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
85+
Content="{TemplateBinding Content}"
86+
ContentTemplate="{TemplateBinding ContentTemplate}"
87+
FontSize="{TemplateBinding FontSize}"
88+
Foreground="{TemplateBinding Foreground}" />
89+
</Panel>
90+
</ControlTemplate>
9391
</Setter>
9492

9593
<Style Selector="^:today">

‎src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml

+61-71
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,7 @@
117117

118118
<Style Selector="^ /template/ LayoutTransformControl">
119119
<Setter Property="LayoutTransform">
120-
<Setter.Value>
121-
<RotateTransform Angle="-90" />
122-
</Setter.Value>
120+
<RotateTransform Angle="-90" />
123121
</Setter>
124122
</Style>
125123

@@ -360,23 +358,21 @@
360358
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
361359
TargetType="ProgressBar">
362360
<Setter Property="Foreground">
363-
<Setter.Value>
364-
<DrawingBrush TileMode="Tile"
365-
SourceRect="0,0,20,32"
366-
DestinationRect="0,0,20,32"
367-
Stretch="None">
368-
<DrawingBrush.Transform>
369-
<RotateTransform Angle="20" />
370-
</DrawingBrush.Transform>
371-
<DrawingBrush.Drawing>
372-
<GeometryDrawing Brush="{StaticResource SuccessStripeBrush}">
373-
<GeometryDrawing.Geometry>
374-
<RectangleGeometry Rect="0,0,20,32" />
375-
</GeometryDrawing.Geometry>
376-
</GeometryDrawing>
377-
</DrawingBrush.Drawing>
378-
</DrawingBrush>
379-
</Setter.Value>
361+
<DrawingBrush TileMode="Tile"
362+
SourceRect="0,0,20,32"
363+
DestinationRect="0,0,20,32"
364+
Stretch="None">
365+
<DrawingBrush.Transform>
366+
<RotateTransform Angle="20" />
367+
</DrawingBrush.Transform>
368+
<DrawingBrush.Drawing>
369+
<GeometryDrawing Brush="{StaticResource SuccessStripeBrush}">
370+
<GeometryDrawing.Geometry>
371+
<RectangleGeometry Rect="0,0,20,32" />
372+
</GeometryDrawing.Geometry>
373+
</GeometryDrawing>
374+
</DrawingBrush.Drawing>
375+
</DrawingBrush>
380376
</Setter>
381377

382378
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -417,23 +413,21 @@
417413
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
418414
TargetType="ProgressBar">
419415
<Setter Property="Foreground">
420-
<Setter.Value>
421-
<DrawingBrush TileMode="Tile"
422-
SourceRect="0,0,20,32"
423-
DestinationRect="0,0,20,32"
424-
Stretch="None">
425-
<DrawingBrush.Transform>
426-
<RotateTransform Angle="20" />
427-
</DrawingBrush.Transform>
428-
<DrawingBrush.Drawing>
429-
<GeometryDrawing Brush="{StaticResource InfoStripeBrush}">
430-
<GeometryDrawing.Geometry>
431-
<RectangleGeometry Rect="0,0,20,32" />
432-
</GeometryDrawing.Geometry>
433-
</GeometryDrawing>
434-
</DrawingBrush.Drawing>
435-
</DrawingBrush>
436-
</Setter.Value>
416+
<DrawingBrush TileMode="Tile"
417+
SourceRect="0,0,20,32"
418+
DestinationRect="0,0,20,32"
419+
Stretch="None">
420+
<DrawingBrush.Transform>
421+
<RotateTransform Angle="20" />
422+
</DrawingBrush.Transform>
423+
<DrawingBrush.Drawing>
424+
<GeometryDrawing Brush="{StaticResource InfoStripeBrush}">
425+
<GeometryDrawing.Geometry>
426+
<RectangleGeometry Rect="0,0,20,32" />
427+
</GeometryDrawing.Geometry>
428+
</GeometryDrawing>
429+
</DrawingBrush.Drawing>
430+
</DrawingBrush>
437431
</Setter>
438432

439433
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -474,23 +468,21 @@
474468
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
475469
TargetType="ProgressBar">
476470
<Setter Property="Foreground">
477-
<Setter.Value>
478-
<DrawingBrush TileMode="Tile"
479-
SourceRect="0,0,20,32"
480-
DestinationRect="0,0,20,32"
481-
Stretch="None">
482-
<DrawingBrush.Transform>
483-
<RotateTransform Angle="20" />
484-
</DrawingBrush.Transform>
485-
<DrawingBrush.Drawing>
486-
<GeometryDrawing Brush="{StaticResource WarningStripeBrush}">
487-
<GeometryDrawing.Geometry>
488-
<RectangleGeometry Rect="0,0,20,32" />
489-
</GeometryDrawing.Geometry>
490-
</GeometryDrawing>
491-
</DrawingBrush.Drawing>
492-
</DrawingBrush>
493-
</Setter.Value>
471+
<DrawingBrush TileMode="Tile"
472+
SourceRect="0,0,20,32"
473+
DestinationRect="0,0,20,32"
474+
Stretch="None">
475+
<DrawingBrush.Transform>
476+
<RotateTransform Angle="20" />
477+
</DrawingBrush.Transform>
478+
<DrawingBrush.Drawing>
479+
<GeometryDrawing Brush="{StaticResource WarningStripeBrush}">
480+
<GeometryDrawing.Geometry>
481+
<RectangleGeometry Rect="0,0,20,32" />
482+
</GeometryDrawing.Geometry>
483+
</GeometryDrawing>
484+
</DrawingBrush.Drawing>
485+
</DrawingBrush>
494486
</Setter>
495487

496488
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
@@ -531,23 +523,21 @@
531523
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
532524
TargetType="ProgressBar">
533525
<Setter Property="Foreground">
534-
<Setter.Value>
535-
<DrawingBrush TileMode="Tile"
536-
SourceRect="0,0,20,32"
537-
DestinationRect="0,0,20,32"
538-
Stretch="None">
539-
<DrawingBrush.Transform>
540-
<RotateTransform Angle="20" />
541-
</DrawingBrush.Transform>
542-
<DrawingBrush.Drawing>
543-
<GeometryDrawing Brush="{StaticResource DangerStripeBrush}">
544-
<GeometryDrawing.Geometry>
545-
<RectangleGeometry Rect="0,0,20,32" />
546-
</GeometryDrawing.Geometry>
547-
</GeometryDrawing>
548-
</DrawingBrush.Drawing>
549-
</DrawingBrush>
550-
</Setter.Value>
526+
<DrawingBrush TileMode="Tile"
527+
SourceRect="0,0,20,32"
528+
DestinationRect="0,0,20,32"
529+
Stretch="None">
530+
<DrawingBrush.Transform>
531+
<RotateTransform Angle="20" />
532+
</DrawingBrush.Transform>
533+
<DrawingBrush.Drawing>
534+
<GeometryDrawing Brush="{StaticResource DangerStripeBrush}">
535+
<GeometryDrawing.Geometry>
536+
<RectangleGeometry Rect="0,0,20,32" />
537+
</GeometryDrawing.Geometry>
538+
</GeometryDrawing>
539+
</DrawingBrush.Drawing>
540+
</DrawingBrush>
551541
</Setter>
552542

553543
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">

0 commit comments

Comments
 (0)