DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Meta - Update packages

Browse Source 
Shared UI - Added slider behavior that only updates its value on pointer release
This commit is contained in:
Robert 2022-05-01 11:08:59 +02:00
parent 3e1fc76bfe
commit cce8404cfa
12 changed files with 133 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/.idea/.idea.Artemis/.idea/avalonia.xml generated
View File

@ -25,8 +25,10 @@
<entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml" value="Artemis.UI.Windows/Artemis.UI.Windows.csproj" /> <entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupView.axaml" value="Artemis.UI.Windows/Artemis.UI.Windows.csproj" />
<entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" /> <entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreePropertyView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
<entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" /> <entry key="Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
<entry key="Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
<entry key="Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" /> <entry key="Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
<entry key="Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" /> <entry key="Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
<entry key="Artemis.UI/Screens/VisualScripting/NodeView.axaml" value="Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
<entry key="Avalonia/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml" value="Avalonia/Artemis.UI.Linux/Artemis.UI.Linux.csproj" /> <entry key="Avalonia/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml" value="Avalonia/Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
<entry key="Avalonia/Artemis.UI/Styles/Artemis.axaml" value="Avalonia/Artemis.UI.Linux/Artemis.UI.Linux.csproj" /> <entry key="Avalonia/Artemis.UI/Styles/Artemis.axaml" value="Avalonia/Artemis.UI.Linux/Artemis.UI.Linux.csproj" />
</map> </map>

24
src/Artemis.UI.Linux/packages.lock.json
View File

@ -157,27 +157,27 @@
}, },
"Avalonia.Xaml.Behaviors": { "Avalonia.Xaml.Behaviors": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "sZlq6FFzNNzYmHK+vARWFpxtDY4XUdnU6q6zVIm4l1iQ3/ZXor4SeUnYDdd3lFZtoJ9yc8K2g4X7d/lVEgV9tA==", "contentHash": "XP0wLpGsMKsz9d66CqHj2T8Q+pYYnlO3FXwwX3nPI/PO/YC6RBJwMDye29D+Cy11NuRgfRBvRej6sBxghI+BgA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactions": "0.10.13.2", "Avalonia.Xaml.Interactions": "0.10.13.3",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactions": { "Avalonia.Xaml.Interactions": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "bMgr5NtEjJ/qvf+1JD4T4rRt9AbZNnJdYCx5cBfGyXHETbeliTJAt07mqTahcoPY1G2FskF1OSIW5ytljbviLw==", "contentHash": "kS21Q3saItFL15/ctDjUAbDoqxt0/fTKBjXtxMyQGKoH1ZKU8YJPNwqGWts2MEGXTe4N7xlx2qHcDJlb0EbSxA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactivity": { "Avalonia.Xaml.Interactivity": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "OIjK5XCsUrBCqog8lxI/DEbubaNQRwy8e8Px4i3dvllomU28EYsJm4XtrPVakY7MC+we825uXY47tsO/benLug==", "contentHash": "twYpSqHOsVWoe2uayY7Q0EkDEmah6xkXGE/83jIDvi0ERZ8uvtN65bBDXFNk0fmwdidPb2EHllUgtRrT0m7PuA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13" "Avalonia": "0.10.13"
} }
@ -1778,7 +1778,7 @@
"Avalonia.Diagnostics": "0.10.13", "Avalonia.Diagnostics": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Flurl.Http": "3.2.0", "Flurl.Http": "3.2.0",
@ -1799,7 +1799,7 @@
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Material.Icons.Avalonia": "1.0.2", "Material.Icons.Avalonia": "1.0.2",
@ -1816,7 +1816,7 @@
"Artemis.UI.Shared": "1.0.0", "Artemis.UI.Shared": "1.0.0",
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"Ninject": "3.3.4", "Ninject": "3.3.4",
"NoStringEvaluating": "2.2.2", "NoStringEvaluating": "2.2.2",
"ReactiveUI": "17.1.50", "ReactiveUI": "17.1.50",

24
src/Artemis.UI.MacOS/packages.lock.json
View File

