Fixes #194 by switching every PopupAnimation to the according ones fr…

…om SystemParameters and adding an option IsOpenAnimationEnabled to Backstage. IsOpenAnimationEnabled defaults to the value of SystemParameters.ClientAreaAnimation.
fluentribbon · Dec 21, 2015 · 90efb7e · 90efb7e
1 parent e9573e2
commit 90efb7e
Show file tree

Hide file tree

Showing 35 changed files with 92 additions and 58 deletions.
diff --git a/Fluent.Ribbon/Controls/Backstage.cs b/Fluent.Ribbon/Controls/Backstage.cs
@@ -88,6 +88,21 @@ public bool HideContextTabsOnOpen
             set { this.SetValue(HideContextTabsOnOpenProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets wether opening or closing should be animated.
+        /// </summary>
+        public bool IsOpenAnimationEnabled
+        {
+            get { return (bool)this.GetValue(IsOpenAnimationEnabledProperty); }
+            set { this.SetValue(IsOpenAnimationEnabledProperty, value); }
+        }
+
+        /// <summary>
+        /// Using a DependencyProperty as the backing store for IsOpenAnimationEnabled.  This enables animation, styling, binding, etc...
+        /// </summary>        
+        public static readonly DependencyProperty IsOpenAnimationEnabledProperty =
+            DependencyProperty.Register("IsOpenAnimationEnabled", typeof(bool), typeof(Backstage), new PropertyMetadata(true));
+
         /// <summary>
         /// Using a DependencyProperty as the backing store for HideContextTabsOnOpen.  
         /// This enables animation, styling, binding, etc...

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/ApplicationMenuItem.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/ApplicationMenuItem.xaml
@@ -277,7 +277,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,0,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -654,7 +654,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -1082,7 +1082,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,0,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2"
@@ -1439,7 +1439,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,0,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2"

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/BackstageControls.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/BackstageControls.xaml
@@ -423,7 +423,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -874,7 +874,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/ComboBox.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/ComboBox.xaml
@@ -236,7 +236,7 @@
                                    IsOpen="{TemplateBinding IsDropDownOpen}"
                                    AllowsTransparency="True"
                                    Focusable="False"
-                                   PopupAnimation="Fade"
+                                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                                    Margin="0,0,-4,0"
                                    VerticalAlignment="Top"
                                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/DropDownButton.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/DropDownButton.xaml
@@ -104,7 +104,7 @@
                    Placement="Bottom"
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/Gallery.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/Gallery.xaml
@@ -32,7 +32,7 @@
                                IsOpen="{TemplateBinding IsDropDownOpen}"
                                AllowsTransparency="True"
                                Focusable="False"
-                               PopupAnimation="Fade"
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                                Margin="0,0,-4,0"
                                VerticalAlignment="Top"
                                Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/InRibbonGallery.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/InRibbonGallery.xaml
@@ -476,7 +476,7 @@
                                        IsOpen="{TemplateBinding IsDropDownOpen}"
                                        AllowsTransparency="True"
                                        Focusable="False"
-                                       PopupAnimation="Fade"
+                                       PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                                        Margin="0,0,-4,0"
                                        VerticalAlignment="Top"
                                        Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/MenuItem.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/MenuItem.xaml
@@ -405,7 +405,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -717,7 +717,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/QuickAccessToolbar.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/QuickAccessToolbar.xaml
@@ -72,7 +72,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/RibbonGroupBox.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/RibbonGroupBox.xaml
@@ -118,7 +118,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/RibbonTabControl.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/RibbonTabControl.xaml
@@ -508,7 +508,7 @@
                                Placement="Custom"
                                StaysOpen="True"
                                AllowsTransparency="True"
-                               PopupAnimation="Fade"
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                                VerticalOffset="-1"
                                IsOpen="{TemplateBinding IsDropDownOpen}"
                                HorizontalOffset="0">

diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/SplitButton.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/SplitButton.xaml
@@ -136,7 +136,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/Backstage.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/Backstage.xaml
@@ -83,5 +83,14 @@
                 Value="0:0:0.2" />
         <Setter Property="HideContextTabsOnOpen"
                 Value="True" />
+        <Setter Property="IsOpenAnimationEnabled"
+                Value="{DynamicResource {x:Static SystemParameters.ClientAreaAnimationKey}}" />        
+        <Style.Triggers>
+            <Trigger Property="IsOpenAnimationEnabled"
+                     Value="False">
+                <Setter Property="HideAnimationDuration"
+                        Value="0" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 </ResourceDictionary>
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/BackstageControls.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/BackstageControls.xaml
@@ -301,7 +301,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -644,7 +644,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/BackstageTabControl.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/BackstageTabControl.xaml
@@ -245,26 +245,36 @@
             </Grid>
         </Grid>
         <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding IsOpen, RelativeSource={RelativeSource AncestorType={x:Type Fluent:Backstage}}}"
-                         Value="True">
-                <DataTrigger.EnterActions>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource AncestorType={x:Type Fluent:Backstage}}}"
+                               Value="True" />
+                    <Condition Binding="{Binding IsOpenAnimationEnabled, RelativeSource={RelativeSource AncestorType={x:Type Fluent:Backstage}}}"
+                               Value="True" />
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.EnterActions>
                     <BeginStoryboard x:Name="IsOpenBeginStoryboard"
                                      Storyboard="{StaticResource OnIsOpenTrueStoryboard}" />
