Merge pull request #1793 from MahApps/1755-fix-preservetext-in-dialogs

fix preservetext for buttons in dialogs

Author: punker76

MahApps.Metro/Controls/Dialogs/InputDialog.cs

@@ -117,7 +117,7 @@ private void Dialog_Loaded(object sender, RoutedEventArgs e)
             switch (this.DialogSettings.ColorScheme)
             {
                 case MetroDialogColorScheme.Accented:
-                    this.PART_NegativeButton.Style = this.FindResource("HighlightedSquareButtonStyle") as Style;
+                    this.PART_NegativeButton.Style = this.FindResource("AccentedDialogHighlightedSquareButton") as Style;
                     PART_TextBox.SetResourceReference(ForegroundProperty, "BlackColorBrush");
                     break;
             }

MahApps.Metro/Controls/Dialogs/LoginDialog.cs

@@ -158,7 +158,7 @@ private void Dialog_Loaded(object sender, RoutedEventArgs e)
             switch (this.DialogSettings.ColorScheme)
             {
                 case MetroDialogColorScheme.Accented:
-                    this.PART_NegativeButton.Style = this.FindResource("HighlightedSquareButtonStyle") as Style;
+                    this.PART_NegativeButton.Style = this.FindResource("AccentedDialogHighlightedSquareButton") as Style;
                     PART_TextBox.SetResourceReference(ForegroundProperty, "BlackColorBrush");
                     PART_TextBox2.SetResourceReference(ForegroundProperty, "BlackColorBrush");
                     break;

MahApps.Metro/Controls/Dialogs/MessageDialog.cs

@@ -203,9 +203,9 @@ private static void SetButtonState(MessageDialog md)
             switch (md.DialogSettings.ColorScheme)
             {
                 case MetroDialogColorScheme.Accented:
-                    md.PART_NegativeButton.Style = md.FindResource("HighlightedSquareButtonStyle") as Style;
-                    md.PART_FirstAuxiliaryButton.Style = md.FindResource("HighlightedSquareButtonStyle") as Style;
-                    md.PART_SecondAuxiliaryButton.Style = md.FindResource("HighlightedSquareButtonStyle") as Style;
+                    md.PART_NegativeButton.Style = md.FindResource("AccentedDialogHighlightedSquareButton") as Style;
+                    md.PART_FirstAuxiliaryButton.Style = md.FindResource("AccentedDialogHighlightedSquareButton") as Style;
+                    md.PART_SecondAuxiliaryButton.Style = md.FindResource("AccentedDialogHighlightedSquareButton") as Style;
                     break;
             }
         }

MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml

@@ -10,14 +10,21 @@
 
     <Style BasedOn="{StaticResource SquareButtonStyle}"
            TargetType="{x:Type Button}">
-        <Setter Property="controls:ButtonHelper.PreserveTextCase" 
+        <Setter Property="controls:ButtonHelper.PreserveTextCase"
                 Value="True" />
     </Style>
 
     <Style x:Key="AccentedDialogSquareButton"
            BasedOn="{StaticResource AccentedSquareButtonStyle}"
            TargetType="{x:Type Button}">
-        <Setter Property="controls:ButtonHelper.PreserveTextCase" 
+        <Setter Property="controls:ButtonHelper.PreserveTextCase"
+                Value="True" />
+    </Style>
+
+    <Style x:Key="AccentedDialogHighlightedSquareButton"
+           BasedOn="{StaticResource HighlightedSquareButtonStyle}"
+           TargetType="{x:Type Button}">
+        <Setter Property="controls:ButtonHelper.PreserveTextCase"
                 Value="True" />
     </Style>