Browse Source
Merge pull request #11456 from AvaloniaUI/fixes/11148-isscrollinertiaenabled-warning
Fix `IsScrollInertiaEnabled` warning.
pull/11465/head
Max Katz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
4 deletions
-
src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
-
src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
|
|
|
@ -33,11 +33,12 @@ |
|
|
|
VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}" |
|
|
|
HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}" |
|
|
|
VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}" |
|
|
|
Padding="{TemplateBinding Padding}"> |
|
|
|
Padding="{TemplateBinding Padding}" |
|
|
|
ScrollViewer.IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}"> |
|
|
|
<ScrollContentPresenter.GestureRecognizers> |
|
|
|
<ScrollGestureRecognizer CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}" |
|
|
|
CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}" |
|
|
|
IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" /> |
|
|
|
IsScrollInertiaEnabled="{Binding (ScrollViewer.IsScrollInertiaEnabled), ElementName=PART_ContentPresenter}"/> |
|
|
|
</ScrollContentPresenter.GestureRecognizers> |
|
|
|
</ScrollContentPresenter> |
|
|
|
<ScrollBar Name="PART_HorizontalScrollBar" |
|
|
|
|
|
|
|
@ -14,11 +14,12 @@ |
|
|
|
VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}" |
|
|
|
HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}" |
|
|
|
VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}" |
|
|
|
Background="{TemplateBinding Background}"> |
|
|
|
Background="{TemplateBinding Background}" |
|
|
|
ScrollViewer.IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}"> |
|
|
|
<ScrollContentPresenter.GestureRecognizers> |
|
|
|
<ScrollGestureRecognizer CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}" |
|
|
|
CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}" |
|
|
|
IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" /> |
|
|
|
IsScrollInertiaEnabled="{Binding (ScrollViewer.IsScrollInertiaEnabled), ElementName=PART_ContentPresenter}"/> |
|
|
|
</ScrollContentPresenter.GestureRecognizers> |
|
|
|
</ScrollContentPresenter> |
|
|
|
<ScrollBar Name="PART_HorizontalScrollBar" |
|
|
|
|
