diff --git a/build/pack.ps1 b/build/pack.ps1
index f4f8e00dd..0563d782d 100644
--- a/build/pack.ps1
+++ b/build/pack.ps1
@@ -9,7 +9,8 @@ param([string]$configuration = "Debug", [string]$nupkgOutputPath = "./nupkg")
[Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharp.Xamarin.Forms/LiveChartsCore.SkiaSharpView.Xamarin.Forms.csproj")
[Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj")
[Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj")
- [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj")
+ [Project]::new("./src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj", $true)
+ [Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj", $true)
[Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/LiveChartsCore.SkiaSharpView.Uno.csproj", $true)
[Project]::new("./src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj", $true)
[Project]::new(
@@ -102,7 +103,7 @@ function Add-Pack {
}
if ($project.packingMethod -eq "msbuild") {
- & $msbuild $project.src -t:pack /p:configuration=$configuration
+ & $msbuild $project.src -t:pack /p:configuration=$configuration /restore
$folder = $project.GetFolder()
diff --git a/samples/BlazorSample/Pages/Axes/LabelsFormat2.razor b/samples/BlazorSample/Pages/Axes/LabelsFormat2.razor
index 100b001b6..55641d287 100644
--- a/samples/BlazorSample/Pages/Axes/LabelsFormat2.razor
+++ b/samples/BlazorSample/Pages/Axes/LabelsFormat2.razor
@@ -17,7 +17,7 @@
protected async override Task OnInitializedAsync()
{
- // On .net7, SkiaSharp 2.88.5 and SkiaSharp.HarfBuzz 2.88.5 the MatchCharacter does not load the font.
+ // On .net7, SkiaSharp 2.88.6 and SkiaSharp.HarfBuzz 2.88.6 the MatchCharacter does not load the font.
// The MatchCharacter function loads a font from the system,
// it seems that on WASM we must load the font manually.
diff --git a/samples/MauiSample/General/Scrollable/View.xaml b/samples/MauiSample/General/Scrollable/View.xaml
index 96644a7e4..09ac66354 100644
--- a/samples/MauiSample/General/Scrollable/View.xaml
+++ b/samples/MauiSample/General/Scrollable/View.xaml
@@ -9,12 +9,6 @@
-
-
diff --git a/src/LiveChartsCore.Behaviours/AssemblyInfo.cs b/src/LiveChartsCore.Behaviours/AssemblyInfo.cs
new file mode 100644
index 000000000..77fde877e
--- /dev/null
+++ b/src/LiveChartsCore.Behaviours/AssemblyInfo.cs
@@ -0,0 +1,26 @@
+// The MIT License(MIT)
+//
+// Copyright(c) 2021 Alberto Rodriguez Orozco & LiveCharts Contributors
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#if !DEBUG
+using System.Reflection;
+[assembly: AssemblyKeyFile("./../../LiveCharts.snk")]
+#endif
diff --git a/src/LiveChartsCore.Behaviours/ChartBehaviour.Android.cs b/src/LiveChartsCore.Behaviours/ChartBehaviour.Android.cs
index 1819e8ad1..a324dcc2d 100644
--- a/src/LiveChartsCore.Behaviours/ChartBehaviour.Android.cs
+++ b/src/LiveChartsCore.Behaviours/ChartBehaviour.Android.cs
@@ -22,6 +22,7 @@
#if ANDROID
+using System;
using Android.Views;
using LiveChartsCore.Drawing;
diff --git a/src/LiveChartsCore.Behaviours/ChartBehaviour.MacCatalyst.cs b/src/LiveChartsCore.Behaviours/ChartBehaviour.MacCatalyst.cs
index fab6f4a77..dbf5b8e57 100644
--- a/src/LiveChartsCore.Behaviours/ChartBehaviour.MacCatalyst.cs
+++ b/src/LiveChartsCore.Behaviours/ChartBehaviour.MacCatalyst.cs
@@ -23,6 +23,7 @@
#if MACCATALYST || IOS
using System;
+using CoreGraphics;
using LiveChartsCore.Drawing;
using UIKit;
diff --git a/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj b/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj
index 00e68bb6d..c4a21423e 100644
--- a/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj
+++ b/src/LiveChartsCore.Behaviours/LiveChartsCore.Behaviours.csproj
@@ -3,8 +3,25 @@
net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst
$(TargetFrameworks);net6.0-windows10.0.19041.0
- enable
enable
+
+ 11.0
+ 13.1
+ 21.0
+ 10.0.17763.0
+ 10.0.17763.0
+ 6.5
+
+ LiveChartsCore.Behaviours
+ LiveChartsCore.Behaviours
+ 2.0.0-rc1.1
+ icon.png
+ Adds user interaction for touch screens, touch pads and mouse.
+ MIT
+ BetoRodriguez
+ true
+ snupkg
+ https://github.com/beto-rodriguez/LiveCharts2
@@ -17,4 +34,8 @@
+
+
+
+
diff --git a/src/LiveChartsCore.Behaviours/images/icon.png b/src/LiveChartsCore.Behaviours/images/icon.png
new file mode 100644
index 000000000..d0c1c5660
Binary files /dev/null and b/src/LiveChartsCore.Behaviours/images/icon.png differ
diff --git a/src/LiveChartsCore/Kernel/Coordinate.cs b/src/LiveChartsCore/Kernel/Coordinate.cs
index e452097df..80f0fef31 100644
--- a/src/LiveChartsCore/Kernel/Coordinate.cs
+++ b/src/LiveChartsCore/Kernel/Coordinate.cs
@@ -154,4 +154,13 @@ private Coordinate(bool isEmpty) : this(0, 0, 0, 0, 0, 0, Error.Empty)
/// Gets or sets the coordinate error.
///
public readonly Error PointError { get; }
+
+ ///
+ /// Builds a string that represents the current coordinate.
+ ///
+ ///
+ public override string ToString()
+ {
+ return $"({SecondaryValue}, {PrimaryValue})";
+ }
}
diff --git a/src/LiveChartsCore/LiveChartsCore.csproj b/src/LiveChartsCore/LiveChartsCore.csproj
index b01a6cf90..1b55049fc 100644
--- a/src/LiveChartsCore/LiveChartsCore.csproj
+++ b/src/LiveChartsCore/LiveChartsCore.csproj
@@ -17,7 +17,7 @@
LiveChartsCore
LiveChartsCore
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for .Net, this is the core package probably you need another package also unless you are building your own backed.
MIT
diff --git a/src/LiveChartsCore/Measure/Bounds.cs b/src/LiveChartsCore/Measure/Bounds.cs
index 09c4e78ff..3d54ca004 100644
--- a/src/LiveChartsCore/Measure/Bounds.cs
+++ b/src/LiveChartsCore/Measure/Bounds.cs
@@ -33,6 +33,17 @@ public class Bounds
public Bounds()
{ }
+ ///
+ /// Creates a new instance of the class.
+ ///
+ /// The maximum value.
+ /// The minimum value.
+ public Bounds(double min, double max)
+ {
+ Max = max;
+ Min = min;
+ }
+
///
/// Creates a new instance of the class. based on the given .
///
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj
index 5ef6b2303..4c41add9d 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Avalonia/LiveChartsCore.SkiaSharpView.Avalonia.csproj
@@ -6,7 +6,7 @@
netcoreapp2.0;netstandard2.0;net462;net6.0
LiveChartsCore.SkiaSharpView.Avalonia
LiveChartsCore.SkiaSharpView.Avalonia
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for AvaloniaUI.
MIT
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj
index b36a524c7..edabebb38 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj
@@ -7,7 +7,7 @@
net462;netcoreapp3.1
LiveChartsCore.SkiaSharpView.WPF
LiveChartsCore.SkiaSharpView.WPF
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for WPF.
MIT
@@ -23,7 +23,7 @@
-
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj
index a9a1e299e..25a318d91 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj
@@ -9,7 +9,7 @@
net462;netcoreapp3.1
LiveChartsCore.SkiaSharpView.WinForms
LiveChartsCore.SkiaSharpView.WinForms
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for WindowsForms.
MIT
@@ -25,7 +25,7 @@
-
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.Xamarin.Forms/LiveChartsCore.SkiaSharpView.Xamarin.Forms.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.Xamarin.Forms/LiveChartsCore.SkiaSharpView.Xamarin.Forms.csproj
index 2565daf40..276b72d4a 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharp.Xamarin.Forms/LiveChartsCore.SkiaSharpView.Xamarin.Forms.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharp.Xamarin.Forms/LiveChartsCore.SkiaSharpView.Xamarin.Forms.csproj
@@ -6,7 +6,7 @@
netstandard2.0;
LiveChartsCore.SkiaSharpView.XamarinForms
LiveChartsCore.SkiaSharpView.XamarinForms
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for XamarinForms.
MIT
@@ -22,7 +22,7 @@
-
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj
index d3a51224c..d3a202996 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharp/LiveChartsCore.SkiaSharpView.csproj
@@ -17,7 +17,7 @@
LiveChartsCore.SkiaSharpView
LiveChartsCore.SkiaSharpView
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for .Net, this package contains the SkiaSharp backend.
MIT
@@ -37,8 +37,8 @@
-
-
+
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj
index 8823523ca..b4b593db5 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj
@@ -17,7 +17,7 @@
net6.0
enable
enable
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for Blazor.
MIT
@@ -45,7 +45,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj
index b612c43a0..7cb1d4c62 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Eto/LiveChartsCore.SkiaSharpView.Eto.csproj
@@ -7,7 +7,7 @@
netstandard2.0
LiveChartsCore.SkiaSharpView.Eto
LiveChartsCore.SkiaSharpView.Eto
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for Eto.Forms.
MIT
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj
index ad7e6f5d8..a2fddb185 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj
@@ -15,7 +15,7 @@
10.0.17763.0
6.5
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for Maui.
MIT
@@ -28,7 +28,7 @@
-
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.nuspec b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.nuspec
index 1acd685e2..c91ab9759 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.nuspec
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.nuspec
@@ -2,7 +2,7 @@
LiveChartsCore.SkiaSharpView.Maui
- 2.0.0-rc1
+ 2.0.0-rc1.1
LiveChartsCore.SkiaSharpView.Maui
BetoRodriguez
true
@@ -16,24 +16,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.xaml.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.xaml.cs
index 977494d68..7f8779ea6 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.xaml.cs
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PieChart.xaml.cs
@@ -91,7 +91,6 @@ public PieChart()
chartBehaviour.Pressed += OnPressed;
chartBehaviour.Moved += OnMoved;
chartBehaviour.Released += OnReleased;
- chartBehaviour.Scrolled += OnScrolled;
chartBehaviour.Exited += OnExited;
chartBehaviour.On(this);
@@ -704,13 +703,6 @@ private void OnReleased(object? sender, Behaviours.Events.PressedEventArgs args)
_core?.InvokePointerUp(args.Location, args.IsSecondaryPress);
}
- private void OnScrolled(object? sender, Behaviours.Events.ScrollEventArgs args)
- {
- if (_core is null) throw new Exception("core not found");
- var c = (CartesianChart)_core;
- c.Zoom(args.Location, args.ScrollDelta > 0 ? ZoomDirection.ZoomIn : ZoomDirection.ZoomOut);
- }
-
private void OnExited(object? sender, Behaviours.Events.EventArgs args)
{
_core?.InvokePointerLeft();
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.xaml.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.xaml.cs
index 76246d25f..5413ec4bd 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.xaml.cs
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/PolarChart.xaml.cs
@@ -102,7 +102,6 @@ public PolarChart()
chartBehaviour.Pressed += OnPressed;
chartBehaviour.Moved += OnMoved;
chartBehaviour.Released += OnReleased;
- chartBehaviour.Scrolled += OnScrolled;
chartBehaviour.Exited += OnExited;
chartBehaviour.On(this);
@@ -780,13 +779,6 @@ private void OnReleased(object? sender, Behaviours.Events.PressedEventArgs args)
_core?.InvokePointerUp(args.Location, args.IsSecondaryPress);
}
- private void OnScrolled(object? sender, Behaviours.Events.ScrollEventArgs args)
- {
- if (_core is null) throw new Exception("core not found");
- var c = (CartesianChart)_core;
- c.Zoom(args.Location, args.ScrollDelta > 0 ? ZoomDirection.ZoomIn : ZoomDirection.ZoomOut);
- }
-
private void OnExited(object? sender, Behaviours.Events.EventArgs args)
{
_core?.InvokePointerLeft();
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj
index f76bbd54e..062f81a4f 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/LiveChartsCore.SkiaSharpView.Uno.WinUI.csproj
@@ -7,7 +7,7 @@
enable
11.0
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for Uno.WinUI.
MIT
@@ -22,8 +22,8 @@
bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
-
-
+
+
@@ -65,4 +65,7 @@
+
+
+
\ No newline at end of file
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PieChart.xaml.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PieChart.xaml.cs
index 2590cac9e..e299023c1 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PieChart.xaml.cs
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PieChart.xaml.cs
@@ -649,7 +649,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
chartBehaviour.Pressed += OnPressed;
chartBehaviour.Moved += OnMoved;
chartBehaviour.Released += OnReleased;
- chartBehaviour.Scrolled += OnScrolled;
chartBehaviour.Exited += OnExited;
chartBehaviour.On(this);
@@ -694,13 +693,6 @@ private void OnReleased(object? sender, Behaviours.Events.PressedEventArgs args)
_core?.InvokePointerUp(args.Location, args.IsSecondaryPress);
}
- private void OnScrolled(object? sender, Behaviours.Events.ScrollEventArgs args)
- {
- if (_core is null) throw new Exception("core not found");
- var c = (CartesianChart)_core;
- c.Zoom(args.Location, args.ScrollDelta > 0 ? ZoomDirection.ZoomIn : ZoomDirection.ZoomOut);
- }
-
private void OnExited(object? sender, Behaviours.Events.EventArgs args)
{
_core?.InvokePointerLeft();
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PolarChart.xaml.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PolarChart.xaml.cs
index e0ce5327f..fde88a405 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PolarChart.xaml.cs
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/PolarChart.xaml.cs
@@ -719,7 +719,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
chartBehaviour.Pressed += OnPressed;
chartBehaviour.Moved += OnMoved;
chartBehaviour.Released += OnReleased;
- chartBehaviour.Scrolled += OnScrolled;
chartBehaviour.Exited += OnExited;
chartBehaviour.On(this);
@@ -774,13 +773,6 @@ private void OnReleased(object? sender, Behaviours.Events.PressedEventArgs args)
_core?.InvokePointerUp(args.Location, args.IsSecondaryPress);
}
- private void OnScrolled(object? sender, Behaviours.Events.ScrollEventArgs args)
- {
- if (_core is null) throw new Exception("core not found");
- var c = (CartesianChart)_core;
- c.Zoom(args.Location, args.ScrollDelta > 0 ? ZoomDirection.ZoomIn : ZoomDirection.ZoomOut);
- }
-
private void OnExited(object? sender, Behaviours.Events.EventArgs args)
{
_core?.InvokePointerLeft();
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/images/icon.png b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/images/icon.png
new file mode 100644
index 000000000..d0c1c5660
Binary files /dev/null and b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno.WinUI/images/icon.png differ
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/LiveChartsCore.SkiaSharpView.Uno.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/LiveChartsCore.SkiaSharpView.Uno.csproj
index ff6aa7054..f0ff531cb 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/LiveChartsCore.SkiaSharpView.Uno.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/LiveChartsCore.SkiaSharpView.Uno.csproj
@@ -17,7 +17,7 @@
enable
11.0
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for Uno.
MIT
@@ -35,7 +35,7 @@
- 2.88.5
+ 2.88.6
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PieChart.xaml.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PieChart.xaml.cs
index 897c43284..c75e965b8 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PieChart.xaml.cs
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PieChart.xaml.cs
@@ -648,7 +648,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
chartBehaviour.Pressed += OnPressed;
chartBehaviour.Moved += OnMoved;
chartBehaviour.Released += OnReleased;
- chartBehaviour.Scrolled += OnScrolled;
chartBehaviour.Pinched += OnPinched;
chartBehaviour.Exited += OnExited;
@@ -694,13 +693,6 @@ private void OnReleased(object? sender, Behaviours.Events.PressedEventArgs args)
_core?.InvokePointerUp(args.Location, args.IsSecondaryPress);
}
- private void OnScrolled(object? sender, Behaviours.Events.ScrollEventArgs args)
- {
- if (_core is null) throw new Exception("core not found");
- var c = (CartesianChart)_core;
- c.Zoom(args.Location, args.ScrollDelta > 0 ? ZoomDirection.ZoomIn : ZoomDirection.ZoomOut);
- }
-
private void OnPinched(object? sender, Behaviours.Events.PinchEventArgs args)
{
if (_core is null) return;
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PolarChart.xaml.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PolarChart.xaml.cs
index 668f7a3c2..df50a3621 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PolarChart.xaml.cs
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.Uno/PolarChart.xaml.cs
@@ -713,7 +713,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
chartBehaviour.Pressed += OnPressed;
chartBehaviour.Moved += OnMoved;
chartBehaviour.Released += OnReleased;
- chartBehaviour.Scrolled += OnScrolled;
chartBehaviour.Pinched += OnPinched;
chartBehaviour.Exited += OnExited;
@@ -769,13 +768,6 @@ private void OnReleased(object? sender, Behaviours.Events.PressedEventArgs args)
_core?.InvokePointerUp(args.Location, args.IsSecondaryPress);
}
- private void OnScrolled(object? sender, Behaviours.Events.ScrollEventArgs args)
- {
- if (_core is null) throw new Exception("core not found");
- var c = (CartesianChart)_core;
- c.Zoom(args.Location, args.ScrollDelta > 0 ? ZoomDirection.ZoomIn : ZoomDirection.ZoomOut);
- }
-
private void OnPinched(object? sender, Behaviours.Events.PinchEventArgs args)
{
if (_core is null) return;
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj
index fdf7959b0..bc3b89e6c 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.csproj
@@ -9,7 +9,7 @@
win10-x86;win10-x64;win10-arm64
true
- 2.0.0-rc1
+ 2.0.0-rc1.1
icon.png
Simple, flexible, interactive and powerful data visualization for WindowsAppSDK.
MIT
@@ -33,7 +33,7 @@
-
+
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.nuspec b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.nuspec
index dffa44e9c..02528c990 100644
--- a/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.nuspec
+++ b/src/skiasharp/LiveChartsCore.SkiaSharpView.WinUI/LiveChartsCore.SkiaSharpView.WinUI.nuspec
@@ -2,7 +2,7 @@
LiveChartsCore.SkiaSharpView.WinUI
- 2.0.0-rc1
+ 2.0.0-rc1.1
LiveChartsCore.SkiaSharpView.WinUI
BetoRodriguez
true
@@ -17,9 +17,9 @@
-
-
-
+
+
+