Merge branch 'master' into develop

fluentribbon · Apr 4, 2020 · 7ce10de · 7ce10de
2 parents c535f5e + 5de720d
commit 7ce10de
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,6 @@
 # Changelog for Fluent.Ribbon
 
-## 7.1.0 (preview)
+## 7.1.0
 - ### Bug fixes
   - [#745](../../issues/745) - SplitButton.IsEnabled based on Command.CanExecute?
   - [#755](../../issues/755) - ComboBox.Height fixed at 22  

diff --git a/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj b/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Fluent.Ribbon\Fluent.Ribbon.csproj" />
 
-    <PackageReference Include="MahApps.Metro" version="2.0.0-alpha*" />
+    <PackageReference Include="MahApps.Metro" version="2.0.0-alpha0660" />
     <!-- Costura does not work with .net core 3.0 as of 4.0 -->
     <!-- <PackageReference Include="Costura.Fody" version="4.*" PrivateAssets="All" Condition="'$(TargetFramework)' != 'netcoreapp3.0'" /> -->
   </ItemGroup>

diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml
@@ -3207,7 +3207,8 @@ Pellentesque nec dolor sed lacus tristique rutrum sed vitae urna. Sed eu pharetr
                                    Canvas.Top="-3"
                                    Foreground="Red"
                                    FontSize="0.2"
-                                   Padding="0">
+                                   Padding="0"
+                                   Panel.ZIndex="1">
                                 Rectangle and Ellipse should be between green lines and Text 1 to 3 shouldn't overlap
                             </Label>
                             <Label Canvas.Left="-2.2"

diff --git a/Fluent.Ribbon/Controls/Backstage.cs b/Fluent.Ribbon/Controls/Backstage.cs
@@ -437,7 +437,7 @@ private void ShowAdorner()
             {
                 storyboard = storyboard.Clone();
 
-                storyboard.CurrentStateInvalidated += HanldeStoryboardCurrentStateInvalidated;
+                storyboard.CurrentStateInvalidated += HandleStoryboardCurrentStateInvalidated;
                 storyboard.Completed += HandleStoryboardOnCompleted;
 
                 storyboard.Begin(this.adorner);
@@ -447,10 +447,10 @@ private void ShowAdorner()
                 this.adorner.Visibility = Visibility.Visible;
             }
 
-            void HanldeStoryboardCurrentStateInvalidated(object sender, EventArgs e)
+            void HandleStoryboardCurrentStateInvalidated(object sender, EventArgs e)
             {
                 this.adorner.Visibility = Visibility.Visible;
-                storyboard.CurrentStateInvalidated -= HanldeStoryboardCurrentStateInvalidated;
+                storyboard.CurrentStateInvalidated -= HandleStoryboardCurrentStateInvalidated;
             }
 
             void HandleStoryboardOnCompleted(object sender, EventArgs args)

diff --git a/Fluent.Ribbon/Themes/Controls/TwoLineLabel.xaml b/Fluent.Ribbon/Themes/Controls/TwoLineLabel.xaml
@@ -6,6 +6,7 @@
         <Setter Property="Template"
                 Value="{DynamicResource TwoLineLabelControlTemplate}" />
     </Style>
+
     <ControlTemplate x:Key="TwoLineLabelControlTemplate"
                      TargetType="{x:Type Fluent:TwoLineLabel}">
         <StackPanel x:Name="stackPanel"
@@ -88,14 +89,14 @@
                      Value="">
                 <Setter Property="Visibility"
                         TargetName="PART_TextRun2"
-                        Value="Collapsed" />
+                        Value="Hidden" />
             </Trigger>
             <Trigger Property="Text"
                      SourceName="PART_TextRun2"
                      Value="{x:Null}">
                 <Setter Property="Visibility"
                         TargetName="PART_TextRun2"
-                        Value="Collapsed" />
+                        Value="Hidden" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,7 +1,7 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
 mode: ContinuousDeployment
-next-version: 7.0.0
+next-version: 7.1.0
 branches:
   master:
     mode: ContinuousDeployment

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,6 +4,7 @@ branches:
   only:
     - develop
     - master
+    - /v\d*\.\d*\.\d*/
 
 image: Visual Studio 2019
 configuration: Release