Merge pull request #7 from Shprrr/fix-flickering

Fix control flickering when changing Graph. Fix #5
KeRNeLith · Mar 19, 2022 · 5e3be16 · 5e3be16
2 parents 21e04d1 + d0a4575
commit 5e3be16
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/GraphShape.Controls/Controls/GraphCanvas.cs b/src/GraphShape.Controls/Controls/GraphCanvas.cs
@@ -119,7 +119,7 @@ public static void SetY(DependencyObject obj, double value)
         [NotNull]
         public static readonly RoutedEvent PositionChangedEvent = EventManager.RegisterRoutedEvent(
             "PositionChanged", RoutingStrategy.Bubble, typeof(PositionChangedEventHandler), typeof(GraphCanvas));
-        
+
         /// <summary>
         /// Adds a new <see cref="PositionChangedEvent"/> handler.
         /// </summary>
@@ -141,7 +141,7 @@ public static void RemovePositionChangedHandler(DependencyObject d, RoutedEventH
                 uiElement.RemoveHandler(PositionChangedEvent, handler);
             }
         }
-        
+
         #endregion
 
         #region Animation length
@@ -165,7 +165,7 @@ public TimeSpan AnimationLength
             typeof(TimeSpan),
             typeof(GraphCanvas),
             new UIPropertyMetadata(new TimeSpan(0, 0, 0, 0, 500)));
-        
+
         #endregion
 
         #region CreationAnimation
@@ -464,7 +464,10 @@ public virtual void Relayout()
         /// <param name="control">The control which has been added.</param>
         protected virtual void RunCreationTransition([NotNull] Control control)
         {
-            CreationTransition?.Run(AnimationContext, control, AnimationLength);
+            if (CanAnimate)
+            {
+                CreationTransition?.Run(AnimationContext, control, AnimationLength);
+            }
         }
 
         /// <summary>
@@ -498,7 +501,7 @@ protected virtual void RunMoveAnimation([NotNull] Control control, double x, dou
         /// </param>
         protected virtual void RunDestructionTransition([NotNull] Control control, bool dontRemoveAfter)
         {
-            if (DestructionTransition is null)
+            if (DestructionTransition is null || !CanAnimate)
             {
                 if (!dontRemoveAfter)
                 {

diff --git a/src/GraphShape.Controls/Controls/GraphLayout/GraphLayout.DependencyProperties.cs b/src/GraphShape.Controls/Controls/GraphLayout/GraphLayout.DependencyProperties.cs
@@ -751,7 +751,7 @@ private static void OnLayoutModePropertyChanged(DependencyObject d, DependencyPr
             // Check if we need to register or unregister watches on graph changes events
             if (graphLayout.Graph is IMutableBidirectionalGraph<TVertex, TEdge> mutableGraph)
             {
-                var oldMode = (LayoutMode)args.OldValue; 
+                var oldMode = (LayoutMode)args.OldValue;
                 var newMode = (LayoutMode)args.NewValue;
 
                 bool wasCompoundMode = IsCompoundModeInternal(oldMode, graphLayout.Graph);

diff --git a/src/GraphShape.Controls/Controls/Transitions/FadeTransition.cs b/src/GraphShape.Controls/Controls/Transitions/FadeTransition.cs
@@ -20,7 +20,7 @@ public class FadeTransition : ITransition
         /// <param name="startOpacity">Starting opacity value.</param>
         /// <param name="endOpacity">Ending opacity value.</param>
         public FadeTransition(double startOpacity, double endOpacity)
-            : this(startOpacity, endOpacity, 2)
+            : this(startOpacity, endOpacity, 1)
         {
         }