Skip to content

Commit d6caf08

Browse files
committed
fix: 修复对话框未继承样式
1 parent bf9753f commit d6caf08

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/DotVast.HashTool.WinUI/Views/Dialogs/GithubUpdateDialog.xaml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
x:Class="DotVast.HashTool.WinUI.Views.Dialogs.GithubUpdateDialog"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:ctControls="using:CommunityToolkit.WinUI.UI.Controls">
5+
xmlns:ct="using:CommunityToolkit.WinUI.UI.Controls"
6+
xmlns:local="using:DotVast.HashTool.WinUI.Views.Dialogs">
7+
8+
<ContentDialog.Resources>
9+
<Style BasedOn="{StaticResource DefaultContentDialogStyle}" TargetType="local:GithubUpdateDialog" />
10+
</ContentDialog.Resources>
611

712
<ContentDialog.Title>
813
<StackPanel Orientation="Horizontal" Spacing="16">
@@ -19,7 +24,7 @@
1924
MaxHeight="320"
2025
HorizontalScrollMode="Disabled"
2126
VerticalScrollBarVisibility="Hidden">
22-
<ctControls:MarkdownTextBlock
27+
<ct:MarkdownTextBlock
2328
x:Name="MarkdownText"
2429
Background="Transparent"
2530
FontSize="14"

src/DotVast.HashTool.WinUI/Views/Dialogs/HashResultConfigDialog.xaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
21
<ContentDialog
32
x:Class="DotVast.HashTool.WinUI.Views.Dialogs.HashResultConfigDialog"
43
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
54
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
65
xmlns:enums="using:DotVast.HashTool.WinUI.Enums"
6+
xmlns:local="using:DotVast.HashTool.WinUI.Views.Dialogs"
77
xmlns:models="using:DotVast.HashTool.WinUI.Models">
88

9+
<ContentControl.Resources>
10+
<Style BasedOn="{StaticResource DefaultContentDialogStyle}" TargetType="local:HashResultConfigDialog" />
11+
</ContentControl.Resources>
12+
913
<ScrollViewer
1014
Width="280"
1115
Padding="8,0,16,0"

0 commit comments

Comments
 (0)