#87 binding styles in Custom buttons

AvaloniaCommunity · Dec 12, 2021 · 13e4d0f · 13e4d0f
1 parent 05727ea
commit 13e4d0f
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 154 deletions.
diff --git a/src/MessageBox.Avalonia.Example/App.xaml b/src/MessageBox.Avalonia.Example/App.xaml
@@ -2,10 +2,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="MessageBox.Avalonia.Example.App">
     <Application.Styles>
-      <!--<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentLight.xaml" />
+        <Style Selector="Button.default">
+            <Setter Property="Background" Value="Red" />
+        </Style>
+        <!--<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentLight.xaml" />
       <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml" />-->
-      
-      <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-      <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+
+        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
+        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml" />
     </Application.Styles>
-</Application>
+</Application>
diff --git a/src/MessageBox.Avalonia.Example/MainWindow.xaml.cs b/src/MessageBox.Avalonia.Example/MainWindow.xaml.cs
@@ -74,7 +74,7 @@ public async void MsBoxCustom_Click(object sender, RoutedEventArgs e)
                     ContentTitle = "title", ContentMessage = "message", FontFamily = "Microsoft YaHei,Simsun",
                     Icon = MessageBoxAvaloniaEnums.Icon.Error, WindowIcon = null,
                     ButtonDefinitions = new[]
-                        { new ButtonDefinition { Name = "确定", Type = MessageBoxAvaloniaEnums.ButtonType.Colored }, },
+                        { new ButtonDefinition { Name = "确定", IsDefault = true }, },
                     WindowStartupLocation = WindowStartupLocation.CenterOwner,
                 });
             await messageBoxCustomWindow.ShowDialog(this);
@@ -115,7 +115,7 @@ public async void MsBoxInput_Click(object sender, RoutedEventArgs e)
                     {
                         new ButtonDefinition { Name = "Cancel", IsCancel = true },
                         new ButtonDefinition
-                            { Name = "Confirm", Type = MessageBoxAvaloniaEnums.ButtonType.Colored, IsDefault = true }
+                            { Name = "Confirm", IsDefault = true }
                     },
                     WindowStartupLocation = WindowStartupLocation.CenterOwner,
                     Width = 500,
@@ -140,7 +140,7 @@ private async void MsBoxCustomImage_Click(object sender, RoutedEventArgs e)
                     {
                         new ButtonDefinition { Name = "My", IsCancel = true },
                         new ButtonDefinition
-                            { Name = "Buttons", Type = MessageBoxAvaloniaEnums.ButtonType.Colored, IsDefault = true }
+                            { Name = "Buttons", IsDefault = true }
                     },
                     WindowStartupLocation = WindowStartupLocation.CenterOwner,
                     WindowIcon = new WindowIcon("./icon-rider.png"),

diff --git a/src/MessageBox.Avalonia/MessageBox.Avalonia.csproj b/src/MessageBox.Avalonia/MessageBox.Avalonia.csproj
@@ -20,13 +20,22 @@
         <AvaloniaResource Include="**\*.xaml">
             <SubType>Designer</SubType>
         </AvaloniaResource>
-        <AvaloniaResource Include="Assets\*" />
+        <AvaloniaResource Include="Assets\*"/>
         <AvaloniaResource Update="Views\MsBoxInputWindow.xaml">
-          <SubType>Designer</SubType>
+            <SubType>Designer</SubType>
         </AvaloniaResource>
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="0.10.8" />
+        <PackageReference Include="Avalonia" Version="0.10.8"/>
+    </ItemGroup>
+    <ItemGroup>
+        <UpToDateCheckInput Remove="Styles\Dark\Dark.xaml"/>
+        <UpToDateCheckInput Remove="Styles\MacOs\MacOs.xaml"/>
+        <UpToDateCheckInput Remove="Styles\Mint\Mint.xaml"/>
+        <UpToDateCheckInput Remove="Styles\RoundButtons\RoundButtons.xaml"/>
+        <UpToDateCheckInput Remove="Styles\Ubuntu\Ubuntu.xaml"/>
+        <UpToDateCheckInput Remove="Styles\Windows\Windows.xaml"/>
+        <UpToDateCheckInput Remove="Styles\HyperlinkStyle.axaml"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/MessageBox.Avalonia/Models/ButtonDefinition.cs b/src/MessageBox.Avalonia/Models/ButtonDefinition.cs
@@ -1,27 +1,12 @@
-using MessageBox.Avalonia.Enums;
-
 namespace MessageBox.Avalonia.Models
 {
     public class ButtonDefinition
     {
-        /// <summary>
-        /// Button type
-        /// </summary>
-        private ButtonType _type = ButtonType.Default;
-
         /// <summary>
         /// Text in button
         /// </summary>
         public string Name { get; set; } = "OK";
 
-
-        public ButtonType Type
-        {
-            set { _type = value; }
-        }
-
-        public string TypeName => _type.ToString();
-
         /// <summary>
         /// When true and if ENTER key is pressed, the button will be called
         /// </summary>

diff --git a/src/MessageBox.Avalonia/Styles/Dark/Dark.xaml b/src/MessageBox.Avalonia/Styles/Dark/Dark.xaml
diff --git a/src/MessageBox.Avalonia/Styles/HyperlinkStyle.axaml b/src/MessageBox.Avalonia/Styles/HyperlinkStyle.axaml
diff --git a/src/MessageBox.Avalonia/Styles/MacOs/MacOs.xaml b/src/MessageBox.Avalonia/Styles/MacOs/MacOs.xaml
diff --git a/src/MessageBox.Avalonia/Styles/Mint/Mint.xaml b/src/MessageBox.Avalonia/Styles/Mint/Mint.xaml
diff --git a/src/MessageBox.Avalonia/Styles/RoundButtons/RoundButtons.xaml b/src/MessageBox.Avalonia/Styles/RoundButtons/RoundButtons.xaml
diff --git a/src/MessageBox.Avalonia/Styles/Ubuntu/Ubuntu.xaml b/src/MessageBox.Avalonia/Styles/Ubuntu/Ubuntu.xaml
diff --git a/src/MessageBox.Avalonia/Styles/Windows/Windows.xaml b/src/MessageBox.Avalonia/Styles/Windows/Windows.xaml
diff --git a/src/MessageBox.Avalonia/ViewModels/MsBoxInputViewModel.cs b/src/MessageBox.Avalonia/ViewModels/MsBoxInputViewModel.cs
@@ -34,7 +34,7 @@ public MsBoxInputViewModel(MessageBoxInputParams @params, MsBoxInputWindow msBox
             {
                 ButtonDefinitions = new[]
                 {
-                    new ButtonDefinition { Name = "Confirm", IsDefault = true, Type = ButtonType.Colored },
+                    new ButtonDefinition { Name = "Confirm", IsDefault = true },
                     new ButtonDefinition { Name = "Cancel", IsCancel = true }
                 };
             }

diff --git a/src/MessageBox.Avalonia/Views/MsBoxCustomWindow.xaml b/src/MessageBox.Avalonia/Views/MsBoxCustomWindow.xaml
@@ -88,7 +88,9 @@
             <ItemsPresenter.ItemTemplate>
                 <DataTemplate>
                     <Button Name="Btn"
-                            Classes="button"
+                            Classes.buttons = "true"
+                            Classes.default = "{Binding IsDefault}"
+                            Classes.cancel = "{Binding IsCancel}"
                             Tag="{Binding TypeName}"
                             Command="{Binding DataContext.ButtonClick, RelativeSource={RelativeSource AncestorType=Window, AncestorLevel=1}}"
                             CommandParameter="{Binding #Btn.Content}"