From 8eb48676f27988b07cd3fef6a35945be98133c56 Mon Sep 17 00:00:00 2001
From: Fredrik Salomonsson <fredrik.salomonsson90@gmail.com>
Date: Tue, 24 Oct 2023 12:11:29 +0200
Subject: [PATCH] [MouseHighlighter]Remove lower limit of fade delay and
 duration (#29352)

* Removed limit for MouseHighlighter Animation Duration and Animation Delay.
(If user sets these values to 0ms, it will actually be set to 1ms to avoid crashing the app)

* Update MouseHighlighter.cpp

Removed the hack ;D

* Update MouseHighlighter.cpp

* Update MouseUtilsPage.xaml

Changed the values to 1

* Update MouseHighlighter.cpp

Reintroducing workaround

* Update MouseUtilsPage.xaml

Changed the minimum values for FadeDelayMs and FadeDuration back to 0.
---
 .../MouseUtils/MouseHighlighter/MouseHighlighter.cpp     | 9 +++++++++
 .../Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml   | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp
index 0b52e3b16f..fd5d3b3413 100644
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp
@@ -212,6 +212,15 @@ void Highlighter::StartDrawingPointFading(MouseButton button)
     auto animation = m_compositor.CreateColorKeyFrameAnimation();
     animation.InsertKeyFrame(1, winrt::Windows::UI::ColorHelper::FromArgb(0, brushColor.R, brushColor.G, brushColor.B));
     using timeSpan = std::chrono::duration<int, std::ratio<1, 1000>>;
+    // HACK: If user sets these durations to 0, the fade won't work. Setting them to 1ms instead to avoid this.
+    if (m_fadeDuration_ms == 0)
+    {
+        m_fadeDuration_ms = 1;
+    }
+    if (m_fadeDelay_ms == 0)
+    {
+        m_fadeDelay_ms = 1;
+    }
     std::chrono::milliseconds duration(m_fadeDuration_ms);
     std::chrono::milliseconds delay(m_fadeDelay_ms);
     animation.Duration(timeSpan(duration));
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
index 27aadf6d50..ed162dc073 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -196,7 +196,7 @@
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
                                     LargeChange="100"
-                                    Minimum="100"
+                                    Minimum="0"
                                     SmallChange="10"
                                     SpinButtonPlacementMode="Compact"
                                     Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDelayMs}" />
@@ -205,7 +205,7 @@
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
                                     LargeChange="100"
-                                    Minimum="100"
+                                    Minimum="0"
                                     SmallChange="10"
                                     SpinButtonPlacementMode="Compact"
                                     Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDurationMs}" />