Skip to content

Fix System.OverflowException in CustomScrollViewerEx during Mouse Wheel scroll #4497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
4yinn wants to merge 6 commits into
base: dev
Choose a base branch
from
+41 −2
Open

Fix System.OverflowException in CustomScrollViewerEx during Mouse Wheel scroll #4497

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57c4eb6
fix: avoid calculating WheelChange when actual height is zero
4yinn May 29, 2026
4fa1f3d
fix: adjustment
4yinn May 29, 2026
fc0fd3c
Update Flow.Launcher/Resources/Controls/CustomScrollViewerEx.cs
4yinn May 31, 2026
ff7d7f7
change location check to ActualHeight validation
4yinn Jun 1, 2026
7e3aa4a
Merge branch 'dev' into hotfix/fix-overflow-scrolling
4yinn Jun 1, 2026
a372971
Code cleanup
Jack251970 Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Flow.Launcher.Test/Flow.Launcher.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Flow.Launcher\Flow.Launcher.csproj" />
<ProjectReference Include="..\Plugins\Flow.Launcher.Plugin.Calculator\Flow.Launcher.Plugin.Calculator.csproj" />
<ProjectReference Include="..\Plugins\Flow.Launcher.Plugin.Explorer\Flow.Launcher.Plugin.Explorer.csproj" />
<ProjectReference Include="..\Plugins\Flow.Launcher.Plugin.Program\Flow.Launcher.Plugin.Program.csproj" />
Expand Down
36 changes: 36 additions & 0 deletions Flow.Launcher.Test/MouseWheelTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System;
using System.Reflection;
using System.Windows;
using System.Windows.Input;
using System.Windows.Interop;
using Flow.Launcher.Resources.Controls;
using NUnit.Framework;

namespace Flow.Launcher.Test;

[TestFixture]
public class MouseWheelTest
{
[Test]
[RequiresThread(System.Threading.ApartmentState.STA)]
public void Test_Scroll_MouseWheel()
{
var scrollView = new CustomScrollViewerEx();

var mouseDevice = Mouse.PrimaryDevice;
var e = new MouseWheelEventArgs(mouseDevice, Environment.TickCount, 120)
{
RoutedEvent = UIElement.MouseWheelEvent
};

var onMouseWheelMethod = typeof(CustomScrollViewerEx).GetMethod(
"OnMouseWheel",
BindingFlags.NonPublic | BindingFlags.Instance
);

Assert.DoesNotThrow(() =>
{
onMouseWheelMethod.Invoke(scrollView, new object[] { e });
});
Comment thread
Jack251970 marked this conversation as resolved.
}
}
18 changes: 13 additions & 5 deletions Flow.Launcher/Resources/Controls/CustomScrollViewerEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public class CustomScrollViewerEx : ScrollViewer
public CustomScrollViewerEx()
{
Loaded += OnLoaded;
var valueSource = DependencyPropertyHelper.GetValueSource(this, AutoPanningMode.IsEnabledProperty).BaseValueSource;
var valueSource = DependencyPropertyHelper.GetValueSource(this, AutoPanningMode.IsEnabledProperty)
.BaseValueSource;
if (valueSource == BaseValueSource.Default)
{
AutoPanningMode.SetIsEnabled(this, true);
Expand Down Expand Up @@ -45,9 +46,9 @@ public Orientation Orientation

public static readonly DependencyProperty AutoHideScrollBarsProperty =
ScrollViewerHelper.AutoHideScrollBarsProperty
.AddOwner(
typeof(CustomScrollViewerEx),
new PropertyMetadata(true, OnAutoHideScrollBarsChanged));
.AddOwner(
typeof(CustomScrollViewerEx),
new PropertyMetadata(true, OnAutoHideScrollBarsChanged));

public bool AutoHideScrollBars
{
Expand Down Expand Up @@ -96,6 +97,9 @@ protected override void OnMouseWheel(MouseWheelEventArgs e)
e.Handled = true;
}

if (ActualHeight <= 0)
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
return;

var WheelChange = e.Delta * (ViewportHeight / 1.5) / ActualHeight;
var newOffset = LastVerticalLocation - WheelChange;

Expand Down Expand Up @@ -126,6 +130,9 @@ protected override void OnMouseWheel(MouseWheelEventArgs e)
e.Handled = true;
}

if (ActualHeight <= 0)
return;

var WheelChange = e.Delta * (ViewportWidth / 1.5) / ActualWidth;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
var newOffset = LastHorizontalLocation - WheelChange;

Expand Down Expand Up @@ -196,7 +203,8 @@ public bool ChangeView(double? horizontalOffset, double? verticalOffset, float?
/// <param name="zoomFactor">A value between MinZoomFactor and MaxZoomFactor that specifies the required target ZoomFactor.</param>
/// <param name="disableAnimation"><see langword="true"/> to disable zoom/pan animations while changing the view; otherwise, <see langword="false"/>. The default is false.</param>
/// <returns><see langword="true"/> if the view is changed; otherwise, <see langword="false"/>.</returns>
public bool ChangeView(double? horizontalOffset, double? verticalOffset, float? zoomFactor, bool disableAnimation)
public bool ChangeView(double? horizontalOffset, double? verticalOffset, float? zoomFactor,
bool disableAnimation)
{
if (disableAnimation)
{
Expand Down
Loading