@ -157,27 +157,27 @@
}, },
"Avalonia.Xaml.Behaviors": { "Avalonia.Xaml.Behaviors": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "sZlq6FFzNNzYmHK+vARWFpxtDY4XUdnU6q6zVIm4l1iQ3/ZXor4SeUnYDdd3lFZtoJ9yc8K2g4X7d/lVEgV9tA==", "contentHash": "XP0wLpGsMKsz9d66CqHj2T8Q+pYYnlO3FXwwX3nPI/PO/YC6RBJwMDye29D+Cy11NuRgfRBvRej6sBxghI+BgA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactions": "0.10.13.2", "Avalonia.Xaml.Interactions": "0.10.13.3",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactions": { "Avalonia.Xaml.Interactions": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "bMgr5NtEjJ/qvf+1JD4T4rRt9AbZNnJdYCx5cBfGyXHETbeliTJAt07mqTahcoPY1G2FskF1OSIW5ytljbviLw==", "contentHash": "kS21Q3saItFL15/ctDjUAbDoqxt0/fTKBjXtxMyQGKoH1ZKU8YJPNwqGWts2MEGXTe4N7xlx2qHcDJlb0EbSxA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactivity": { "Avalonia.Xaml.Interactivity": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "OIjK5XCsUrBCqog8lxI/DEbubaNQRwy8e8Px4i3dvllomU28EYsJm4XtrPVakY7MC+we825uXY47tsO/benLug==", "contentHash": "twYpSqHOsVWoe2uayY7Q0EkDEmah6xkXGE/83jIDvi0ERZ8uvtN65bBDXFNk0fmwdidPb2EHllUgtRrT0m7PuA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13" "Avalonia": "0.10.13"
} }
@ -1778,7 +1778,7 @@
"Avalonia.Diagnostics": "0.10.13", "Avalonia.Diagnostics": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Flurl.Http": "3.2.0", "Flurl.Http": "3.2.0",
@ -1799,7 +1799,7 @@
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Material.Icons.Avalonia": "1.0.2", "Material.Icons.Avalonia": "1.0.2",
@ -1816,7 +1816,7 @@
"Artemis.UI.Shared": "1.0.0", "Artemis.UI.Shared": "1.0.0",
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"Ninject": "3.3.4", "Ninject": "3.3.4",
"NoStringEvaluating": "2.2.2", "NoStringEvaluating": "2.2.2",
"ReactiveUI": "17.1.50", "ReactiveUI": "17.1.50",

2
src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
View File

@ -21,7 +21,7 @@
<PackageReference Include="Avalonia" Version="0.10.13" /> <PackageReference Include="Avalonia" Version="0.10.13" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
<PackageReference Include="Avalonia.Svg.Skia" Version="0.10.12" /> <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.12" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.2" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.3" />
<PackageReference Include="DynamicData" Version="7.5.4" /> <PackageReference Include="DynamicData" Version="7.5.4" />
<PackageReference Include="FluentAvaloniaUI" Version="1.3.4" /> <PackageReference Include="FluentAvaloniaUI" Version="1.3.4" />
<PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" /> <PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />

57
src/Artemis.UI.Shared/Behaviors/SliderPointerReleasedBindingBehavior.cs Normal file
View File

@ -0,0 +1,57 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.Interactivity;
using Avalonia.Xaml.Interactivity;
using FluentAvalonia.UI.Controls;
namespace Artemis.UI.Shared.Behaviors;
/// <summary>
/// Represents a behavior that can be used to make a slider only update it's binding on pointer release.
/// </summary>
public class SliderPointerReleasedBindingBehavior : Behavior<Slider>
{
public static readonly StyledProperty<double> ValueProperty = AvaloniaProperty.Register<LostFocusTextBoxBindingBehavior, double>(
nameof(Value), defaultBindingMode: BindingMode.TwoWay);
static SliderPointerReleasedBindingBehavior()
{
ValueProperty.Changed.Subscribe(e => ((SliderPointerReleasedBindingBehavior) e.Sender).OnBindingValueChanged());
}
public double Value
{
get => GetValue(ValueProperty);
set => SetValue(ValueProperty, value);
}
/// <inheritdoc />
protected override void OnAttached()
{
if (AssociatedObject != null)
AssociatedObject.PointerCaptureLost += OnPointerCaptureLost;
base.OnAttached();
}
/// <inheritdoc />
protected override void OnDetaching()
{
if (AssociatedObject != null)
AssociatedObject.PointerCaptureLost -= OnPointerCaptureLost;
base.OnDetaching();
}
private void OnPointerCaptureLost(object? sender, RoutedEventArgs e)
{
if (AssociatedObject != null)
Value = AssociatedObject.Value;
}
private void OnBindingValueChanged()
{
if (AssociatedObject != null)
AssociatedObject.Value = Value;
}
}

