DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

UI - Fixed a lot of binding errors

Browse Source 
UI - Added most missing DisposeWith calls
This commit is contained in:
Robert committed 2022-04-02 01:10:06 +02:00
1 parent 8fd18b9565
commit 372991a69b
28 files changed
+347 -230
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/VisualScripting/CableView.axaml
+1 -1
View File
@@ -47,7 +47,7 @@
Padding="4"
Canvas.Left="{CompiledBinding ValuePoint.X}"
Canvas.Top="{CompiledBinding ValuePoint.Y}"
IsVisible="{CompiledBinding FromViewModel.Pin.PinValue, Converter={x:Static ObjectConverters.IsNotNull}}">
IsVisible="{CompiledBinding DisplayValue}">
<ContentControl Content="{CompiledBinding FromViewModel.Pin.PinValue}">
<ContentControl.DataTemplates>
<DataTemplate DataType="skiaSharp:SKColor">
src/Artemis.UI/Screens/VisualScripting/CableViewModel.cs
+38 -24
View File
@@ -15,14 +15,15 @@ namespace Artemis.UI.Screens.VisualScripting;
public class CableViewModel : ActivatableViewModelBase
{
private readonly ObservableAsPropertyHelper<bool> _connected;
private readonly ObservableAsPropertyHelper<Point> _fromPoint;
private readonly ObservableAsPropertyHelper<Point> _toPoint;
private readonly ObservableAsPropertyHelper<Point> _valuePoint;
private ObservableAsPropertyHelper<Color>? _cableColor;
private ObservableAsPropertyHelper<Point>? _fromPoint;
private ObservableAsPropertyHelper<Point>? _toPoint;
private ObservableAsPropertyHelper<Point>? _valuePoint;
private ObservableAsPropertyHelper<bool>? _connected;
private PinViewModel? _fromViewModel;
private PinViewModel? _toViewModel;
private bool _displayValue;
public CableViewModel(NodeScriptViewModel nodeScriptViewModel, IPin from, IPin to)
{
@@ -42,25 +43,32 @@ public class CableViewModel : ActivatableViewModelBase
.Switch()
.ToProperty(this, vm => vm.CableColor)
.DisposeWith(d);
_fromPoint = this.WhenAnyValue(vm => vm.FromViewModel)
.Select(p => p != null ? p.WhenAnyValue(pvm => pvm.Position) : Observable.Never<Point>())
.Switch()
.ToProperty(this, vm => vm.FromPoint)
.DisposeWith(d);
_toPoint = this.WhenAnyValue(vm => vm.ToViewModel)
.Select(p => p != null ? p.WhenAnyValue(pvm => pvm.Position) : Observable.Never<Point>())
.Switch()
.ToProperty(this, vm => vm.ToPoint)
.DisposeWith(d);
_valuePoint = this.WhenAnyValue(vm => vm.FromPoint, vm => vm.ToPoint).Select(tuple => new Point(
tuple.Item1.X + (tuple.Item2.X - tuple.Item1.X) / 2,
tuple.Item1.Y + (tuple.Item2.Y - tuple.Item1.Y) / 2
)).ToProperty(this, vm => vm.ValuePoint)
.DisposeWith(d);
// Not a perfect solution but this makes sure the cable never renders at 0,0 (can happen when the cable spawns before the pin ever rendered)
_connected = this.WhenAnyValue(vm => vm.FromPoint, vm => vm.ToPoint)
.Select(tuple => tuple.Item1 != new Point(0, 0) && tuple.Item2 != new Point(0, 0))
.ToProperty(this, vm => vm.Connected)
.DisposeWith(d);
});
_fromPoint = this.WhenAnyValue(vm => vm.FromViewModel)
.Select(p => p != null ? p.WhenAnyValue(pvm => pvm.Position) : Observable.Never<Point>())
.Switch()
.ToProperty(this, vm => vm.FromPoint);
_toPoint = this.WhenAnyValue(vm => vm.ToViewModel)
.Select(p => p != null ? p.WhenAnyValue(pvm => pvm.Position) : Observable.Never<Point>())
.Switch()
.ToProperty(this, vm => vm.ToPoint);
_valuePoint = this.WhenAnyValue(vm => vm.FromPoint, vm => vm.ToPoint).Select(tuple => new Point(
tuple.Item1.X + (tuple.Item2.X - tuple.Item1.X) / 2,
tuple.Item1.Y + (tuple.Item2.Y - tuple.Item1.Y) / 2
)).ToProperty(this, vm => vm.ValuePoint);
// Not a perfect solution but this makes sure the cable never renders at 0,0 (can happen when the cable spawns before the pin ever rendered)
_connected = this.WhenAnyValue(vm => vm.FromPoint, vm => vm.ToPoint)
.Select(tuple => tuple.Item1 != new Point(0, 0) && tuple.Item2 != new Point(0, 0))
.ToProperty(this, vm => vm.Connected);
DisplayValue = !nodeScriptViewModel.IsPreview;
}
public PinViewModel? FromViewModel
@@ -75,10 +83,16 @@ public class CableViewModel : ActivatableViewModelBase
set => RaiseAndSetIfChanged(ref _toViewModel, value);
}
public bool Connected => _connected.Value;
public bool DisplayValue
{
get => _displayValue;
set => _displayValue = value;
}
public Point FromPoint => _fromPoint.Value;
public Point ToPoint => _toPoint.Value;
public Point ValuePoint => _valuePoint.Value;
public bool Connected => _connected?.Value ?? false;
public Point FromPoint => _fromPoint?.Value ?? new Point();
public Point ToPoint => _toPoint?.Value ?? new Point();
public Point ValuePoint => _valuePoint?.Value ?? new Point();
public Color CableColor => _cableColor?.Value ?? new Color(255, 255, 255, 255);
}
src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml
+1 -1
View File
@@ -21,7 +21,7 @@
FontFamily="{StaticResource SymbolThemeFontFamily}"
Classes="AppBarButton"
Command="{Binding $parent[TextBox].Clear}"
IsVisible="{Binding Text, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TextBox}}, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
IsVisible="{Binding $parent[TextBox].Text, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
<controls:Button Content="&#xE721;"
FontFamily="{StaticResource SymbolThemeFontFamily}"
Classes="AppBarButton"
src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml
+31 -30
View File
@@ -14,63 +14,64 @@
<Setter Property="MaxWidth" Value="1000"></Setter>
</Style>
</UserControl.Styles>
<UserControl.KeyBindings>
<KeyBinding Command="{CompiledBinding History.Undo}" Gesture="Ctrl+Z"></KeyBinding>
<KeyBinding Command="{CompiledBinding History.Redo}" Gesture="Ctrl+Y"></KeyBinding>
<KeyBinding Command="{Binding DeleteSelectedNodes}" Gesture="Delete"></KeyBinding>
</UserControl.KeyBindings>
<UserControl.Resources>
<VisualBrush x:Key="LargeCheckerboardBrush" TileMode="Tile" Stretch="Uniform" SourceRect="0,0,20,20">
<VisualBrush.Visual>
<Canvas Width="20" Height="20">
<Rectangle Width="10" Height="10" Fill="Black" Opacity="0.15" />
<Rectangle Width="10" Height="10" Canvas.Left="10" />
<Rectangle Width="10" Height="10" Canvas.Top="10" />
<Rectangle Width="10" Height="10" Canvas.Left="10" Canvas.Top="10" Fill="Black" Opacity="0.15" />
</Canvas>
</VisualBrush.Visual>
</VisualBrush>
</UserControl.Resources>
<paz:ZoomBorder Name="ZoomBorder"
Stretch="None"
Focusable="True"
VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"
Background="{DynamicResource LargeCheckerboardBrush}"
Background="{StaticResource LargeCheckerboardBrush}"
ZoomChanged="ZoomBorder_OnZoomChanged"
MaxZoomX="1"
MaxZoomY="1"
EnableConstrains="True"
PointerReleased="ZoomBorder_OnPointerReleased">
<Grid Name="ContainerGrid" Background="Transparent" ClipToBounds="False">
<Grid.ContextFlyout>
<Flyout FlyoutPresenterClasses="node-picker-flyout">
<ContentControl Content="{CompiledBinding NodePickerViewModel}" />
</Flyout>
</Grid.ContextFlyout>
<Grid.Transitions>
<Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" Easing="CubicEaseOut" />
</Transitions>
</Grid.Transitions>
<Grid.ContextFlyout>
<Flyout FlyoutPresenterClasses="node-picker-flyout">
<ContentControl Content="{CompiledBinding NodePickerViewModel}" />
</Flyout>
</Grid.ContextFlyout>
<Grid.Transitions>
<Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" Easing="CubicEaseOut" />
</Transitions>
</Grid.Transitions>
<!-- Drag cable, if any -->
<ContentControl Content="{CompiledBinding DragViewModel}" ClipToBounds="False"/>
<!-- Drag cable, if any -->
<ContentControl Content="{CompiledBinding DragViewModel}" ClipToBounds="False" />
<!-- Cables -->
<ItemsControl Items="{CompiledBinding CableViewModels}" ClipToBounds="False">
<ItemsControl Items="{CompiledBinding CableViewModels}" ClipToBounds="False">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<Canvas />
<Canvas />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.Styles>
<Style Selector="ItemsControl > ContentPresenter">
<Setter Property="Canvas.Left" Value="{Binding Node.X, TargetNullValue=0}" />
<Setter Property="Canvas.Top" Value="{Binding Node.Y, TargetNullValue=0}" />
</Style>
</ItemsControl.Styles>
</ItemsControl>
<!-- Nodes -->
<ItemsControl Name="NodesContainer" Items="{CompiledBinding NodeViewModels}" ClipToBounds="False">
<ItemsControl Name="NodesContainer" Items="{CompiledBinding NodeViewModels}" ClipToBounds="False">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<Canvas />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.Styles>
<Style Selector="ItemsControl > ContentPresenter">
<Setter Property="Canvas.Left" Value="{Binding Node.X, TargetNullValue=0}" />
<Setter Property="Canvas.Top" Value="{Binding Node.Y, TargetNullValue=0}" />
<Style Selector="ItemsControl#NodesContainer > ContentPresenter">
<Setter Property="Canvas.Left" Value="{Binding Node.X}" />
<Setter Property="Canvas.Top" Value="{Binding Node.Y}" />
</Style>
</ItemsControl.Styles>
</ItemsControl>
src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml.cs
+18 -21
View File
@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Reactive.Disposables;
using System.Threading.Tasks;
using Artemis.Core;
using Artemis.Core.Events;
using Artemis.UI.Shared.Controls;
@@ -15,6 +17,8 @@ using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Avalonia.Media;
using Avalonia.ReactiveUI;
using Avalonia.Threading;
using DynamicData.Binding;
using ReactiveUI;
namespace Artemis.UI.Screens.VisualScripting;
@@ -38,27 +42,17 @@ public class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
UpdateZoomBorderBackground();
_grid.AddHandler(PointerReleasedEvent, CanvasOnPointerReleased, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
this.WhenActivated(d =>
{
ViewModel!.PickerPositionSubject.Subscribe(p =>
{
ViewModel.NodePickerViewModel.Position = p;
_grid?.ContextFlyout?.ShowAt(_grid, true);
}).DisposeWith(d);
ViewModel!.PickerPositionSubject.Subscribe(ShowPickerAt).DisposeWith(d);
if (ViewModel.IsPreview)
{
BoundsProperty.Changed.Subscribe(BoundsPropertyChanged).DisposeWith(d);
ViewModel.NodeScript.NodeAdded += NodesChanged;
ViewModel.NodeScript.NodeRemoved += NodesChanged;
Disposable.Create(() =>
{
ViewModel.NodeScript.NodeAdded -= NodesChanged;
ViewModel.NodeScript.NodeRemoved -= NodesChanged;
}).DisposeWith(d);
ViewModel.NodeViewModels.ToObservableChangeSet().Subscribe(_ => AutoFitIfPreview()).DisposeWith(d);
}
AutoFit(true);
Dispatcher.UIThread.InvokeAsync(() => AutoFit(true), DispatcherPriority.ContextIdle);
});
}
@@ -68,17 +62,20 @@ public class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
return base.MeasureOverride(availableSize);
}
private void ShowPickerAt(Point point)
{
if (ViewModel == null)
return;
ViewModel.NodePickerViewModel.Position = point;
_grid?.ContextFlyout?.ShowAt(_grid, true);
}
private void AutoFitIfPreview()
{
if (ViewModel != null && ViewModel.IsPreview)
AutoFit(true);
}
private void NodesChanged(object? sender, SingleValueEventArgs<INode> e)
{
AutoFitIfPreview();
}
private void BoundsPropertyChanged(AvaloniaPropertyChangedEventArgs<Rect> obj)
{
if (_nodesContainer.ItemContainerGenerator.Containers.Select(c => c.ContainerControl).Contains(obj.Sender))
@@ -102,8 +99,8 @@ public class NodeScriptView : ReactiveUserControl<NodeScriptViewModel>
double bottom = _nodesContainer.ItemContainerGenerator.Containers.Select(c => c.ContainerControl.Bounds.Bottom).Max();
double right = _nodesContainer.ItemContainerGenerator.Containers.Select(c => c.ContainerControl.Bounds.Right).Max();
// Add a 5 pixel margin around the rect
Rect scriptRect = new(new Point(left - 5, top - 5), new Point(right + 5, bottom + 5));
// Add a 10 pixel margin around the rect
Rect scriptRect = new(new Point(left - 10, top - 10), new Point(right + 10, bottom + 10));
// The scale depends on the available space
double scale = Math.Min(1, Math.Min(Bounds.Width / scriptRect.Width, Bounds.Height / scriptRect.Height));
src/Artemis.UI/Screens/VisualScripting/NodeView.axaml
+4 -1
View File
@@ -63,7 +63,10 @@
<ItemsControl Items="{CompiledBinding InputPinCollectionViewModels}" />
</StackPanel>
<ContentControl Grid.Column="1" Name="CustomViewModelContainer" Content="{CompiledBinding CustomNodeViewModel}" IsVisible="{CompiledBinding CustomNodeViewModel}" />
<ContentControl Grid.Column="1"
Name="CustomViewModelContainer"
Content="{CompiledBinding CustomNodeViewModel}"
IsVisible="{CompiledBinding CustomNodeViewModel, Converter={x:Static ObjectConverters.IsNotNull}}" />
<StackPanel Grid.Column="2" IsVisible="{CompiledBinding HasOutputPins}">
<ItemsControl Items="{CompiledBinding OutputPinViewModels}" Margin="4 0" />
src/Artemis.UI/Screens/VisualScripting/NodeView.axaml.cs
+3
View File
@@ -2,7 +2,10 @@ using System;
using System.Collections.Generic;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Mixins;
using Avalonia.Controls.Presenters;
using Avalonia.Input;
using Avalonia.LogicalTree;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using Avalonia.VisualTree;
src/Artemis.UI/Screens/VisualScripting/NodeViewModel.cs
+1 -1
View File
@@ -35,8 +35,8 @@ public class NodeViewModel : ActivatableViewModelBase
public NodeViewModel(NodeScriptViewModel nodeScriptViewModel, INode node, INodeVmFactory nodeVmFactory, INodeEditorService nodeEditorService)
{
NodeScriptViewModel = nodeScriptViewModel;
_nodeEditorService = nodeEditorService;
NodeScriptViewModel = nodeScriptViewModel;
Node = node;
DeleteNode = ReactiveCommand.Create(ExecuteDeleteNode, this.WhenAnyValue(vm => vm.IsStaticNode).Select(v => !v));
src/Artemis.UI/Screens/VisualScripting/Pins/InputPinView.axaml
+7 -13
View File
@@ -3,28 +3,22 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pins="clr-namespace:Artemis.UI.Screens.VisualScripting.Pins"
xmlns:converters="clr-namespace:Artemis.UI.Converters"
mc:Ignorable="d"
d:DesignWidth="200"
x:Class="Artemis.UI.Screens.VisualScripting.Pins.InputPinView"
x:DataType="pins:PinViewModel">
<UserControl.Resources>
<converters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
</UserControl.Resources>
<UserControl.Styles>
<StyleInclude Source="/Screens/VisualScripting/VisualScripting.axaml" />
<Style Selector="StackPanel#PinContainer Border#VisualPinPoint">
<Setter Property="Background">
<Setter.Value>
<SolidColorBrush Color="{CompiledBinding DarkenedPinColor}"></SolidColorBrush>
</Setter.Value>
</Setter>
<Setter Property="BorderBrush">
<Setter.Value>
<SolidColorBrush Color="{CompiledBinding PinColor}"></SolidColorBrush>
</Setter.Value>
</Setter>
</Style>
</UserControl.Styles>
<StackPanel Name="PinContainer" Orientation="Horizontal" Spacing="6">
<Border Name="PinPoint">
<Border Name="VisualPinPoint" />
<Border Name="VisualPinPoint"
BorderBrush="{CompiledBinding PinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
Background="{CompiledBinding DarkenedPinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"/>
</Border>
<TextBlock Name="PinName" VerticalAlignment="Center" Text="{CompiledBinding Pin.Name}" />
</StackPanel>
src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinView.axaml
+7 -13
View File
@@ -3,29 +3,23 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pins="clr-namespace:Artemis.UI.Screens.VisualScripting.Pins"
xmlns:converters="clr-namespace:Artemis.UI.Converters"
mc:Ignorable="d"
d:DesignWidth="200"
x:Class="Artemis.UI.Screens.VisualScripting.Pins.OutputPinView"
x:DataType="pins:PinViewModel">
<UserControl.Resources>
<converters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
</UserControl.Resources>
<UserControl.Styles>
<StyleInclude Source="/Screens/VisualScripting/VisualScripting.axaml" />
<Style Selector="StackPanel#PinContainer Border#VisualPinPoint">
<Setter Property="Background">
<Setter.Value>
<SolidColorBrush Color="{CompiledBinding DarkenedPinColor}" />
</Setter.Value>
</Setter>
<Setter Property="BorderBrush">
<Setter.Value>
<SolidColorBrush Color="{CompiledBinding PinColor}" />
</Setter.Value>
</Setter>
</Style>
</UserControl.Styles>
<StackPanel Name="PinContainer" Orientation="Horizontal" Spacing="6">
<TextBlock Name="PinName" VerticalAlignment="Center" Text="{CompiledBinding Pin.Name}" />
<Border Name="PinPoint">
<Border Name="VisualPinPoint" />
<Border Name="VisualPinPoint"
BorderBrush="{CompiledBinding PinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
Background="{CompiledBinding DarkenedPinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"/>
</Border>
</StackPanel>
</UserControl>