Skip to content

Commit b2b197c

Browse files
committed
Update
1 parent e1415a7 commit b2b197c

File tree

7 files changed

+1892
-1804
lines changed

7 files changed

+1892
-1804
lines changed

src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
</None>
199199
</ItemGroup>
200200
<ItemGroup>
201-
<PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0121">
201+
<PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0140">
202202
<PrivateAssets>all</PrivateAssets>
203203
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
204204
</PackageReference>

src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</interactivity:Interaction.Triggers>
8080
<Image IsHitTestVisible="False" Name="Icon" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
8181
</Button>
82-
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
82+
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="{TemplateBinding TitleAlignment}" Margin="{TemplateBinding TitleMargin}">
8383
<TextBlock.Visibility>
8484
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
8585
<MultiBinding.Bindings>
@@ -202,7 +202,7 @@
202202
</interactivity:Interaction.Triggers>
203203
<Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
204204
</Button>
205-
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
205+
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="{TemplateBinding TitleAlignment}" Margin="{TemplateBinding TitleMargin}">
206206
<TextBlock.Visibility>
207207
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
208208
<MultiBinding.Bindings>

src/Net_40/HandyControl_Net_40/Themes/Theme.xaml

Lines changed: 1022 additions & 973 deletions
Large diffs are not rendered by default.

src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
</Resource>
167167
</ItemGroup>
168168
<ItemGroup>
169-
<PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0121">
169+
<PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0140">
170170
<PrivateAssets>all</PrivateAssets>
171171
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
172172
</PackageReference>

src/Net_GE45/HandyControl_Net_GE45/Themes/Theme.xaml

Lines changed: 840 additions & 825 deletions
Large diffs are not rendered by default.

src/Shared/HandyControl_Shared/HandyControls/Controls/Window!.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,30 @@ namespace HandyControl.Controls;
77

88
public partial class Window
99
{
10+
#region Title
11+
12+
public static readonly DependencyProperty TitleAlignmentProperty = DependencyProperty.Register(
13+
"TitleAlignment", typeof(HorizontalAlignment), typeof(Window),
14+
new PropertyMetadata(HorizontalAlignment.Left));
15+
16+
public HorizontalAlignment TitleAlignment
17+
{
18+
get => (HorizontalAlignment) GetValue(TitleAlignmentProperty);
19+
set => SetValue(TitleAlignmentProperty, (HorizontalAlignment) value);
20+
}
21+
22+
public static readonly DependencyProperty TitleMarginProperty = DependencyProperty.Register(
23+
"TitleMargin", typeof(Thickness), typeof(Window),
24+
new PropertyMetadata(0));
25+
26+
public Thickness TitleMargin
27+
{
28+
get => (Thickness) GetValue(TitleMarginProperty);
29+
set => SetValue(TitleMarginProperty, (Thickness) value);
30+
}
31+
32+
#endregion
33+
1034
#region Mica
1135

1236
public static readonly DependencyProperty SystemBackdropTypeProperty = DependencyProperty.Register(

src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</interactivity:Interaction.Triggers>
7979
<Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16"/>
8080
</Button>
81-
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
81+
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="{TemplateBinding TitleAlignment}" Margin="{TemplateBinding TitleMargin}">
8282
<TextBlock.Visibility>
8383
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
8484
<MultiBinding.Bindings>
@@ -202,7 +202,7 @@
202202
</interactivity:Interaction.Triggers>
203203
<Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16"/>
204204
</Button>
205-
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
205+
<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="{TemplateBinding TitleAlignment}" Margin="{TemplateBinding TitleMargin}">
206206
<TextBlock.Visibility>
207207
<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
208208
<MultiBinding.Bindings>

0 commit comments

Comments
 (0)