Merge branch 'develop'

jamsoft · Mar 1, 2023 · 291217c · 291217c
2 parents 40dbd59 + 98f564e
commit 291217c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -16,16 +16,16 @@ https://jamsoft.github.io/JamSoft.AvaloniaUI.Dialogs/
 
 ## Installation
 ```shell
-dotnet add package JamSoft.AvaloniaUI.Dialogs --version 1.1.0
+dotnet add package JamSoft.AvaloniaUI.Dialogs --version 1.1.1
 ```
 ```shell
-Install-Package JamSoft.AvaloniaUI.Dialogs -Version 1.1.0
+Install-Package JamSoft.AvaloniaUI.Dialogs -Version 1.1.1
 ```
 ```xml
-<PackageReference Include="JamSoft.AvaloniaUI.Dialogs" Version="1.1.0" />
+<PackageReference Include="JamSoft.AvaloniaUI.Dialogs" Version="1.1.1" />
 ```
 ```shell
-paket add JamSoft.AvaloniaUI.Dialogs --version 1.1.0
+paket add JamSoft.AvaloniaUI.Dialogs --version 1.1.1
 ```
 ## Import Styles
 ### All Defaults

diff --git a/src/JamSoft.AvaloniaUI.Dialogs.Sample/Views/MyWizardView.axaml b/src/JamSoft.AvaloniaUI.Dialogs.Sample/Views/MyWizardView.axaml
@@ -6,7 +6,8 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="JamSoft.AvaloniaUI.Dialogs.Sample.Views.MyWizardView">
 
-    <controls:Wizard ButtonPlacement="Bottom" ProgressPlacement="Bottom">
+    <controls:Wizard ButtonPlacement="Bottom" 
+                     ProgressPlacement="Top">
 
         <controls:WizardStep Header="Page 1" StepComplete="{Binding WizardStepOneComplete}">
             <controls:WizardStep.Content>

diff --git a/src/JamSoft.AvaloniaUI.Dialogs/JamSoft.AvaloniaUI.Dialogs.csproj b/src/JamSoft.AvaloniaUI.Dialogs/JamSoft.AvaloniaUI.Dialogs.csproj
@@ -21,13 +21,13 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>JamSoft.AssemblyKeyFile.snk</AssemblyOriginatorKeyFile>
         <PublicSign>true</PublicSign>
-        <AssemblyVersion>1.1.0.0</AssemblyVersion>
-        <FileVersion>1.1.0.0</FileVersion>
+        <AssemblyVersion>1.1.1.0</AssemblyVersion>
+        <FileVersion>1.1.1.0</FileVersion>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <InformationalVersion>1.1.0.0-rel</InformationalVersion>
+        <InformationalVersion>1.1.1.0-rel</InformationalVersion>
         <EnablePackageValidation>true</EnablePackageValidation>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        <Version>1.1.0</Version>
+        <Version>1.1.1</Version>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">      

diff --git a/src/JamSoft.AvaloniaUI.Dialogs/Themes/WizardStyle.axaml b/src/JamSoft.AvaloniaUI.Dialogs/Themes/WizardStyle.axaml
@@ -19,7 +19,7 @@
   </Design.PreviewWith>
 
   <Styles.Resources>
-    <Thickness x:Key="TabControlTopPlacementItemMargin">0 0 0 2</Thickness>
+    <Thickness x:Key="WizardControlTopPlacementItemMargin">0 0 0 2</Thickness>
   </Styles.Resources>
 
   <Style Selector="controls|Wizard">
@@ -59,24 +59,24 @@
     </Setter>
   </Style>
 
-  <Style Selector="controls|Wizard[ButtonPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+  <Style Selector="controls|Wizard[ButtonPlacement=Left] /template/ ItemsPresenter#PART_ButtonsPresenter > WrapPanel">
     <Setter Property="Orientation" Value="Vertical" />
   </Style>
-  <Style Selector="controls|Wizard[ButtonPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+  <Style Selector="controls|Wizard[ButtonPlacement=Right] /template/ ItemsPresenter#PART_ButtonsPresenter > WrapPanel">
     <Setter Property="Orientation" Value="Vertical" />
   </Style>
-  <Style Selector="controls|Wizard[ButtonPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-    <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
+  <Style Selector="controls|Wizard[ButtonPlacement=Top] /template/ ItemsPresenter#PART_ButtonsPresenter">
+    <Setter Property="Margin" Value="{DynamicResource WizardControlTopPlacementItemMargin}" />
   </Style>
 
-  <Style Selector="controls|Wizard[ProgressPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+  <Style Selector="controls|Wizard[ProgressPlacement=Left] /template/ ItemsPresenter#PART_StepsPresenter > WrapPanel">
     <Setter Property="Orientation" Value="Vertical" />
   </Style>
-  <Style Selector="controls|Wizard[ProgressPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+  <Style Selector="controls|Wizard[ProgressPlacement=Right] /template/ ItemsPresenter#PART_StepsPresenter > WrapPanel">
     <Setter Property="Orientation" Value="Vertical" />
   </Style>
-  <Style Selector="controls|Wizard[ProgressPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-    <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
+  <Style Selector="controls|Wizard[ProgressPlacement=Top] /template/ ItemsPresenter#PART_StepsPresenter">
+    <Setter Property="Margin" Value="{DynamicResource WizardControlTopPlacementItemMargin}" />
   </Style>
 
 </Styles>