Skip to content

Commit 46efaa1

Browse files
committed
Adjust MahApps Dialog stuff
1 parent c6ec165 commit 46efaa1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

MahMaterialDragablzMashUp/DialogsViewModel.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ private void InputDialog()
3737
var metroDialogSettings = new MetroDialogSettings
3838
{
3939
CustomResourceDictionary = DialogDictionary,
40-
NegativeButtonText = "CANCEL",
41-
SuppressDefaultResources = true
40+
NegativeButtonText = "CANCEL"
4241
};
4342

4443
DialogCoordinator.Instance.ShowInputAsync(this, "MahApps Dialog", "Using Material Design Themes", metroDialogSettings);
@@ -49,8 +48,7 @@ private async void ProgressDialog()
4948
var metroDialogSettings = new MetroDialogSettings
5049
{
5150
CustomResourceDictionary = DialogDictionary,
52-
NegativeButtonText = "CANCEL",
53-
SuppressDefaultResources = true
51+
NegativeButtonText = "CANCEL"
5452
};
5553

5654
var controller = await DialogCoordinator.Instance.ShowProgressAsync(this, "MahApps Dialog", "Using Material Design Themes (WORK IN PROGRESS)", true, metroDialogSettings);

MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.Dialogs.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77

88
<Style BasedOn="{StaticResource MaterialDesignFlatButton}"
99
TargetType="{x:Type Button}" />
10+
<Style BasedOn="{StaticResource MaterialDesignFlatButton}"
11+
TargetType="{x:Type ButtonBase}" />
1012

1113
<Style x:Key="AccentedDialogSquareButton"
1214
BasedOn="{StaticResource MaterialDesignFlatButton}"
13-
TargetType="{x:Type Button}" />
15+
TargetType="{x:Type ButtonBase}" />
1416

1517
<Style x:Key="AccentedDialogHighlightedSquareButton"
1618
BasedOn="{StaticResource MaterialDesignFlatButton}"
17-
TargetType="{x:Type Button}"/>
19+
TargetType="{x:Type ButtonBase}"/>
1820

1921
</ResourceDictionary>

0 commit comments

Comments
 (0)