-                </DataTrigger.EnterActions>
-                <DataTrigger.ExitActions>
+                </MultiDataTrigger.EnterActions>
+                <MultiDataTrigger.ExitActions>
                     <RemoveStoryboard BeginStoryboardName="IsOpenBeginStoryboard" />
-                </DataTrigger.ExitActions>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding IsOpen, RelativeSource={RelativeSource AncestorType={x:Type Fluent:Backstage}}}"
-                         Value="False">
-                <DataTrigger.EnterActions>                    
+                </MultiDataTrigger.ExitActions>
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource AncestorType={x:Type Fluent:Backstage}}}"
+                         Value="False" />
+                    <Condition Binding="{Binding IsOpenAnimationEnabled, RelativeSource={RelativeSource AncestorType={x:Type Fluent:Backstage}}}"
+                               Value="True" />                    
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.EnterActions>                    
                     <BeginStoryboard x:Name="IsClosedBeginStoryboard"
                                      Storyboard="{StaticResource OnIsOpenFalseStoryboard}" />
-                </DataTrigger.EnterActions>
-                <DataTrigger.ExitActions>
+                </MultiDataTrigger.EnterActions>
+                <MultiDataTrigger.ExitActions>
                     <RemoveStoryboard BeginStoryboardName="IsClosedBeginStoryboard" />
-                </DataTrigger.ExitActions>
-            </DataTrigger>            
+                </MultiDataTrigger.ExitActions>
+            </MultiDataTrigger>            
         </ControlTemplate.Triggers>
     </ControlTemplate>
 

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/ComboBox.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/ComboBox.xaml
@@ -202,7 +202,7 @@
                        IsOpen="{TemplateBinding IsDropDownOpen}"
                        AllowsTransparency="True"
                        Focusable="False"
-                       PopupAnimation="Slide"
+                       PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                        Margin="0,0,-4,0"
                        VerticalAlignment="Top"
                        Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
@@ -79,7 +79,7 @@
                    Placement="Bottom"
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/Gallery.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/Gallery.xaml
@@ -32,7 +32,7 @@
                                IsOpen="{TemplateBinding IsDropDownOpen}"
                                AllowsTransparency="True"
                                Focusable="False"
-                               PopupAnimation="Slide"
+                               PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                                Margin="0,0,-4,0"
                                VerticalAlignment="Top"
                                Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/InRibbonGallery.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/InRibbonGallery.xaml
@@ -409,7 +409,7 @@
                            IsOpen="{TemplateBinding IsDropDownOpen}"
                            AllowsTransparency="True"
                            Focusable="False"
-                           PopupAnimation="Slide"
+                           PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                            Margin="0,0,-4,0"
                            VerticalAlignment="Top"
                            Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/MenuItem.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/MenuItem.xaml
@@ -367,7 +367,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -650,7 +650,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/QuickAccessToolbar.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/QuickAccessToolbar.xaml
@@ -70,7 +70,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/RibbonGroupBox.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/RibbonGroupBox.xaml
@@ -118,7 +118,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/RibbonTabControl.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/RibbonTabControl.xaml
@@ -353,7 +353,7 @@
                    Placement="Custom"
                    StaysOpen="True"
                    AllowsTransparency="True"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    HorizontalOffset="0">
                 <Grid Width="Auto"

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/SplitButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/SplitButton.xaml
@@ -91,7 +91,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Slide"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">

diff --git a/Fluent.Ribbon/Themes/Windows8/Controls/ApplicationMenuItem.xaml b/Fluent.Ribbon/Themes/Windows8/Controls/ApplicationMenuItem.xaml
@@ -267,7 +267,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,0,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -634,7 +634,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -1051,7 +1051,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,0,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2"
@@ -1398,7 +1398,7 @@
                    IsOpen="{TemplateBinding IsSubmenuOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimation}}"
                    Margin="0,0,0,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2"

diff --git a/Fluent.Ribbon/Themes/Windows8/Controls/BackstageControls.xaml b/Fluent.Ribbon/Themes/Windows8/Controls/BackstageControls.xaml
@@ -311,7 +311,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">
@@ -731,7 +731,7 @@
                    IsOpen="{TemplateBinding IsDropDownOpen}"
                    AllowsTransparency="True"
                    Focusable="False"
-                   PopupAnimation="Fade"
+                   PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimation}}"
                    Margin="0,0,-4,0"
                    VerticalAlignment="Top"
                    Grid.ColumnSpan="2">