- Less generic name for button styles

josh2112 · josh2112 · commit 017eebef1bac · 2023-09-13T16:25:13.000-04:00
- Allow the user to override the built-in button styles
diff --git a/MaterialDesign.DialogPlus.Examples/App.xaml b/MaterialDesign.DialogPlus.Examples/App.xaml
@@ -8,7 +8,15 @@
             <ResourceDictionary.MergedDictionaries>
                 <mdix:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />
+
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesign.DialogPlus;component/Themes/Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
+
+            <Style x:Key="MaterialDesign.DialogPlus.NegativeButton" TargetType="Button" BasedOn="{StaticResource MaterialDesignRaisedButton}">
+                <Setter Property="Background" Value="Salmon"/>
+                <Setter Property="BorderBrush" Value="Salmon"/>
+            </Style>
+            
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/MaterialDesign.DialogPlus.Examples/FormInputDialog.xaml b/MaterialDesign.DialogPlus.Examples/FormInputDialog.xaml
@@ -3,14 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              UseLayoutRounding="True">
 
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesign.DialogPlus;component/ButtonStyles.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
     <StackPanel DataContext="{Binding RelativeSource={RelativeSource AncestorType=UserControl}}" Margin="20">
         <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap"
                    Text="Info needed" Margin="0,0,0,10"/>
@@ -34,14 +26,13 @@
 
             <TextBlock Grid.Row="2" Style="{StaticResource MaterialDesignTextBlock}" Text="Email" VerticalAlignment="Center"/>
             <TextBox Grid.Row="2" Grid.Column="1" Margin="10,0,0,0" Text="{Binding Email}" VerticalAlignment="Center"/>
-        
         </Grid>
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,20,0,0">
-            <Button Content="Cancel" Style="{StaticResource DialogButtonStyle}" IsCancel="True"
+            <Button Content="Cancel" Style="{StaticResource MaterialDesign.DialogPlus.NeutralButton}" IsCancel="True"
                     Command="{Binding CancelCommand}"/>
-            <Button Content="OK" Style="{StaticResource PositiveButtonStyle}" IsDefault="True"
-                    Command="{Binding SubmitCommand}"/>
+            <Button Content="OK" Style="{StaticResource MaterialDesign.DialogPlus.PositiveButton}"
+                    Margin="10,0,0,0" IsDefault="True" Command="{Binding SubmitCommand}"/>
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/MaterialDesign.DialogPlus/ButtonStyles.xaml b/MaterialDesign.DialogPlus/ButtonStyles.xaml
diff --git a/MaterialDesign.DialogPlus/Dialogs/Dialog.xaml b/MaterialDesign.DialogPlus/Dialogs/Dialog.xaml
@@ -3,14 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              UseLayoutRounding="True">
 
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesign.DialogPlus;component/ButtonStyles.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
     <StackPanel DataContext="{Binding RelativeSource={RelativeSource AncestorType=UserControl}}" Margin="20">
         <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap" Text="{Binding Title}" Margin="0,0,0,10"/>
         <TextBlock Style="{StaticResource MaterialDesignTextBlock}" TextWrapping="Wrap" Text="{Binding Message}"/>
@@ -23,16 +15,16 @@
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <Button x:Name="innerButton" Click="Button_Click" Content="{Binding Text}"/>
+                    <Button x:Name="innerButton" Click="Button_Click" Content="{Binding Text}" Margin="10,0,0,0"/>
                     <DataTemplate.Triggers>
                         <DataTrigger Binding="{Binding Connotation}" Value="Positive">
-                            <Setter TargetName="innerButton" Property="Style" Value="{StaticResource PositiveButtonStyle}"/>
+                            <Setter TargetName="innerButton" Property="Style" Value="{StaticResource MaterialDesign.DialogPlus.PositiveButton}"/>
                         </DataTrigger>
                         <DataTrigger Binding="{Binding Connotation}" Value="Negative">
-                            <Setter TargetName="innerButton" Property="Style" Value="{StaticResource NegativeButtonStyle}"/>
+                            <Setter TargetName="innerButton" Property="Style" Value="{StaticResource MaterialDesign.DialogPlus.NegativeButton}"/>
                         </DataTrigger>
                         <DataTrigger Binding="{Binding Connotation}" Value="Neutral">
-                            <Setter TargetName="innerButton" Property="Style" Value="{StaticResource DialogButtonStyle}"/>
+                            <Setter TargetName="innerButton" Property="Style" Value="{StaticResource MaterialDesign.DialogPlus.NeutralButton}"/>
                         </DataTrigger>
                         <DataTrigger Binding="{Binding IsDefault}" Value="True">
                             <Setter TargetName="innerButton" Property="IsDefault" Value="True"/>
