Skip to content

[Testing]Revert 'Fix Preserve ScrollView offsets when Orientation changes to Neither' #35412

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

Merged
kubaflo merged 2 commits into from
May 19, 2026
Merged

[Testing]Revert 'Fix Preserve ScrollView offsets when Orientation changes to Neither' #35412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2289c4e
Revert " [Windows] Fix Preserve ScrollView offsets when Orientation c…
TamilarasanSF4853 May 13, 2026
ce1b507
restricted for windows
TamilarasanSF4853 May 13, 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
2 changes: 2 additions & 0 deletions src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue34583.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if TEST_FAILS_ON_WINDOWS // Issue link: https://github.com/dotnet/maui/issues/34671
using System.Globalization;
using NUnit.Framework;
using UITest.Appium;
Expand Down Expand Up @@ -40,3 +41,4 @@ public void ScrollPositionIsPreservedWhenOrientationChangesToNeither()
Assert.That(scrollY, Is.GreaterThan(0d), "ScrollY should remain non-zero after setting orientation to Neither.");
}
}
#endif
13 changes: 1 addition & 12 deletions src/Core/src/Platform/Windows/ScrollViewerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,10 @@ public static void UpdateScrollBarVisibility(this ScrollViewer scrollViewer, Scr
{
if (orientation == ScrollOrientation.Neither)
{
// Use Hidden (not Disabled) so WinUI keeps the current ContentOffset instead of
// resetting it to (0,0). ScrollMode.Disabled prevents further user scrolling while
// the orientation is Neither.
scrollViewer.HorizontalScrollBarVisibility = WScrollBarVisibility.Hidden;
scrollViewer.VerticalScrollBarVisibility = WScrollBarVisibility.Hidden;
scrollViewer.HorizontalScrollMode = ScrollMode.Disabled;
scrollViewer.VerticalScrollMode = ScrollMode.Disabled;
scrollViewer.HorizontalScrollBarVisibility = scrollViewer.VerticalScrollBarVisibility = WScrollBarVisibility.Disabled;
return;
}

// When leaving Neither, restore scroll modes to Auto so that they follow
// the ScrollBarVisibility settings applied below.
scrollViewer.HorizontalScrollMode = ScrollMode.Auto;
scrollViewer.VerticalScrollMode = ScrollMode.Auto;

if (visibility == ScrollBarVisibility.Default)
{
// If the user has not explicitly set a horizontal scroll bar visibility, then the orientation will
Expand Down
Loading