20
src/Artemis.UI.Shared/packages.lock.json
View File

@ -42,13 +42,13 @@
}, },
"Avalonia.Xaml.Behaviors": { "Avalonia.Xaml.Behaviors": {
"type": "Direct", "type": "Direct",
"requested": "[0.10.13.2, )", "requested": "[0.10.13.3, )",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "sZlq6FFzNNzYmHK+vARWFpxtDY4XUdnU6q6zVIm4l1iQ3/ZXor4SeUnYDdd3lFZtoJ9yc8K2g4X7d/lVEgV9tA==", "contentHash": "XP0wLpGsMKsz9d66CqHj2T8Q+pYYnlO3FXwwX3nPI/PO/YC6RBJwMDye29D+Cy11NuRgfRBvRej6sBxghI+BgA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactions": "0.10.13.2", "Avalonia.Xaml.Interactions": "0.10.13.3",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"DynamicData": { "DynamicData": {
@ -217,17 +217,17 @@
}, },
"Avalonia.Xaml.Interactions": { "Avalonia.Xaml.Interactions": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "bMgr5NtEjJ/qvf+1JD4T4rRt9AbZNnJdYCx5cBfGyXHETbeliTJAt07mqTahcoPY1G2FskF1OSIW5ytljbviLw==", "contentHash": "kS21Q3saItFL15/ctDjUAbDoqxt0/fTKBjXtxMyQGKoH1ZKU8YJPNwqGWts2MEGXTe4N7xlx2qHcDJlb0EbSxA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactivity": { "Avalonia.Xaml.Interactivity": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "OIjK5XCsUrBCqog8lxI/DEbubaNQRwy8e8Px4i3dvllomU28EYsJm4XtrPVakY7MC+we825uXY47tsO/benLug==", "contentHash": "twYpSqHOsVWoe2uayY7Q0EkDEmah6xkXGE/83jIDvi0ERZ8uvtN65bBDXFNk0fmwdidPb2EHllUgtRrT0m7PuA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13" "Avalonia": "0.10.13"
} }

24
src/Artemis.UI.Windows/packages.lock.json
View File

@ -173,27 +173,27 @@
}, },
"Avalonia.Xaml.Behaviors": { "Avalonia.Xaml.Behaviors": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "sZlq6FFzNNzYmHK+vARWFpxtDY4XUdnU6q6zVIm4l1iQ3/ZXor4SeUnYDdd3lFZtoJ9yc8K2g4X7d/lVEgV9tA==", "contentHash": "XP0wLpGsMKsz9d66CqHj2T8Q+pYYnlO3FXwwX3nPI/PO/YC6RBJwMDye29D+Cy11NuRgfRBvRej6sBxghI+BgA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactions": "0.10.13.2", "Avalonia.Xaml.Interactions": "0.10.13.3",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactions": { "Avalonia.Xaml.Interactions": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "bMgr5NtEjJ/qvf+1JD4T4rRt9AbZNnJdYCx5cBfGyXHETbeliTJAt07mqTahcoPY1G2FskF1OSIW5ytljbviLw==", "contentHash": "kS21Q3saItFL15/ctDjUAbDoqxt0/fTKBjXtxMyQGKoH1ZKU8YJPNwqGWts2MEGXTe4N7xlx2qHcDJlb0EbSxA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactivity": { "Avalonia.Xaml.Interactivity": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "OIjK5XCsUrBCqog8lxI/DEbubaNQRwy8e8Px4i3dvllomU28EYsJm4XtrPVakY7MC+we825uXY47tsO/benLug==", "contentHash": "twYpSqHOsVWoe2uayY7Q0EkDEmah6xkXGE/83jIDvi0ERZ8uvtN65bBDXFNk0fmwdidPb2EHllUgtRrT0m7PuA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13" "Avalonia": "0.10.13"
} }
@ -1794,7 +1794,7 @@
"Avalonia.Diagnostics": "0.10.13", "Avalonia.Diagnostics": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Flurl.Http": "3.2.0", "Flurl.Http": "3.2.0",
@ -1815,7 +1815,7 @@
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Material.Icons.Avalonia": "1.0.2", "Material.Icons.Avalonia": "1.0.2",
@ -1832,7 +1832,7 @@
"Artemis.UI.Shared": "1.0.0", "Artemis.UI.Shared": "1.0.0",
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"Ninject": "3.3.4", "Ninject": "3.3.4",
"NoStringEvaluating": "2.2.2", "NoStringEvaluating": "2.2.2",
"ReactiveUI": "17.1.50", "ReactiveUI": "17.1.50",

