Fix Scroll Event Triggering and Enhance Accessibility with Private Properties for Scroll State Management #123
Conversation
There was a problem hiding this comment.
Thank you for your contribution!
This PR should really be split into two: one for the fix, and one for the public API.
That being said, it's unlikely that we're going to accept any new API without an example of why it's useful and what can't be done currently.
| @@ -158,10 +158,21 @@ partial class DataGrid : TemplatedControl | |||
| // set as the rows were scrolled off. | |||
| private double _verticalOffset; | |||
| private byte _verticalScrollChangesIgnored; | |||
|
|
|||
|
|
|||
| public double VerticalScrollOffset => _verticalOffset; | |||
There was a problem hiding this comment.
Please remove the new public API (applicable to all 3 new properties).
| @@ -2370,6 +2381,9 @@ internal bool UpdateScroll(Vector delta) | |||
| { | |||
| DisplayData.PendingVerticalScrollHeight = scrollHeight; | |||
| handled = true; | |||
|
|
|||
| var eventType = scrollHeight > 0 ? ScrollEventType.SmallIncrement : ScrollEventType.SmallDecrement; | |||
| VerticalScroll?.Invoke(this, new ScrollEventArgs(eventType, delta.Y)); | |||
There was a problem hiding this comment.
Shouldn't that use the clamped scrollHeight rather than the original delta.Y?
| @@ -2392,6 +2406,9 @@ internal bool UpdateScroll(Vector delta) | |||
| // We don't need to invalidate once again after UpdateHorizontalOffset. | |||
| ignoreInvalidate = true; | |||
| handled = true; | |||
|
|
|||
| var eventType = delta.X > 0 ? ScrollEventType.SmallDecrement : ScrollEventType.SmallIncrement; | |||
| HorizontalScroll?.Invoke(this, new ScrollEventArgs(eventType, delta.X)); | |||
There was a problem hiding this comment.
Shouldn't that use the clamped horizontalOffset rather than the original delta.X?
| @@ -9,6 +9,7 @@ | |||
|
|
|||
| <ItemGroup> | |||
| <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" /> | |||
| <PackageReference Include="Avalonia.Diagnostics" Version="11.2.5" /> | |||
There was a problem hiding this comment.
Please use $(AvaloniaVersion) instead.
| @@ -7,5 +8,8 @@ public partial class MainWindow : Window | |||
| public MainWindow() | |||
| { | |||
| InitializeComponent(); | |||
There was a problem hiding this comment.
AttachDevTools should be automatically included with source generators enabled (which are by default).
What does the pull request do?
This PR fixes a bug that caused the HorizontalScroll and VerticalScroll events not to be triggered using the pointer wheel, and also adds access to private properties that can be used to implement IsScrolledtoBottom and other things.
What is the current behavior?
The Vertical Scroll and Horizontal Scroll events are triggered when using ScrollBar.
What is the updated/expected behavior with this PR?
The Vertical Scroll and Horizontal Scroll events are triggered when using ScrollBar or pointer wheel.
Checklist