Fixed oscillation cause by strange ITextServices values returned.

aelyo-softworks · Oct 29, 2023 · 6bb2cbd · 6bb2cbd
1 parent 1e39a2b
commit 6bb2cbd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Wice/ScrollViewer.cs b/Wice/ScrollViewer.cs
@@ -315,8 +315,9 @@ private void OnViewerArranged(object sender, EventArgs e)
 
             if (viewerSize.IsZero)
             {
-                IsVerticalScrollBarVisible = false;
-                IsHorizontalScrollBarVisible = false;
+                // this causes oscillation
+                //IsVerticalScrollBarVisible = false;
+                //IsHorizontalScrollBarVisible = false;
                 return;
             }
 

diff --git a/Wice/ScrollbarButton.cs b/Wice/ScrollbarButton.cs
@@ -7,6 +7,8 @@ namespace Wice
 {
     public class ScrollBarButton : ButtonBase
     {
+        private GeometrySource2D _lastGeometrySource2D;
+
         public static VisualProperty IsArrowOpenProperty = VisualProperty.Add(typeof(Visual), nameof(IsArrowOpen), VisualPropertyInvalidateModes.Render, true);
         public static VisualProperty ArrowRatioProperty = VisualProperty.Add(typeof(Visual), nameof(ArrowRatio), VisualPropertyInvalidateModes.Render, float.NaN);
 
@@ -36,13 +38,15 @@ public ScrollBarButton(DockType type)
         protected override void OnArranged(object sender, EventArgs e)
         {
             base.OnArranged(sender, e);
-
             var size = (Child.ArrangedRect - Child.Margin).Size;
-
             var open = IsArrowOpen;
             var type = Dock.GetDockType(this);
             var geoSource = Application.Current.ResourceManager.GetScrollBarButtonGeometrySource(type, size.width, ArrowRatio, open);
+            if (geoSource.Equals(_lastGeometrySource2D))
+                return;
+
             Child.GeometrySource2D = geoSource.GetIGeometrySource2();
+            _lastGeometrySource2D = geoSource;
         }
 
         protected override void OnAttachedToComposition(object sender, EventArgs e)

diff --git a/Wice/TitleBarButton.cs b/Wice/TitleBarButton.cs
@@ -8,6 +8,7 @@ namespace Wice
     public class TitleBarButton : ButtonBase
     {
         private TitleBarButtonType _buttonType;
+        private GeometrySource2D _lastGeometrySource2D;
 
         public TitleBarButton()
         {
@@ -50,7 +51,11 @@ protected override void OnArranged(object sender, EventArgs e)
             var size = (Path.ArrangedRect - Path.Margin).Size;
             var geoSize = size.height;
             var geoSource = Application.Current.ResourceManager.GetTitleBarButtonGeometrySource(ButtonType, geoSize);
+            if (geoSource.Equals(_lastGeometrySource2D))
+                return;
+
             Path.GeometrySource2D = geoSource.GetIGeometrySource2();
+            _lastGeometrySource2D = geoSource;
         }
 
         protected override void OnAttachedToComposition(object sender, EventArgs e)