2
src/Artemis.UI/Artemis.UI.csproj
View File

@ -22,7 +22,7 @@
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" /> <PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
<PackageReference Include="Avalonia.Svg.Skia" Version="0.10.12" /> <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.12" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.2" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.3" />
<PackageReference Include="DynamicData" Version="7.5.4" /> <PackageReference Include="DynamicData" Version="7.5.4" />
<PackageReference Include="FluentAvaloniaUI" Version="1.3.4" /> <PackageReference Include="FluentAvaloniaUI" Version="1.3.4" />
<PackageReference Include="Flurl.Http" Version="3.2.0" /> <PackageReference Include="Flurl.Http" Version="3.2.0" />

4
src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/Tools/TransformToolView.axaml.cs
View File

@ -358,7 +358,7 @@ public class TransformToolView : ReactiveUserControl<TransformToolViewModel>
float startAngle = CalculateAngleToAnchor(e); float startAngle = CalculateAngleToAnchor(e);
_rotationDragOffset = startAngle - ViewModel.Layer.Transform.Rotation; _rotationDragOffset = startAngle - ViewModel.Layer.Transform.Rotation;
ViewModel.StartRotation(); ViewModel.StartRotation();
ToolTip.SetTip((Control)sender, $"{ViewModel.Layer.Transform.Rotation.CurrentValue:F3}°"); ToolTip.SetTip((Control)sender, $"{ViewModel.Layer.Transform.Rotation.CurrentValue:F3}°");
ToolTip.SetIsOpen((Control)sender, true); ToolTip.SetIsOpen((Control)sender, true);
e.Pointer.Capture((IInputElement?) sender); e.Pointer.Capture((IInputElement?) sender);
@ -376,7 +376,7 @@ public class TransformToolView : ReactiveUserControl<TransformToolViewModel>
angle += 360; angle += 360;
ViewModel?.UpdateRotation(angle, e.KeyModifiers.HasFlag(KeyModifiers.Control)); ViewModel?.UpdateRotation(angle, e.KeyModifiers.HasFlag(KeyModifiers.Control));
ToolTip.SetTip((Control)sender, $"{ViewModel.Layer.Transform.Rotation.CurrentValue:F3}°"); ToolTip.SetTip((Control)sender, $"{ViewModel.Layer.Transform.Rotation.CurrentValue:F3}°");
e.Handled = true; e.Handled = true;
} }

24
src/Artemis.UI/packages.lock.json
View File