diff --git a/MaterialDesign.DialogPlus/MaterialDesign.DialogPlus.csproj b/MaterialDesign.DialogPlus/MaterialDesign.DialogPlus.csproj
@@ -4,7 +4,7 @@
 	<TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
 	<UseWPF>true</UseWPF>
     <Title>DialogPlus for MaterialDesignInXaml</Title>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <Authors>Joshua Foster</Authors>
     <Company>Josh2112 Apps</Company>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -15,6 +15,7 @@
     <Description>A small package to make working with MaterialDesignInXaml dialogs a bit easier.</Description>
     <PackageTags>materialdesigninxaml;materialdesignthemes;materialdesigncolors;dialoghost;dialog</PackageTags>
     <PackageReleaseNotes>Initial release</PackageReleaseNotes>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MaterialDesign.DialogPlus/Themes/Defaults.xaml b/MaterialDesign.DialogPlus/Themes/Defaults.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="MaterialDesign.DialogPlus.NeutralButton" TargetType="Button" BasedOn="{StaticResource MaterialDesignOutlinedButton}"/>
+
+    <Style x:Key="MaterialDesign.DialogPlus.PositiveButton" TargetType="Button" BasedOn="{StaticResource MaterialDesignRaisedButton}"/>
+
+    <Style x:Key="MaterialDesign.DialogPlus.NegativeButton" TargetType="Button" BasedOn="{StaticResource MaterialDesignOutlinedButton}">
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignValidationErrorBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignValidationErrorBrush}"/>
+    </Style>
+</ResourceDictionary>
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ MaterialDesignInXaml has great support for dialogs, but it's not clear how to us
  - `Dialog`: a generic dialog imlpementation with title, message and configurable buttons which should suit 99% of your dialog use-cases.
  - `ButtonDef`: A simple model for dialog buttons. Includes a label, a "connotation" (Positive, Negative, or Neutral) which determines how the button is drawn, and a couple properties to make the button activate on [Enter] or [Esc].
 
-### Basic dialog
+## Basic dialog
 
 Here's the code for the above screenshot:
 ```
@@ -22,12 +22,36 @@ ButtonDef result = await this.ShowDialogForResultAsync( new Dialogs.Dialog( "Que
     ButtonDef.Positive( "Save it", isDefault: true ) ) );
 ```
 
-Our example dialog in this case implements `IHasDialog<ButtonDef>`, meaning the result will be one of the three buttons you passed in. But your dialog can return anything you like.
+It uses the built-in, generic `Dialog` class to show a title, message and three buttons. The `Dialog` class implements `IHasDialog<ButtonDef>`, meaning the result will be one of the buttons you passed in. If you write your own dialog, you can return anything you like.
 
-### Custom dialog
+The built-in dialog requires a couple custom styles. If you want to use it, make sure you put the following in your `App.xaml` to import them:
+```
+<ResourceDictionary Source="pack://application:,,,/MaterialDesign.DialogPlus;component/Themes/Defaults.xaml" />
+```
+
+### Basic dialog: Button connotations and restyling buttons
+
+When defining buttons for the built-in dialog, you have 3 `Connotations`:
+ - `Connotations.Neutral`: Used for an action with no side effects, like "Cancel" or "Continue". The style for this is `MaterialDesign.DialogPlus.NeutralButton` which is an outlined button with the primary theme color.
+ - `Connotations.Positive`: Used for positive actions, such as acknowledging a message or saving a file. The style for this is `MaterialDesign.DialogPlus.PositiveButton` which is a raised button with the primary theme color.
+ - `Connotations.Negative`: Used for destructive actions, such as discarding changes or deleting a message. The style for this is `MaterialDesign.DialogPlus.NegativeButton` which is an outlined button with the outline and text color set to `MaterialDesignValidationErrorBrush` which is reddish in color.
+
+You can change how any of these buttons are rendered in the built-in `Dialog` by defining your own style with the same name. Just put this in your `App.xaml` after you import the default button styles. For example:
+```
+<Style x:Key="MaterialDesign.DialogPlus.NegativeButton" TargetType="Button" BasedOn="{StaticResource MaterialDesignRaisedButton}">
+    <Setter Property="Background" Value="Salmon"/>
+    <Setter Property="BorderBrush" Value="Salmon"/>
+</Style>
+```
+
+Now buttons created with `ButtonDef.Negative()` will have a salmon-colored border and background.
+
+## Custom dialog
+
+The built-in `Dialog` class should suit 99% of use cases. But you can build a completely custom dialog if you like.
 
-1. Create a `UserControl`. Design the dialog XAML however you like.
-2. Make your dialog implement `IHasDialogResult<T>` with the desired result type. For example, if your dialog is a text input, you might implement `IHasDialogResult<string>`.
+1. Create a `UserControl`. Write the dialog XAML and the code-behind however you like.
+2. Make the `UserControl` implement `IHasDialogResult<T>` with the desired result type. For example, if your dialog is a text input, you might implement `IHasDialogResult<string>`.
 3. To close your dialog, call `Result.Set` with the dialog result (for the text input example, this might be the user-input text, or `null` if the user canceled the dialog).
 
 Check out the [main file](MaterialDesign.DialogPlus.Examples/MainWindow.xaml.cs) of the example project for the following examples:
