ModernFlyouts-Community · Samuel12321 · Mar 23, 2021 · Mar 11, 2021 · Mar 13, 2021 · Mar 15, 2021
diff --git a/ModernFlyouts.Core/UI/FlyoutWindow/FlyoutWindow.Animations.cs b/ModernFlyouts.Core/UI/FlyoutWindow/FlyoutWindow.Animations.cs
@@ -3,6 +3,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
+using MessageBox = System.Windows.Forms.MessageBox;
 
 namespace ModernFlyouts.Core.UI
 {
@@ -18,7 +19,21 @@ private void OpenFlyout()
             RoutedEventArgs args = new(OpenedEvent);
             RaiseEvent(args);
 
-            PlayOpenAnimation();
+
+            if (FlyoutAnimationEnabled)
+            {
+                c_translation = 40;
+                PlayOpenAnimation();
+            }
+            else
+            {
+                c_translation = 0;
+                RenderTransform = new TranslateTransform();
+                BeginAnimation(VisibilityProperty, null);
+                BeginAnimation(OpacityProperty, null);
+                Visibility = Visibility.Visible;
+                Opacity = 1.0;
+            }
 
             timer?.Start();
         }
@@ -28,7 +43,15 @@ private void CloseFlyout()
             RoutedEventArgs args = new(ClosingEvent);
             RaiseEvent(args);
 
-            PlayCloseAnimation();
+            if (FlyoutAnimationEnabled)
+            {
+                PlayCloseAnimation();
+            }
+            else
+            {
+                Opacity = 0.0;
+                Visibility = Visibility.Hidden;
+            }
         }
 
         #region Close Timer
@@ -105,7 +128,7 @@ public void UpdateCloseTimerInterval(double timeout)
         private DoubleKeyFrame fromHorizontalOffsetKeyFrameClosing;
         private DoubleKeyFrame fromVerticalOffsetKeyFrameClosing;
 
-        private const double c_translation = 40;
+        private double c_translation = 40;
         private static readonly TimeSpan translateDuration = TimeSpan.FromMilliseconds(367);
 
         private static readonly PropertyPath opacityPath = new(OpacityProperty);
@@ -115,6 +138,7 @@ public void UpdateCloseTimerInterval(double timeout)
         private static readonly KeySpline decelerateKeySplineOpening = new(0.1, 0.9, 0.2, 1);
         private static readonly KeySpline decelerateKeySplineClosing = new(1, 0.2, 0.9, 0.1);
 
+
         private void PrepareAnimations()
         {
             EnsureClosingStoryboard();
@@ -141,9 +165,11 @@ private void EnsureOpeningStoryboard()
                     {
                         new DiscreteObjectKeyFrame(Visibility.Visible, TimeSpan.Zero)
                     }
+
                 };
                 Storyboard.SetTarget(visibilityAnim, this);
                 Storyboard.SetTargetProperty(visibilityAnim, visibilityPath);
+
 
                 DoubleAnimationUsingKeyFrames opacityAnim = new()
                 {

diff --git a/ModernFlyouts.Core/UI/FlyoutWindow/FlyoutWindow.Properties.cs b/ModernFlyouts.Core/UI/FlyoutWindow/FlyoutWindow.Properties.cs
@@ -345,5 +345,22 @@ private static void OnIsOpenPropertyChanged(DependencyObject d, DependencyProper
         }
 
         #endregion
+
+        #region FlyoutAnimationEnabled
+
+        public static readonly DependencyProperty FlyoutAnimationEnabledProperty =
+            DependencyProperty.Register(
+                nameof(FlyoutAnimationEnabled),
+                typeof(bool),
+                typeof(FlyoutWindow),
+                new PropertyMetadata(false));
+
+        public bool FlyoutAnimationEnabled
+        {
+            get => (bool)GetValue(FlyoutAnimationEnabledProperty);
+            set => SetValue(FlyoutAnimationEnabledProperty, value);
+        }
+
+        #endregion
     }
 }
diff --git a/ModernFlyouts/FlyoutHandler.cs b/ModernFlyouts/FlyoutHandler.cs
@@ -215,7 +215,7 @@ private void CreateOnScreenFlyoutWindow()
                 ZBandID = zbid,
                 FlyoutWindowType = FlyoutWindowType.OnScreen,
                 Offset = UIManager.FlyoutShadowMargin,
-                IsTimeoutEnabled = true
+                IsTimeoutEnabled = true,
             };
 
             flyoutWindow.DragMoved += (s, e) =>
@@ -278,6 +278,13 @@ private void CreateOnScreenFlyoutWindow()
                 Path = new PropertyPath(nameof(UIManager.OnScreenFlyoutWindowExpandDirection)),
                 Mode = BindingMode.OneWay
             });
+
+            BindingOperations.SetBinding(flyoutWindow, FlyoutWindow.FlyoutAnimationEnabledProperty, new Binding()
+            {
+                Source = UIManager,
+                Path = new PropertyPath(nameof(UIManager.FlyoutAnimationEnabled)),
+                Mode = BindingMode.OneWay
+            });
         }
 
         private void OnNativeFlyoutShown()

diff --git a/ModernFlyouts/Helpers/AppDataHelper.cs b/ModernFlyouts/Helpers/AppDataHelper.cs
@@ -289,6 +289,12 @@ public static bool UseColoredTrayIcon
             set => SetValue(value);
         }
 
+        public static bool FlyoutAnimationEnabled
+        {
+            get => GetValue(DefaultValuesStore.FlyoutAnimationEnabled);
+            set => SetValue(value);
+        }
+
         public static bool AlignGSMTCThumbnailToRight
         {
             get => GetValue(DefaultValuesStore.AlignGSMTCThumbnailToRight);

diff --git a/ModernFlyouts/Helpers/DefaultValuesStore.cs b/ModernFlyouts/Helpers/DefaultValuesStore.cs
@@ -82,6 +82,8 @@ internal class DefaultValuesStore
 
         public const bool UseColoredTrayIcon = true;
 
+        public const bool FlyoutAnimationEnabled = true;
+
         public const bool AlignGSMTCThumbnailToRight = true;
 
         public const bool UseGSMTCThumbnailAsBackground = true;

diff --git a/ModernFlyouts/Navigation/PersonalizationPage.xaml b/ModernFlyouts/Navigation/PersonalizationPage.xaml
@@ -48,6 +48,10 @@
                                      OffContent="{x:Static resx:Strings.Settings_Off}"
                                      Visibility="{Binding UIManager.TrayIconEnabled,
                                         Converter={StaticResource BooleanToVisibilityConverter}}" />
+                    <ui:ToggleSwitch Header="{x:Static resx:Strings.Settings_FlyoutAnimationEnabled}"
+                                     IsOn="{Binding UIManager.FlyoutAnimationEnabled}"
+                                     OnContent="{x:Static resx:Strings.Settings_On}"
+                                     OffContent="{x:Static resx:Strings.Settings_Off}" />
                 </ui:SimpleStackPanel>
             </GroupBox>
 

diff --git a/ModernFlyouts/Properties/Strings.Designer.cs b/ModernFlyouts/Properties/Strings.Designer.cs
diff --git a/ModernFlyouts/Properties/Strings.af.resx b/ModernFlyouts/Properties/Strings.af.resx
@@ -1,16 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
+  <!-- 
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
   <resheader name="resmimetype">
     <value>text/microsoft-resx</value>
   </resheader>
   <resheader name="version">
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
     <value>Inligting oor</value>
@@ -314,4 +419,7 @@
   <data name="Settings.RestartRequired" xml:space="preserve">
     <value>Herbegin vereis om sekere veranderinge toe te pas</value>
   </data>
+  <data name="Settings.FlyoutAnimationEnabled" xml:space="preserve">
+    <value>Vervaag animasie</value>
+  </data>
 </root>