@ -76,13 +76,13 @@
}, },
"Avalonia.Xaml.Behaviors": { "Avalonia.Xaml.Behaviors": {
"type": "Direct", "type": "Direct",
"requested": "[0.10.13.2, )", "requested": "[0.10.13.3, )",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "sZlq6FFzNNzYmHK+vARWFpxtDY4XUdnU6q6zVIm4l1iQ3/ZXor4SeUnYDdd3lFZtoJ9yc8K2g4X7d/lVEgV9tA==", "contentHash": "XP0wLpGsMKsz9d66CqHj2T8Q+pYYnlO3FXwwX3nPI/PO/YC6RBJwMDye29D+Cy11NuRgfRBvRej6sBxghI+BgA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactions": "0.10.13.2", "Avalonia.Xaml.Interactions": "0.10.13.3",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"DynamicData": { "DynamicData": {
@ -267,17 +267,17 @@
}, },
"Avalonia.Xaml.Interactions": { "Avalonia.Xaml.Interactions": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "bMgr5NtEjJ/qvf+1JD4T4rRt9AbZNnJdYCx5cBfGyXHETbeliTJAt07mqTahcoPY1G2FskF1OSIW5ytljbviLw==", "contentHash": "kS21Q3saItFL15/ctDjUAbDoqxt0/fTKBjXtxMyQGKoH1ZKU8YJPNwqGWts2MEGXTe4N7xlx2qHcDJlb0EbSxA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactivity": { "Avalonia.Xaml.Interactivity": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "OIjK5XCsUrBCqog8lxI/DEbubaNQRwy8e8Px4i3dvllomU28EYsJm4XtrPVakY7MC+we825uXY47tsO/benLug==", "contentHash": "twYpSqHOsVWoe2uayY7Q0EkDEmah6xkXGE/83jIDvi0ERZ8uvtN65bBDXFNk0fmwdidPb2EHllUgtRrT0m7PuA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13" "Avalonia": "0.10.13"
} }
@ -1786,7 +1786,7 @@
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Material.Icons.Avalonia": "1.0.2", "Material.Icons.Avalonia": "1.0.2",
@ -1803,7 +1803,7 @@
"Artemis.UI.Shared": "1.0.0", "Artemis.UI.Shared": "1.0.0",
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"Ninject": "3.3.4", "Ninject": "3.3.4",
"NoStringEvaluating": "2.2.2", "NoStringEvaluating": "2.2.2",
"ReactiveUI": "17.1.50", "ReactiveUI": "17.1.50",

2
src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
View File

@ -10,7 +10,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.13" /> <PackageReference Include="Avalonia" Version="0.10.13" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.2" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.3" />
<PackageReference Include="Ninject" Version="3.3.4" /> <PackageReference Include="Ninject" Version="3.3.4" />
<PackageReference Include="NoStringEvaluating" Version="2.2.2" /> <PackageReference Include="NoStringEvaluating" Version="2.2.2" />
<PackageReference Include="ReactiveUI" Version="17.1.50" /> <PackageReference Include="ReactiveUI" Version="17.1.50" />

22
src/Artemis.VisualScripting/packages.lock.json
View File

@ -30,13 +30,13 @@
}, },
"Avalonia.Xaml.Behaviors": { "Avalonia.Xaml.Behaviors": {
"type": "Direct", "type": "Direct",
"requested": "[0.10.13.2, )", "requested": "[0.10.13.3, )",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "sZlq6FFzNNzYmHK+vARWFpxtDY4XUdnU6q6zVIm4l1iQ3/ZXor4SeUnYDdd3lFZtoJ9yc8K2g4X7d/lVEgV9tA==", "contentHash": "XP0wLpGsMKsz9d66CqHj2T8Q+pYYnlO3FXwwX3nPI/PO/YC6RBJwMDye29D+Cy11NuRgfRBvRej6sBxghI+BgA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactions": "0.10.13.2", "Avalonia.Xaml.Interactions": "0.10.13.3",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Ninject": { "Ninject": {
@ -197,17 +197,17 @@
}, },
"Avalonia.Xaml.Interactions": { "Avalonia.Xaml.Interactions": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "bMgr5NtEjJ/qvf+1JD4T4rRt9AbZNnJdYCx5cBfGyXHETbeliTJAt07mqTahcoPY1G2FskF1OSIW5ytljbviLw==", "contentHash": "kS21Q3saItFL15/ctDjUAbDoqxt0/fTKBjXtxMyQGKoH1ZKU8YJPNwqGWts2MEGXTe4N7xlx2qHcDJlb0EbSxA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.Xaml.Interactivity": "0.10.13.2" "Avalonia.Xaml.Interactivity": "0.10.13.3"
} }
}, },
"Avalonia.Xaml.Interactivity": { "Avalonia.Xaml.Interactivity": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.10.13.2", "resolved": "0.10.13.3",
"contentHash": "OIjK5XCsUrBCqog8lxI/DEbubaNQRwy8e8Px4i3dvllomU28EYsJm4XtrPVakY7MC+we825uXY47tsO/benLug==", "contentHash": "twYpSqHOsVWoe2uayY7Q0EkDEmah6xkXGE/83jIDvi0ERZ8uvtN65bBDXFNk0fmwdidPb2EHllUgtRrT0m7PuA==",
"dependencies": { "dependencies": {
"Avalonia": "0.10.13" "Avalonia": "0.10.13"
} }
@ -1736,7 +1736,7 @@
"Avalonia": "0.10.13", "Avalonia": "0.10.13",
"Avalonia.ReactiveUI": "0.10.13", "Avalonia.ReactiveUI": "0.10.13",
"Avalonia.Svg.Skia": "0.10.12", "Avalonia.Svg.Skia": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.13.2", "Avalonia.Xaml.Behaviors": "0.10.13.3",
"DynamicData": "7.5.4", "DynamicData": "7.5.4",
"FluentAvaloniaUI": "1.3.4", "FluentAvaloniaUI": "1.3.4",
"Material.Icons.Avalonia": "1.0.2", "Material.Icons.Avalonia": "1.0.2",