Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion src/OneWare.WaveFormViewer/Views/WaveFormView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@
Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Grid.RowSpan="2" />

<ListBox Name="SimPartScroll" Grid.Row="2" Grid.Column="2" ClipToBounds="True"
ScrollViewer.Offset="{Binding #TextPartScroll.Scroll.Offset, Mode=TwoWay, FallbackValue=0}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Visible"
ItemsSource="{Binding Signals}" SelectedItem="{Binding SelectedSignal}"
Expand Down
44 changes: 37 additions & 7 deletions src/OneWare.WaveFormViewer/Views/WaveFormView.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Avalonia;
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
Expand All @@ -14,6 +15,10 @@ public partial class WaveFormView : UserControl
private WaveFormViewModel? _viewModel;
private double _zoomDelta;

private ScrollViewer? _textScrollViewer;
private ScrollViewer? _simScrollViewer;
private bool _syncingScrollOffset;

public WaveFormView()
{
InitializeComponent();
Expand All @@ -26,12 +31,7 @@ public WaveFormView()
if (DataContext is WaveFormViewModel vm) Initialize(vm);
};


// SimPartScroll.WhenAnyValue(x => x.Offset)
// .Subscribe(x => TextPartScroll.Offset = TextPartScroll.Offset.WithY(x.Y));
//
// TextPartScroll.WhenAnyValue(x => x.Offset)
// .Subscribe(x => SimPartScroll.Offset = SimPartScroll.Offset.WithY(x.Y));
Loaded += OnLoaded;

AddHandler(PointerPressedEvent, OnPointerPressed, RoutingStrategies.Bubble);
AddHandler(PointerMovedEvent, OnPointerMoved, RoutingStrategies.Bubble);
Expand Down Expand Up @@ -105,6 +105,36 @@ private void Initialize(WaveFormViewModel vm)
_viewModel = vm;
}

private void OnLoaded(object? sender, RoutedEventArgs e)
{
if (_textScrollViewer != null && _simScrollViewer != null)
return;

_textScrollViewer = TextPartScroll.FindDescendantOfType<ScrollViewer>();
_simScrollViewer = SimPartScroll.FindDescendantOfType<ScrollViewer>();

if (_textScrollViewer == null || _simScrollViewer == null)
return;

_textScrollViewer.ScrollChanged += (_, _) =>
SyncScrollOffset(_simScrollViewer, _textScrollViewer.Offset);
_simScrollViewer.ScrollChanged += (_, _) =>
SyncScrollOffset(_textScrollViewer, _simScrollViewer.Offset);
}

private void SyncScrollOffset(ScrollViewer target, Vector source)
{
if (_syncingScrollOffset)
return;

if (Math.Abs(target.Offset.Y - source.Y) < 0.5)
return;

_syncingScrollOffset = true;
target.Offset = target.Offset.WithY(source.Y);
_syncingScrollOffset = false;
}

private void OnPointerMoved(object? sender, PointerEventArgs e)
{
SimulatorEffectsRenderer.SetPos(e.GetPosition(SimulatorEffectsRenderer).X, _pointerPressed,
Expand Down
Loading