diff --git a/Avalonia.sln b/Avalonia.sln
index 3c2fc7437b..4e7b4cc318 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -221,8 +221,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.Loader
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "samples\Sandbox\Sandbox.csproj", "{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroComGenerator", "src\tools\MicroComGenerator\MicroComGenerator.csproj", "{AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.MicroCom", "src\Avalonia.MicroCom\Avalonia.MicroCom.csproj", "{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniMvvm", "samples\MiniMvvm\MiniMvvm.csproj", "{BC594FD5-4AF2-409E-A1E6-04123F54D7C5}"
@@ -2027,30 +2025,6 @@ Global
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhone.Build.0 = Release|Any CPU
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhone.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|Any CPU.Build.0 = Release|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.ActiveCfg = Release|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhone.Build.0 = Release|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{FE2F3E5E-1E34-4972-8DC1-5C2C588E5ECE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@@ -2253,7 +2227,6 @@ Global
{3C84E04B-36CF-4D0D-B965-C26DD649D1F3} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
{909A8CBD-7D0E-42FD-B841-022AD8925820} = {8B6A8209-894F-4BA1-B880-965FD453982C}
{11BE52AF-E2DD-4CF0-B19A-05285ACAF571} = {9B9E3891-2366-4253-A952-D08BCEB71098}
- {AEC9031E-06EA-4A9E-9E7F-7D7C719404DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
{BC594FD5-4AF2-409E-A1E6-04123F54D7C5} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{25831348-EB2A-483E-9576-E8F6528674A5} = {86A3F706-DC3C-43C6-BE1B-B98F5BAAA268}
{C08E9894-AA92-426E-BF56-033E262CAD3E} = {9B9E3891-2366-4253-A952-D08BCEB71098}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 903146cdd7..40669f4f53 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,6 +2,33 @@ variables:
MSBuildEnableWorkloadResolver: 'false'
jobs:
+
+- job: GetPRNumber
+ pool:
+ vmImage: 'windows-2022'
+ variables:
+ SolutionDir: '$(Build.SourcesDirectory)'
+ steps:
+
+ - task: PowerShell@2
+ displayName: Get PR Number
+ inputs:
+ targetType: 'inline'
+ script: |
+ $prId = $env:System_PullRequest_PullRequestNumber
+ Write-Host "PR Number is:-" $env:System_PullRequest_PullRequestNumber
+
+ if (!([string]::IsNullOrWhiteSpace($prId)))
+ {
+ Set-Content -Path $env:Build_ArtifactStagingDirectory\prId.txt -Value $prId
+ }
+
+ - task: PublishBuildArtifacts@1
+ inputs:
+ PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+ ArtifactName: 'PRNumber'
+ publishLocation: 'Container'
+
- job: Linux
pool:
vmImage: 'ubuntu-20.04'
@@ -58,8 +85,10 @@ jobs:
displayName: 'Generate avalonia-native'
inputs:
script: |
- export PATH="`pwd`/sdk:$PATH"
- cd src/tools/MicroComGenerator; dotnet run -f net6.0 -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h
+ export COREHOST_TRACE=0
+ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+ export DOTNET_CLI_TELEMETRY_OPTOUT=1
+ ./build.sh --target GenerateCppHeaders --configuration Release
- task: Xcode@5
inputs:
diff --git a/build/MicroCom.targets b/build/MicroCom.targets
deleted file mode 100644
index 029d7f95f5..0000000000
--- a/build/MicroCom.targets
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
- false
- all
- true
- TargetFramework=net6.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_AvaloniaPatchComInterop>true
-
-
-
diff --git a/nukebuild/MicroComGen.cs b/nukebuild/MicroComGen.cs
index 06c8acbf23..b1e546cb97 100644
--- a/nukebuild/MicroComGen.cs
+++ b/nukebuild/MicroComGen.cs
@@ -1,14 +1,14 @@
using System.IO;
-using MicroComGenerator;
+using MicroCom.CodeGenerator;
using Nuke.Common;
partial class Build : NukeBuild
{
Target GenerateCppHeaders => _ => _.Executes(() =>
{
- var text = File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl");
- var ast = AstParser.Parse(text);
+ var file = MicroComCodeGenerator.Parse(
+ File.ReadAllText(RootDirectory / "src" / "Avalonia.Native" / "avn.idl"));
File.WriteAllText(RootDirectory / "native" / "Avalonia.Native" / "inc" / "avalonia-native.h",
- CppGen.GenerateCpp(ast));
+ file.GenerateCppHeader());
});
}
\ No newline at end of file
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index b28d3eb700..52b60b7d0f 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -15,7 +15,7 @@
-
+
@@ -37,10 +37,6 @@
-
- MicroComGenerator\%(Filename)%(Extension)
-
-
diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index af9ed71c5f..4b28527465 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net461;netcoreapp2.0;net6.0
+ net6.0;netstandard2.0;net461;netcoreapp2.0
Avalonia
diff --git a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
index d463dfa84a..199fa85ad2 100644
--- a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
+++ b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
@@ -2,6 +2,7 @@
net6.0
enable
+ True
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 36b6fc2dcd..505f486a6d 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Avalonia.Markup.Xaml.Styling;
using Avalonia.Styling;
+using Avalonia.Themes.Fluent;
using ControlCatalog.ViewModels;
namespace ControlCatalog
@@ -16,33 +17,17 @@ namespace ControlCatalog
DataContext = new ApplicationViewModel();
}
- private static readonly StyleInclude DataGridFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+ public static readonly StyleInclude DataGridFluent = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
{
Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml")
};
- private static readonly StyleInclude DataGridDefault = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
+ public static readonly StyleInclude DataGridDefault = new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
{
Source = new Uri("avares://Avalonia.Controls.DataGrid/Themes/Default.xaml")
};
- public static Styles FluentDark = new Styles
- {
- new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
- {
- Source = new Uri("avares://Avalonia.Themes.Fluent/FluentDark.xaml")
- },
- DataGridFluent
- };
-
- public static Styles FluentLight = new Styles
- {
- new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
- {
- Source = new Uri("avares://Avalonia.Themes.Fluent/FluentLight.xaml")
- },
- DataGridFluent
- };
+ public static FluentTheme Fluent = new FluentTheme(new Uri("avares://ControlCatalog/Styles"));
public static Styles DefaultLight = new Styles
{
@@ -65,8 +50,7 @@ namespace ControlCatalog
new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
{
Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
- },
- DataGridDefault
+ }
};
public static Styles DefaultDark = new Styles
@@ -90,14 +74,13 @@ namespace ControlCatalog
new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
{
Source = new Uri("avares://Avalonia.Themes.Default/DefaultTheme.xaml")
- },
- DataGridDefault
+ }
};
public override void Initialize()
{
- Styles.Insert(0, FluentLight);
-
+ Styles.Insert(0, Fluent);
+ Styles.Insert(1, DataGridFluent);
AvaloniaXamlLoader.Load(this);
}
@@ -106,9 +89,16 @@ namespace ControlCatalog
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
{
desktopLifetime.MainWindow = new MainWindow();
+
+ this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
+ {
+ StartupScreenIndex = 1,
+ });
}
else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
+ {
singleViewLifetime.MainView = new MainView();
+ }
base.OnFrameworkInitializationCompleted();
}
diff --git a/samples/ControlCatalog/DecoratedWindow.xaml.cs b/samples/ControlCatalog/DecoratedWindow.xaml.cs
index bdf5b8fbee..a1383b9107 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml.cs
+++ b/samples/ControlCatalog/DecoratedWindow.xaml.cs
@@ -11,7 +11,6 @@ namespace ControlCatalog
public DecoratedWindow()
{
this.InitializeComponent();
- this.AttachDevTools();
}
void SetupSide(string name, StandardCursorType cursor, WindowEdge edge)
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index abedda3c85..0579355831 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -3,14 +3,12 @@ using System.Collections;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.MarkupExtensions;
-using Avalonia.Markup.Xaml.Styling;
-using Avalonia.Markup.Xaml.XamlIl;
using Avalonia.Media;
using Avalonia.Media.Immutable;
using Avalonia.Platform;
-using ControlCatalog.Pages;
+using Avalonia.Themes.Fluent;
using ControlCatalog.Models;
+using ControlCatalog.Pages;
namespace ControlCatalog
{
@@ -43,14 +41,36 @@ namespace ControlCatalog
{
if (themes.SelectedItem is CatalogTheme theme)
{
- Application.Current.Styles[0] = theme switch
+ var themeStyle = Application.Current.Styles[0];
+ if (theme == CatalogTheme.FluentLight)
+ {
+ if (App.Fluent.Mode != FluentThemeMode.Light)
+ {
+ App.Fluent.Mode = FluentThemeMode.Light;
+ }
+ Application.Current.Styles[0] = App.Fluent;
+ Application.Current.Styles[1] = App.DataGridFluent;
+ }
+ else if (theme == CatalogTheme.FluentDark)
+ {
+
+ if (App.Fluent.Mode != FluentThemeMode.Dark)
+ {
+ App.Fluent.Mode = FluentThemeMode.Dark;
+ }
+ Application.Current.Styles[0] = App.Fluent;
+ Application.Current.Styles[1] = App.DataGridFluent;
+ }
+ else if (theme == CatalogTheme.DefaultLight)
+ {
+ Application.Current.Styles[0] = App.DefaultLight;
+ Application.Current.Styles[1] = App.DataGridDefault;
+ }
+ else if (theme == CatalogTheme.DefaultDark)
{
- CatalogTheme.FluentLight => App.FluentLight,
- CatalogTheme.FluentDark => App.FluentDark,
- CatalogTheme.DefaultLight => App.DefaultLight,
- CatalogTheme.DefaultDark => App.DefaultDark,
- _ => Application.Current.Styles[0]
- };
+ Application.Current.Styles[0] = App.DefaultDark;
+ Application.Current.Styles[1] = App.DataGridDefault;
+ }
}
};
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index dd62698cc7..20591103b7 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -17,10 +17,7 @@ namespace ControlCatalog
public MainWindow()
{
this.InitializeComponent();
- this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
- {
- StartupScreenIndex = 1,
- });
+
//Renderer.DrawFps = true;
//Renderer.DrawDirtyRects = Renderer.DrawFps = true;
diff --git a/samples/ControlCatalog/Models/Person.cs b/samples/ControlCatalog/Models/Person.cs
index 47f41bc584..cd70fa3959 100644
--- a/samples/ControlCatalog/Models/Person.cs
+++ b/samples/ControlCatalog/Models/Person.cs
@@ -16,6 +16,7 @@ namespace ControlCatalog.Models
string _firstName;
string _lastName;
bool _isBanned;
+ private int _age;
public string FirstName
{
@@ -59,6 +60,20 @@ namespace ControlCatalog.Models
}
}
+
+ ///
+ /// Gets or sets the age of the person
+ ///
+ public int Age
+ {
+ get => _age;
+ set
+ {
+ _age = value;
+ OnPropertyChanged(nameof(Age));
+ }
+ }
+
Dictionary> _errorLookup = new Dictionary>();
void SetError(string propertyName, string error)
diff --git a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
index 3e50bf8a08..2fe16ba8e3 100644
--- a/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
+++ b/samples/ControlCatalog/Pages/CalendarDatePickerPage.xaml
@@ -1,5 +1,7 @@
A control for selecting dates with a calendar drop-down
@@ -39,6 +41,9 @@
+
+
+
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index 63e873d9b5..f7e3cf2441 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -64,6 +64,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
index dc5cc49a90..c010d38eac 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml.cs
@@ -6,7 +6,9 @@ using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using ControlCatalog.Models;
using Avalonia.Collections;
+using Avalonia.Controls.Primitives;
using Avalonia.Data;
+using Avalonia.Threading;
namespace ControlCatalog.Pages
{
@@ -48,9 +50,9 @@ namespace ControlCatalog.Pages
var items = new List
{
- new Person { FirstName = "John", LastName = "Doe" },
- new Person { FirstName = "Elizabeth", LastName = "Thomas", IsBanned = true },
- new Person { FirstName = "Zack", LastName = "Ward" }
+ new Person { FirstName = "John", LastName = "Doe" , Age = 30},
+ new Person { FirstName = "Elizabeth", LastName = "Thomas", IsBanned = true , Age = 40 },
+ new Person { FirstName = "Zack", LastName = "Ward" , Age = 50 }
};
var collectionView3 = new DataGridCollectionView(items);
@@ -84,5 +86,19 @@ namespace ControlCatalog.Pages
return Comparer.Default.Compare(x, y);
}
}
+
+ private void NumericUpDown_OnTemplateApplied(object sender, TemplateAppliedEventArgs e)
+ {
+ // We want to focus the TextBox of the NumericUpDown. To do so we search for this control when the template
+ // is applied, but we postpone the action until the control is actually loaded.
+ if (e.NameScope.Find("PART_TextBox") is {} textBox)
+ {
+ Dispatcher.UIThread.InvokeAsync(() =>
+ {
+ textBox.Focus();
+ textBox.SelectAll();
+ }, DispatcherPriority.Loaded);
+ }
+ }
}
}
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 4b3cfa9c9d..2b0c30f311 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls.Notifications;
using Avalonia.Dialogs;
using Avalonia.Platform;
using System;
+using System.ComponentModel.DataAnnotations;
using MiniMvvm;
namespace ControlCatalog.ViewModels
@@ -164,5 +165,17 @@ namespace ControlCatalog.ViewModels
public MiniCommand ExitCommand { get; }
public MiniCommand ToggleMenuItemCheckedCommand { get; }
+
+ private DateTime? _validatedDateExample;
+
+ ///
+ /// A required DateTime which should demonstrate validation for the DateTimePicker
+ ///
+ [Required]
+ public DateTime? ValidatedDateExample
+ {
+ get => _validatedDateExample;
+ set => this.RaiseAndSetIfChanged(ref _validatedDateExample, value);
+ }
}
}
diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 57f22e7a05..6a940a54f1 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -33,8 +33,16 @@ namespace Avalonia.Android
{
public static readonly AndroidPlatform Instance = new AndroidPlatform();
public static AndroidPlatformOptions Options { get; private set; }
- public Size DoubleClickSize => new Size(4, 4);
- public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(200);
+
+ ///
+ public Size TouchDoubleClickSize => new Size(4, 4);
+
+ ///
+ public TimeSpan TouchDoubleClickTime => TimeSpan.FromMilliseconds(200);
+
+ public Size DoubleClickSize => TouchDoubleClickSize;
+
+ public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(500);
public static void Initialize(Type appType, AndroidPlatformOptions options)
{
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index 9e3758658c..d81d14bbff 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
diff --git a/src/Avalonia.Base/ApiCompatBaseline.txt b/src/Avalonia.Base/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..4701a83175
--- /dev/null
+++ b/src/Avalonia.Base/ApiCompatBaseline.txt
@@ -0,0 +1,3 @@
+Compat issues with assembly Avalonia.Base:
+InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Threading.IDispatcher.Post(System.Action, T, Avalonia.Threading.DispatcherPriority)' is present in the implementation but not in the contract.
+Total Issues: 1
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 07614f31db..376075df2a 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
Avalonia.Base
Avalonia
True
diff --git a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
index dcd32ddd76..689fcc89a4 100644
--- a/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
+++ b/src/Avalonia.Base/Collections/NotifyCollectionChangedExtensions.cs
@@ -59,7 +59,7 @@ namespace Avalonia.Collections
}
private class WeakCollectionChangedObservable : LightweightObservableBase,
- IWeakSubscriber
+ IWeakEventSubscriber
{
private WeakReference _sourceReference;
@@ -68,31 +68,22 @@ namespace Avalonia.Collections
_sourceReference = source;
}
- public void OnEvent(object? sender, NotifyCollectionChangedEventArgs e)
+ public void OnEvent(object? sender,
+ WeakEvent ev,
+ NotifyCollectionChangedEventArgs e)
{
PublishNext(e);
}
-
protected override void Initialize()
{
if (_sourceReference.TryGetTarget(out var instance))
- {
- WeakSubscriptionManager.Subscribe(
- instance,
- nameof(instance.CollectionChanged),
- this);
- }
+ WeakEvents.CollectionChanged.Subscribe(instance, this);
}
protected override void Deinitialize()
{
if (_sourceReference.TryGetTarget(out var instance))
- {
- WeakSubscriptionManager.Unsubscribe(
- instance,
- nameof(instance.CollectionChanged),
- this);
- }
+ WeakEvents.CollectionChanged.Unsubscribe(instance, this);
}
}
}
diff --git a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
index e197e29103..a808827896 100644
--- a/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
+++ b/src/Avalonia.Base/Data/Core/IndexerNodeBase.cs
@@ -23,18 +23,16 @@ namespace Avalonia.Data.Core
if (incc != null)
{
- inputs.Add(WeakObservable.FromEventPattern(
- incc,
- nameof(incc.CollectionChanged))
+ inputs.Add(WeakObservable.FromEventPattern(
+ incc, WeakEvents.CollectionChanged)
.Where(x => ShouldUpdate(x.Sender, x.EventArgs))
.Select(_ => GetValue(target)));
}
if (inpc != null)
{
- inputs.Add(WeakObservable.FromEventPattern(
- inpc,
- nameof(inpc.PropertyChanged))
+ inputs.Add(WeakObservable.FromEventPattern(
+ inpc, WeakEvents.PropertyChanged)
.Where(x => ShouldUpdate(x.Sender, x.EventArgs))
.Select(_ => GetValue(target)));
}
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
index 9f827daf94..1e7a0d5c8f 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
@@ -11,6 +11,12 @@ namespace Avalonia.Data.Core.Plugins
///
public class IndeiValidationPlugin : IDataValidationPlugin
{
+ private static readonly WeakEvent
+ ErrorsChangedWeakEvent = WeakEvent.Register(
+ (s, h) => s.ErrorsChanged += h,
+ (s, h) => s.ErrorsChanged -= h
+ );
+
///
public bool Match(WeakReference reference, string memberName)
{
@@ -25,7 +31,7 @@ namespace Avalonia.Data.Core.Plugins
return new Validator(reference, name, accessor);
}
- private class Validator : DataValidationBase, IWeakSubscriber
+ private class Validator : DataValidationBase, IWeakEventSubscriber
{
private readonly WeakReference _reference;
private readonly string _name;
@@ -37,7 +43,7 @@ namespace Avalonia.Data.Core.Plugins
_name = name;
}
- void IWeakSubscriber.OnEvent(object? sender, DataErrorsChangedEventArgs e)
+ void IWeakEventSubscriber.OnEvent(object? notifyDataErrorInfo, WeakEvent ev, DataErrorsChangedEventArgs e)
{
if (e.PropertyName == _name || string.IsNullOrEmpty(e.PropertyName))
{
@@ -51,10 +57,7 @@ namespace Avalonia.Data.Core.Plugins
if (target != null)
{
- WeakSubscriptionManager.Subscribe(
- target,
- nameof(target.ErrorsChanged),
- this);
+ ErrorsChangedWeakEvent.Subscribe(target, this);
}
base.SubscribeCore();
@@ -66,10 +69,7 @@ namespace Avalonia.Data.Core.Plugins
if (target != null)
{
- WeakSubscriptionManager.Unsubscribe(
- target,
- nameof(target.ErrorsChanged),
- this);
+ ErrorsChangedWeakEvent.Unsubscribe(target, this);
}
base.UnsubscribeCore();
diff --git a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
index fd532f3014..33cecd10a7 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Collections.Specialized;
using System.ComponentModel;
using System.Reflection;
using Avalonia.Utilities;
@@ -85,7 +86,7 @@ namespace Avalonia.Data.Core.Plugins
return found;
}
- private class Accessor : PropertyAccessorBase, IWeakSubscriber
+ private class Accessor : PropertyAccessorBase, IWeakEventSubscriber
{
private readonly WeakReference _reference;
private readonly PropertyInfo _property;
@@ -129,7 +130,8 @@ namespace Avalonia.Data.Core.Plugins
return false;
}
- void IWeakSubscriber.OnEvent(object? sender, PropertyChangedEventArgs e)
+ void IWeakEventSubscriber.
+ OnEvent(object? notifyPropertyChanged, WeakEvent ev, PropertyChangedEventArgs e)
{
if (e.PropertyName == _property.Name || string.IsNullOrEmpty(e.PropertyName))
{
@@ -148,13 +150,8 @@ namespace Avalonia.Data.Core.Plugins
{
var inpc = GetReferenceTarget() as INotifyPropertyChanged;
- if (inpc != null)
- {
- WeakSubscriptionManager.Unsubscribe(
- inpc,
- nameof(inpc.PropertyChanged),
- this);
- }
+ if (inpc != null)
+ WeakEvents.PropertyChanged.Unsubscribe(inpc, this);
}
private object? GetReferenceTarget()
@@ -178,13 +175,8 @@ namespace Avalonia.Data.Core.Plugins
{
var inpc = GetReferenceTarget() as INotifyPropertyChanged;
- if (inpc != null)
- {
- WeakSubscriptionManager.Subscribe(
- inpc,
- nameof(inpc.PropertyChanged),
- this);
- }
+ if (inpc != null)
+ WeakEvents.PropertyChanged.Subscribe(inpc, this);
}
}
}
diff --git a/src/Avalonia.Base/Threading/Dispatcher.cs b/src/Avalonia.Base/Threading/Dispatcher.cs
index ffc013268d..908f431776 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.cs
@@ -81,7 +81,7 @@ namespace Avalonia.Threading
_ = action ?? throw new ArgumentNullException(nameof(action));
return _jobRunner.InvokeAsync(action, priority);
}
-
+
///
public Task InvokeAsync(Func function, DispatcherPriority priority = DispatcherPriority.Normal)
{
@@ -110,6 +110,13 @@ namespace Avalonia.Threading
_jobRunner.Post(action, priority);
}
+ ///
+ public void Post(Action action, T arg, DispatcherPriority priority = DispatcherPriority.Normal)
+ {
+ _ = action ?? throw new ArgumentNullException(nameof(action));
+ _jobRunner.Post(action, arg, priority);
+ }
+
///
/// This is needed for platform backends that don't have internal priority system (e. g. win32)
/// To ensure that there are no jobs with higher priority
diff --git a/src/Avalonia.Base/Threading/IDispatcher.cs b/src/Avalonia.Base/Threading/IDispatcher.cs
index 084204dfcd..cd5add70d4 100644
--- a/src/Avalonia.Base/Threading/IDispatcher.cs
+++ b/src/Avalonia.Base/Threading/IDispatcher.cs
@@ -26,6 +26,15 @@ namespace Avalonia.Threading
/// The priority with which to invoke the method.
void Post(Action action, DispatcherPriority priority = DispatcherPriority.Normal);
+ ///
+ /// Posts an action that will be invoked on the dispatcher thread.
+ ///
+ /// type of argument
+ /// The method to call.
+ /// The argument of method to call.
+ /// The priority with which to invoke the method.
+ void Post(Action action, T arg, DispatcherPriority priority = DispatcherPriority.Normal);
+
///
/// Invokes a action on the dispatcher thread.
///
diff --git a/src/Avalonia.Base/Threading/JobRunner.cs b/src/Avalonia.Base/Threading/JobRunner.cs
index eb7c5e1af3..f2aef0414c 100644
--- a/src/Avalonia.Base/Threading/JobRunner.cs
+++ b/src/Avalonia.Base/Threading/JobRunner.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Threading
{
private IPlatformThreadingInterface? _platform;
- private readonly Queue[] _queues = Enumerable.Range(0, (int) DispatcherPriority.MaxValue + 1)
+ private readonly Queue[] _queues = Enumerable.Range(0, (int)DispatcherPriority.MaxValue + 1)
.Select(_ => new Queue()).ToArray();
public JobRunner(IPlatformThreadingInterface? platform)
@@ -59,7 +59,7 @@ namespace Avalonia.Threading
/// A task that can be used to track the method's execution.
public Task InvokeAsync(Func function, DispatcherPriority priority)
{
- var job = new Job(function, priority);
+ var job = new JobWithResult(function, priority);
AddJob(job);
return job.Task;
}
@@ -75,6 +75,17 @@ namespace Avalonia.Threading
AddJob(new Job(action, priority, true));
}
+ ///
+ /// Post action that will be invoked on main thread
+ ///
+ /// The method to call.
+ /// The parameter of method to call.
+ /// The priority with which to invoke the method.
+ internal void Post(Action action, T parameter, DispatcherPriority priority)
+ {
+ AddJob(new Job(action, parameter, priority, true));
+ }
+
///
/// Allows unit tests to change the platform threading interface.
///
@@ -86,7 +97,7 @@ namespace Avalonia.Threading
private void AddJob(IJob job)
{
bool needWake;
- var queue = _queues[(int) job.Priority];
+ var queue = _queues[(int)job.Priority];
lock (queue)
{
needWake = queue.Count == 0;
@@ -98,7 +109,7 @@ namespace Avalonia.Threading
private IJob? GetNextJob(DispatcherPriority minimumPriority)
{
- for (int c = (int) DispatcherPriority.MaxValue; c >= (int) minimumPriority; c--)
+ for (int c = (int)DispatcherPriority.MaxValue; c >= (int)minimumPriority; c--)
{
var q = _queues[c];
lock (q)
@@ -109,14 +120,14 @@ namespace Avalonia.Threading
}
return null;
}
-
+
private interface IJob
{
///
/// Gets the job priority.
///
DispatcherPriority Priority { get; }
-
+
///
/// Runs the job.
///
@@ -177,11 +188,61 @@ namespace Avalonia.Threading
}
}
}
-
+
///
- /// A job to run.
+ /// A typed job to run.
+ ///
+ /// Type of job parameter
+ private sealed class Job : IJob
+ {
+ private readonly Action _action;
+ private readonly T _parameter;
+ private readonly TaskCompletionSource? _taskCompletionSource;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The method to call.
+ /// The parameter of method to call.
+ /// The job priority.
+ /// Do not wrap exception in TaskCompletionSource
+
+ public Job(Action action, T parameter, DispatcherPriority priority, bool throwOnUiThread)
+ {
+ _action = action;
+ _parameter = parameter;
+ Priority = priority;
+ _taskCompletionSource = throwOnUiThread ? null : new TaskCompletionSource();
+ }
+
+ ///
+ public DispatcherPriority Priority { get; }
+
+ ///
+ void IJob.Run()
+ {
+ if (_taskCompletionSource == null)
+ {
+ _action(_parameter);
+ return;
+ }
+ try
+ {
+ _action(_parameter);
+ _taskCompletionSource.SetResult(default);
+ }
+ catch (Exception e)
+ {
+ _taskCompletionSource.SetException(e);
+ }
+ }
+ }
+
+ ///
+ /// A job to run thath return value.
///
- private sealed class Job : IJob
+ /// Type of job result
+ private sealed class JobWithResult : IJob
{
private readonly Func _function;
private readonly TaskCompletionSource _taskCompletionSource;
@@ -191,7 +252,7 @@ namespace Avalonia.Threading
///
/// The method to call.
/// The job priority.
- public Job(Func function, DispatcherPriority priority)
+ public JobWithResult(Func function, DispatcherPriority priority)
{
_function = function;
Priority = priority;
@@ -200,7 +261,7 @@ namespace Avalonia.Threading
///
public DispatcherPriority Priority { get; }
-
+
///
/// The task.
///
diff --git a/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
new file mode 100644
index 0000000000..e48c0cb111
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/IWeakEventSubscriber.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Avalonia.Utilities;
+
+///
+/// Defines a listener to a event subscribed vis the .
+///
+/// The type of the event arguments.
+public interface IWeakEventSubscriber where TEventArgs : EventArgs
+{
+ void OnEvent(object? sender, WeakEvent ev, TEventArgs e);
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Utilities/WeakEvent.cs b/src/Avalonia.Base/Utilities/WeakEvent.cs
new file mode 100644
index 0000000000..0b32015a8a
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/WeakEvent.cs
@@ -0,0 +1,187 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Avalonia.Threading;
+
+namespace Avalonia.Utilities;
+
+///
+/// Manages subscriptions to events using weak listeners.
+///
+public class WeakEvent : WeakEvent where TEventArgs : EventArgs where TSender : class
+{
+ private readonly Func, Action> _subscribe;
+
+ readonly ConditionalWeakTable _subscriptions = new();
+
+ internal WeakEvent(
+ Action> subscribe,
+ Action> unsubscribe)
+ {
+ _subscribe = (t, s) =>
+ {
+ subscribe(t, s);
+ return () => unsubscribe(t, s);
+ };
+ }
+
+ internal WeakEvent(Func, Action> subscribe)
+ {
+ _subscribe = subscribe;
+ }
+
+ public void Subscribe(TSender target, IWeakEventSubscriber subscriber)
+ {
+ if (!_subscriptions.TryGetValue(target, out var subscription))
+ _subscriptions.Add(target, subscription = new Subscription(this, target));
+ subscription.Add(new WeakReference>(subscriber));
+ }
+
+ public void Unsubscribe(TSender target, IWeakEventSubscriber subscriber)
+ {
+ if (_subscriptions.TryGetValue(target, out var subscription))
+ subscription.Remove(subscriber);
+ }
+
+ private class Subscription
+ {
+ private readonly WeakEvent _ev;
+ private readonly TSender _target;
+ private readonly Action _compact;
+
+ private WeakReference>?[] _data =
+ new WeakReference>[16];
+ private int _count;
+ private readonly Action _unsubscribe;
+ private bool _compactScheduled;
+
+ public Subscription(WeakEvent ev, TSender target)
+ {
+ _ev = ev;
+ _target = target;
+ _compact = Compact;
+ _unsubscribe = ev._subscribe(target, OnEvent);
+ }
+
+ void Destroy()
+ {
+ _unsubscribe();
+ _ev._subscriptions.Remove(_target);
+ }
+
+ public void Add(WeakReference> s)
+ {
+ if (_count == _data.Length)
+ {
+ //Extend capacity
+ var extendedData = new WeakReference>?[_data.Length * 2];
+ Array.Copy(_data, extendedData, _data.Length);
+ _data = extendedData;
+ }
+
+ _data[_count] = s;
+ _count++;
+ }
+
+ public void Remove(IWeakEventSubscriber s)
+ {
+ var removed = false;
+
+ for (int c = 0; c < _count; ++c)
+ {
+ var reference = _data[c];
+
+ if (reference != null && reference.TryGetTarget(out var instance) && instance == s)
+ {
+ _data[c] = null;
+ removed = true;
+ }
+ }
+
+ if (removed)
+ {
+ ScheduleCompact();
+ }
+ }
+
+ void ScheduleCompact()
+ {
+ if(_compactScheduled)
+ return;
+ _compactScheduled = true;
+ Dispatcher.UIThread.Post(_compact, DispatcherPriority.Background);
+ }
+
+ void Compact()
+ {
+ _compactScheduled = false;
+ int empty = -1;
+ for (var c = 0; c < _count; c++)
+ {
+ var r = _data[c];
+ //Mark current index as first empty
+ if (r == null && empty == -1)
+ empty = c;
+ //If current element isn't null and we have an empty one
+ if (r != null && empty != -1)
+ {
+ _data[c] = null;
+ _data[empty] = r;
+ empty++;
+ }
+ }
+
+ if (empty != -1)
+ _count = empty;
+ if (_count == 0)
+ Destroy();
+ }
+
+ void OnEvent(object? sender, TEventArgs eventArgs)
+ {
+ var needCompact = false;
+ for (var c = 0; c < _count; c++)
+ {
+ var r = _data[c];
+ if (r?.TryGetTarget(out var sub) == true)
+ sub!.OnEvent(_target, _ev, eventArgs);
+ else
+ needCompact = true;
+ }
+
+ if (needCompact)
+ ScheduleCompact();
+ }
+ }
+
+}
+
+public class WeakEvent
+{
+ public static WeakEvent Register(
+ Action> subscribe,
+ Action> unsubscribe) where TSender : class where TEventArgs : EventArgs
+ {
+ return new WeakEvent(subscribe, unsubscribe);
+ }
+
+ public static WeakEvent Register(
+ Func, Action> subscribe) where TSender : class where TEventArgs : EventArgs
+ {
+ return new WeakEvent(subscribe);
+ }
+
+ public static WeakEvent Register(
+ Action subscribe,
+ Action unsubscribe) where TSender : class
+ {
+ return Register((s, h) =>
+ {
+ EventHandler handler = (_, e) => h(s, e);
+ subscribe(s, handler);
+ return () => unsubscribe(s, handler);
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Utilities/WeakEvents.cs b/src/Avalonia.Base/Utilities/WeakEvents.cs
new file mode 100644
index 0000000000..d1b5e7f12d
--- /dev/null
+++ b/src/Avalonia.Base/Utilities/WeakEvents.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Windows.Input;
+
+namespace Avalonia.Utilities;
+
+public class WeakEvents
+{
+ ///
+ /// Represents CollectionChanged event from
+ ///
+ public static readonly WeakEvent
+ CollectionChanged = WeakEvent.Register(
+ (c, s) =>
+ {
+ NotifyCollectionChangedEventHandler handler = (_, e) => s(c, e);
+ c.CollectionChanged += handler;
+ return () => c.CollectionChanged -= handler;
+ });
+
+ ///
+ /// Represents PropertyChanged event from
+ ///
+ public static readonly WeakEvent
+ PropertyChanged = WeakEvent.Register(
+ (s, h) =>
+ {
+ PropertyChangedEventHandler handler = (_, e) => h(s, e);
+ s.PropertyChanged += handler;
+ return () => s.PropertyChanged -= handler;
+ });
+
+ ///
+ /// Represents CanExecuteChanged event from
+ ///
+ public static readonly WeakEvent CommandCanExecuteChanged =
+ WeakEvent.Register((s, h) => s.CanExecuteChanged += h,
+ (s, h) => s.CanExecuteChanged -= h);
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Utilities/WeakObservable.cs b/src/Avalonia.Base/Utilities/WeakObservable.cs
index 52edc7ad1a..6bf1d4082f 100644
--- a/src/Avalonia.Base/Utilities/WeakObservable.cs
+++ b/src/Avalonia.Base/Utilities/WeakObservable.cs
@@ -18,6 +18,7 @@ namespace Avalonia.Utilities
/// Object instance that exposes the event to convert.
/// Name of the event to convert.
///
+ [Obsolete("Use WeakEvent-based overload")]
public static IObservable> FromEventPattern(
TTarget target,
string eventName)
@@ -34,7 +35,9 @@ namespace Avalonia.Utilities
}).Publish().RefCount();
}
- private class Handler : IWeakSubscriber where TEventArgs : EventArgs
+ private class Handler
+ : IWeakSubscriber,
+ IWeakEventSubscriber where TEventArgs : EventArgs
{
private IObserver> _observer;
@@ -47,6 +50,36 @@ namespace Avalonia.Utilities
{
_observer.OnNext(new EventPattern(sender, e));
}
+
+ public void OnEvent(object? sender, WeakEvent ev, TEventArgs e)
+ {
+ _observer.OnNext(new EventPattern(sender, e));
+ }
}
+
+ ///
+ /// Converts a WeakEvent conforming to the standard .NET event pattern into an observable
+ /// sequence, subscribing weakly.
+ ///
+ /// The type of target.
+ /// The type of the event args.
+ /// Object instance that exposes the event to convert.
+ /// The weak event to convert.
+ ///
+ public static IObservable> FromEventPattern(
+ TTarget target, WeakEvent ev)
+ where TEventArgs : EventArgs where TTarget : class
+ {
+ _ = target ?? throw new ArgumentNullException(nameof(target));
+ _ = ev ?? throw new ArgumentNullException(nameof(ev));
+
+ return Observable.Create>(observer =>
+ {
+ var handler = new Handler(observer);
+ ev.Subscribe(target, handler);
+ return () => ev.Unsubscribe(target, handler);
+ }).Publish().RefCount();
+ }
+
}
}
diff --git a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
index 66223e513d..dc9e86cc32 100644
--- a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
+++ b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
@@ -19,6 +19,7 @@ namespace Avalonia.Utilities
/// The event source.
/// The name of the event.
/// The subscriber.
+ [Obsolete("Use WeakEvent")]
public static void Subscribe(TTarget target, string eventName, IWeakSubscriber subscriber)
where TEventArgs : EventArgs
{
@@ -180,7 +181,7 @@ namespace Avalonia.Utilities
{
var r = _data[c];
if (r?.TryGetTarget(out var sub) == true)
- sub.OnEvent(sender, eventArgs);
+ sub!.OnEvent(sender, eventArgs);
else
needCompact = true;
}
diff --git a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
index d50e8b1115..c89157dc0f 100644
--- a/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
+++ b/src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
Avalonia.Controls.DataGrid
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index 10c7c16488..95ee73be4e 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -5751,6 +5751,7 @@ namespace Avalonia.Controls
return true;
}
// Unselect everything except the row that was clicked on
+ _noSelectionChangeCount++;
try
{
UpdateSelectionAndCurrency(columnIndex, slot, DataGridSelectionAction.SelectCurrent, scrollIntoView: false);
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index 6b515503aa..8501ce3896 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -448,7 +448,7 @@ namespace Avalonia.Controls
internal set;
}
- public bool IsReadOnly
+ public virtual bool IsReadOnly
{
get
{
diff --git a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
index 7e95dd100c..0e754d5815 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Microsoft Corporation.
+// (c) Copyright Microsoft Corporation.
// This source is subject to the Microsoft Public License (Ms-PL).
// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
// All other rights reserved.
@@ -15,7 +15,7 @@ namespace Avalonia.Controls
{
public class DataGridTemplateColumn : DataGridColumn
{
- IDataTemplate _cellTemplate;
+ private IDataTemplate _cellTemplate;
public static readonly DirectProperty CellTemplateProperty =
AvaloniaProperty.RegisterDirect(
@@ -30,17 +30,38 @@ namespace Avalonia.Controls
set { SetAndRaise(CellTemplateProperty, ref _cellTemplate, value); }
}
+ private IDataTemplate _cellEditingCellTemplate;
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly DirectProperty CellEditingTemplateProperty =
+ AvaloniaProperty.RegisterDirect(
+ nameof(CellEditingTemplate),
+ o => o.CellEditingTemplate,
+ (o, v) => o.CellEditingTemplate = v);
+
+ ///
+ /// Gets or sets the which is used for the editing mode of the current
+ ///
+ ///
+ /// An for the editing mode of the current
+ ///
+ ///
+ /// If this property is the column is read-only.
+ ///
+ public IDataTemplate CellEditingTemplate
+ {
+ get => _cellEditingCellTemplate;
+ set => SetAndRaise(CellEditingTemplateProperty, ref _cellEditingCellTemplate, value);
+ }
+
private void OnCellTemplateChanged(AvaloniaPropertyChangedEventArgs e)
{
var oldValue = (IDataTemplate)e.OldValue;
var value = (IDataTemplate)e.NewValue;
}
- public DataGridTemplateColumn()
- {
- IsReadOnly = true;
- }
-
protected override IControl GenerateElement(DataGridCell cell, object dataItem)
{
if(CellTemplate != null)
@@ -60,7 +81,22 @@ namespace Avalonia.Controls
protected override IControl GenerateEditingElement(DataGridCell cell, object dataItem, out ICellEditBinding binding)
{
binding = null;
- return GenerateElement(cell, dataItem);
+ if(CellEditingTemplate != null)
+ {
+ return CellEditingTemplate.Build(dataItem);
+ }
+ else if (CellTemplate != null)
+ {
+ return CellTemplate.Build(dataItem);
+ }
+ if (Design.IsDesignMode)
+ {
+ return null;
+ }
+ else
+ {
+ throw DataGridError.DataGridTemplateColumn.MissingTemplateForType(typeof(DataGridTemplateColumn));
+ }
}
protected override object PrepareCellForEdit(IControl editingElement, RoutedEventArgs editingEventArgs)
@@ -70,12 +106,30 @@ namespace Avalonia.Controls
protected internal override void RefreshCellContent(IControl element, string propertyName)
{
- if(propertyName == nameof(CellTemplate) && element.Parent is DataGridCell cell)
+ var cell = element.Parent as DataGridCell;
+ if(propertyName == nameof(CellTemplate) && cell is not null)
{
cell.Content = GenerateElement(cell, cell.DataContext);
}
base.RefreshCellContent(element, propertyName);
}
+
+ public override bool IsReadOnly
+ {
+ get
+ {
+ if (CellEditingTemplate is null)
+ {
+ return true;
+ }
+
+ return base.IsReadOnly;
+ }
+ set
+ {
+ base.IsReadOnly = value;
+ }
+ }
}
}
diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt
index dd41c30e85..9b7d37e108 100644
--- a/src/Avalonia.Controls/ApiCompatBaseline.txt
+++ b/src/Avalonia.Controls/ApiCompatBaseline.txt
@@ -29,15 +29,20 @@ MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDownValueChang
MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.NewValue.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.OldValue.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.ScrollViewer.AllowAutoHideProperty' does not exist in the implementation but it does exist in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.TopLevel' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Viewbox.StretchProperty' does not exist in the implementation but it does exist in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Window' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.WindowBase' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public System.EventHandler Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.ShutdownRequested' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.add_ShutdownRequested(System.EventHandler)' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.remove_ShutdownRequested(System.EventHandler)' is present in the implementation but not in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Embedding.EmbeddableControlRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
MembersMustExist : Member 'public System.Action Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.set(System.Action)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Notifications.NotificationCard.CloseOnClickProperty' does not exist in the implementation but it does exist in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.Platform.ITopLevelNativeMenuExporter.SetNativeMenu(Avalonia.Controls.NativeMenu)' is present in the contract but not in the implementation.
+CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Primitives.PopupRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
EnumValuesMustMatch : Enum value 'Avalonia.Platform.ExtendClientAreaChromeHints Avalonia.Platform.ExtendClientAreaChromeHints.Default' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable Avalonia.Platform.ITopLevelImpl.FrameSize' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable Avalonia.Platform.ITopLevelImpl.FrameSize.get()' is present in the implementation but not in the contract.
@@ -57,4 +62,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platfor
MembersMustExist : Member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size, Avalonia.Platform.PlatformResizeReason)' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.ITrayIconImpl Avalonia.Platform.IWindowingPlatform.CreateTrayIcon()' is present in the implementation but not in the contract.
-Total Issues: 58
+Total Issues: 63
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 479bbb49b6..e2c6a714aa 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index 5fe2cf3704..f1c1a55a17 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Data;
@@ -196,13 +196,14 @@ namespace Avalonia.Controls
protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
{
base.OnPointerWheelChanged(e);
- if (!e.Handled && AllowSpin)
+
+ if (AllowSpin && IsKeyboardFocusWithin)
{
if (e.Delta.Y != 0)
{
var spinnerEventArgs = new SpinEventArgs(SpinEvent, (e.Delta.Y < 0) ? SpinDirection.Decrease : SpinDirection.Increase, true);
OnSpin(spinnerEventArgs);
- e.Handled = spinnerEventArgs.Handled;
+ e.Handled = true;
}
}
}
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
index a856ee071c..cd9c80d3e0 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
@@ -185,7 +185,8 @@ namespace Avalonia.Controls
AvaloniaProperty.RegisterDirect(
nameof(SelectedDate),
o => o.SelectedDate,
- (o, v) => o.SelectedDate = v);
+ (o, v) => o.SelectedDate = v,
+ enableDataValidation: true);
public static readonly StyledProperty SelectedDateFormatProperty =
AvaloniaProperty.Register(
@@ -533,13 +534,11 @@ namespace Avalonia.Controls
}
}
- protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+ protected override void UpdateDataValidation(AvaloniaProperty property, BindingValue value)
{
- base.OnPropertyChanged(change);
-
- if (change.Property == SelectedDateProperty)
+ if (property == SelectedDateProperty)
{
- DataValidationErrors.SetError(this, change.NewValue.Error);
+ DataValidationErrors.SetError(this, value.Error);
}
}
diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
index 2ceaeb6dba..4d048f0fb0 100644
--- a/src/Avalonia.Controls/NativeMenuItem.cs
+++ b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Controls
}
- class CanExecuteChangedSubscriber : IWeakSubscriber
+ class CanExecuteChangedSubscriber : IWeakEventSubscriber
{
private readonly NativeMenuItem _parent;
@@ -42,7 +42,7 @@ namespace Avalonia.Controls
_parent = parent;
}
- public void OnEvent(object sender, EventArgs e)
+ public void OnEvent(object? sender, WeakEvent ev, EventArgs e)
{
_parent.CanExecuteChanged();
}
@@ -160,14 +160,12 @@ namespace Avalonia.Controls
set
{
if (_command != null)
- WeakSubscriptionManager.Unsubscribe(_command,
- nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
+ WeakEvents.CommandCanExecuteChanged.Unsubscribe(_command, _canExecuteChangedSubscriber);
SetAndRaise(CommandProperty, ref _command, value);
if (_command != null)
- WeakSubscriptionManager.Subscribe(_command,
- nameof(ICommand.CanExecuteChanged), _canExecuteChangedSubscriber);
+ WeakEvents.CommandCanExecuteChanged.Subscribe(_command, _canExecuteChangedSubscriber);
CanExecuteChanged();
}
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index ecc0fa3a48..b40cf26df5 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Controls
/// Represents a data-driven collection control that incorporates a flexible layout system,
/// custom views, and virtualization.
///
- public class ItemsRepeater : Panel, IChildIndexProvider
+ public class ItemsRepeater : Panel, IChildIndexProvider, IWeakEventSubscriber
{
///
/// Defines the property.
@@ -723,14 +723,8 @@ namespace Avalonia.Controls
{
oldValue.UninitializeForContext(LayoutContext);
- WeakEventHandlerManager.Unsubscribe(
- oldValue,
- nameof(AttachedLayout.MeasureInvalidated),
- InvalidateMeasureForLayout);
- WeakEventHandlerManager.Unsubscribe(
- oldValue,
- nameof(AttachedLayout.ArrangeInvalidated),
- InvalidateArrangeForLayout);
+ AttachedLayout.MeasureInvalidatedWeakEvent.Unsubscribe(oldValue, this);
+ AttachedLayout.ArrangeInvalidatedWeakEvent.Unsubscribe(oldValue, this);
// Walk through all the elements and make sure they are cleared
foreach (var element in Children)
@@ -748,14 +742,8 @@ namespace Avalonia.Controls
{
newValue.InitializeForContext(LayoutContext);
- WeakEventHandlerManager.Subscribe(
- newValue,
- nameof(AttachedLayout.MeasureInvalidated),
- InvalidateMeasureForLayout);
- WeakEventHandlerManager.Subscribe(
- newValue,
- nameof(AttachedLayout.ArrangeInvalidated),
- InvalidateArrangeForLayout);
+ AttachedLayout.MeasureInvalidatedWeakEvent.Subscribe(newValue, this);
+ AttachedLayout.ArrangeInvalidatedWeakEvent.Subscribe(newValue, this);
}
bool isVirtualizingLayout = newValue != null && newValue is VirtualizingLayout;
@@ -806,9 +794,13 @@ namespace Avalonia.Controls
_viewportManager.OnBringIntoViewRequested(e);
}
- private void InvalidateMeasureForLayout(object sender, EventArgs e) => InvalidateMeasure();
-
- private void InvalidateArrangeForLayout(object sender, EventArgs e) => InvalidateArrange();
+ void IWeakEventSubscriber.OnEvent(object? sender, WeakEvent ev, EventArgs e)
+ {
+ if(ev == AttachedLayout.ArrangeInvalidatedWeakEvent)
+ InvalidateArrange();
+ else if (ev == AttachedLayout.MeasureInvalidatedWeakEvent)
+ InvalidateMeasure();
+ }
private VirtualizingLayoutContext GetLayoutContext()
{
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 32428bea53..20d8a94c1a 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1006,13 +1006,28 @@ namespace Avalonia.Controls
if (text != null && clickInfo.Properties.IsLeftButtonPressed && !(clickInfo.Pointer?.Captured is Border))
{
var point = e.GetPosition(_presenter);
- var index = CaretIndex = _presenter.GetCaretIndex(point);
+ var index = _presenter.GetCaretIndex(point);
+ var clickToSelect = index != CaretIndex && e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+
+ if (!clickToSelect)
+ {
+ CaretIndex = index;
+ }
+
#pragma warning disable CS0618 // Type or member is obsolete
switch (e.ClickCount)
#pragma warning restore CS0618 // Type or member is obsolete
{
case 1:
- SelectionStart = SelectionEnd = index;
+ if (clickToSelect)
+ {
+ SelectionStart = Math.Min(index, CaretIndex);
+ SelectionEnd = Math.Max(index, CaretIndex);
+ }
+ else
+ {
+ SelectionStart = SelectionEnd = index;
+ }
break;
case 2:
if (!StringUtils.IsStartOfWord(text, index))
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 5d9a0c8eed..eaee5bdb50 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -34,7 +34,7 @@ namespace Avalonia.Controls
IStyleHost,
ILogicalRoot,
ITextInputMethodRoot,
- IWeakSubscriber
+ IWeakEventSubscriber
{
///
/// Defines the property.
@@ -74,6 +74,12 @@ namespace Avalonia.Controls
public static readonly StyledProperty TransparencyBackgroundFallbackProperty =
AvaloniaProperty.Register(nameof(TransparencyBackgroundFallback), Brushes.White);
+ private static readonly WeakEvent
+ ResourcesChangedWeakEvent = WeakEvent.Register(
+ (s, h) => s.ResourcesChanged += h,
+ (s, h) => s.ResourcesChanged -= h
+ );
+
private readonly IInputManager _inputManager;
private readonly IAccessKeyHandler _accessKeyHandler;
private readonly IKeyboardNavigationHandler _keyboardNavigationHandler;
@@ -178,10 +184,7 @@ namespace Avalonia.Controls
if (((IStyleHost)this).StylingParent is IResourceHost applicationResources)
{
- WeakSubscriptionManager.Subscribe(
- applicationResources,
- nameof(IResourceHost.ResourcesChanged),
- this);
+ ResourcesChangedWeakEvent.Subscribe(applicationResources, this);
}
impl.LostFocus += PlatformImpl_LostFocus;
@@ -286,7 +289,7 @@ namespace Avalonia.Controls
///
IMouseDevice IInputRoot.MouseDevice => PlatformImpl?.MouseDevice;
- void IWeakSubscriber.OnEvent(object sender, ResourcesChangedEventArgs e)
+ void IWeakEventSubscriber.OnEvent(object sender, WeakEvent ev, ResourcesChangedEventArgs e)
{
((ILogical)this).NotifyResourcesChanged(e);
}
diff --git a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
index 1a190391b7..74705a0262 100644
--- a/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
+++ b/src/Avalonia.Controls/Utils/CollectionChangedEventManager.cs
@@ -83,7 +83,7 @@ namespace Avalonia.Controls.Utils
"Collection listener not registered for this collection/listener combination.");
}
- private class Entry : IWeakSubscriber, IDisposable
+ private class Entry : IWeakEventSubscriber, IDisposable
{
private INotifyCollectionChanged _collection;
@@ -91,23 +91,18 @@ namespace Avalonia.Controls.Utils
{
_collection = collection;
Listeners = new List>();
- WeakSubscriptionManager.Subscribe(
- _collection,
- nameof(INotifyCollectionChanged.CollectionChanged),
- this);
+ WeakEvents.CollectionChanged.Subscribe(_collection, this);
}
public List> Listeners { get; }
public void Dispose()
{
- WeakSubscriptionManager.Unsubscribe(
- _collection,
- nameof(INotifyCollectionChanged.CollectionChanged),
- this);
+ WeakEvents.CollectionChanged.Unsubscribe(_collection, this);
}
- void IWeakSubscriber.OnEvent(object? sender, NotifyCollectionChangedEventArgs e)
+ void IWeakEventSubscriber.
+ OnEvent(object? notifyCollectionChanged, WeakEvent ev, NotifyCollectionChangedEventArgs e)
{
static void Notify(
INotifyCollectionChanged incc,
diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
index 9d8842f613..f8a7cdc690 100644
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
+
+
+
@@ -40,7 +54,18 @@
-
+
+
+
@@ -53,9 +78,10 @@
-
+
-
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
index 6f2ac96a66..35c9e27f1a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -6,6 +6,36 @@
public event EventHandler? MeasureInvalidated;
+ ///
+ /// Occurs when the measurement state (layout) has been invalidated.
+ ///
+ public static readonly WeakEvent MeasureInvalidatedWeakEvent =
+ WeakEvent.Register(
+ (s, h) => s.MeasureInvalidated += h,
+ (s, h) => s.MeasureInvalidated -= h);
+
///
/// Occurs when the arrange state (layout) has been invalidated.
///
public event EventHandler? ArrangeInvalidated;
+
+ ///
+ /// Occurs when the arrange state (layout) has been invalidated.
+ ///
+ public static readonly WeakEvent ArrangeInvalidatedWeakEvent =
+ WeakEvent.Register(
+ (s, h) => s.ArrangeInvalidated += h,
+ (s, h) => s.ArrangeInvalidated -= h);
///
/// Initializes any per-container state the layout requires when it is attached to an
diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj
index c1cd19c394..f2c4b0540b 100644
--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ b/src/Avalonia.Layout/Avalonia.Layout.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
diff --git a/src/Avalonia.MicroCom/MicroComRuntime.cs b/src/Avalonia.MicroCom/MicroComRuntime.cs
index 85507674d2..e0f524146a 100644
--- a/src/Avalonia.MicroCom/MicroComRuntime.cs
+++ b/src/Avalonia.MicroCom/MicroComRuntime.cs
@@ -36,7 +36,13 @@ namespace Avalonia.MicroCom
public static T CreateProxyFor(void* pObject, bool ownsHandle) => (T)CreateProxyFor(typeof(T), new IntPtr(pObject), ownsHandle);
public static T CreateProxyFor(IntPtr pObject, bool ownsHandle) => (T)CreateProxyFor(typeof(T), pObject, ownsHandle);
+
+ public static T CreateProxyOrNullFor(void* pObject, bool ownsHandle) where T : class =>
+ pObject == null ? null : (T)CreateProxyFor(typeof(T), new IntPtr(pObject), ownsHandle);
+ public static T CreateProxyOrNullFor(IntPtr pObject, bool ownsHandle) where T : class =>
+ pObject == IntPtr.Zero ? null : (T)CreateProxyFor(typeof(T), pObject, ownsHandle);
+
public static object CreateProxyFor(Type type, IntPtr pObject, bool ownsHandle) => _factories[type](pObject, ownsHandle);
public static IntPtr GetNativeIntPtr(this T obj, bool owned = false) where T : IUnknown
diff --git a/src/Avalonia.MicroCom/MicroComVtblBase.cs b/src/Avalonia.MicroCom/MicroComVtblBase.cs
index 2f0607c0a8..7092f8131a 100644
--- a/src/Avalonia.MicroCom/MicroComVtblBase.cs
+++ b/src/Avalonia.MicroCom/MicroComVtblBase.cs
@@ -21,6 +21,11 @@ namespace Avalonia.MicroCom
AddMethod((AddRefDelegate)Release);
}
+ protected void AddMethod(void* f)
+ {
+ _methods.Add(new IntPtr(f));
+ }
+
protected void AddMethod(Delegate d)
{
GCHandle.Alloc(d);
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index c37bef0488..9301fd4d91 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -4,8 +4,9 @@
$([MSBuild]::IsOSPlatform(OSX))
$(PackAvaloniaNative)
true
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
true
+ Avalonia.MicroCom
@@ -20,7 +21,7 @@
-
+
+
-
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index bda1c91750..40ffc31728 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -80,8 +80,8 @@ namespace Avalonia.Native
};
result.Add(aboutItem);
- var macOpts = AvaloniaLocator.Current.GetService();
- if (macOpts == null || !macOpts.DisableDefaultApplicationMenuItems)
+ var macOpts = AvaloniaLocator.Current.GetService() ?? new MacOSPlatformOptions();
+ if (!macOpts.DisableDefaultApplicationMenuItems)
{
result.Add(new NativeMenuItemSeparator());
@@ -131,7 +131,7 @@ namespace Avalonia.Native
};
quitItem.Click += (sender, args) =>
{
- _applicationCommands.ShowAll();
+ (Application.Current.ApplicationLifetime as IControlledApplicationLifetime)?.Shutdown();
};
result.Add(quitItem);
}
@@ -142,9 +142,9 @@ namespace Avalonia.Native
private void DoLayoutReset(bool forceUpdate = false)
{
- var macOpts = AvaloniaLocator.Current.GetService();
+ var macOpts = AvaloniaLocator.Current.GetService() ?? new MacOSPlatformOptions();
- if (macOpts != null && macOpts.DisableNativeMenus)
+ if (macOpts.DisableNativeMenus)
{
return;
}
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index 522db1b334..1eadf70b13 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -26,9 +26,15 @@ namespace Avalonia.Native
public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(500); //TODO
+ ///
+ public Size TouchDoubleClickSize => new Size(16, 16);
+
+ ///
+ public TimeSpan TouchDoubleClickTime => DoubleClickTime;
+
public static AvaloniaNativePlatform Initialize(IntPtr factory, AvaloniaNativePlatformOptions options)
{
- var result = new AvaloniaNativePlatform(MicroComRuntime.CreateProxyFor(factory, true));
+ var result = new AvaloniaNativePlatform(MicroComRuntime.CreateProxyFor(factory, true));
result.DoInitialize(options);
return result;
@@ -55,14 +61,14 @@ namespace Avalonia.Native
return Initialize(CreateAvaloniaNative(), options);
}
- public void SetupApplicationMenuExporter ()
+ public void SetupApplicationMenuExporter()
{
var exporter = new AvaloniaNativeMenuExporter(_factory);
}
- public void SetupApplicationName ()
+ public void SetupApplicationName()
{
- if(!string.IsNullOrWhiteSpace(Application.Current.Name))
+ if (!string.IsNullOrWhiteSpace(Application.Current.Name))
{
_factory.MacOptions.SetApplicationTitle(Application.Current.Name);
}
@@ -80,19 +86,19 @@ namespace Avalonia.Native
GCHandle.FromIntPtr(handle).Free();
}
}
-
+
void DoInitialize(AvaloniaNativePlatformOptions options)
{
_options = options;
-
+
var applicationPlatform = new AvaloniaNativeApplicationPlatform();
-
+
_factory.Initialize(new GCHandleDeallocator(), applicationPlatform);
if (_factory.MacOptions != null)
{
- var macOpts = AvaloniaLocator.Current.GetService();
+ var macOpts = AvaloniaLocator.Current.GetService() ?? new MacOSPlatformOptions();
- _factory.MacOptions.SetShowInDock(macOpts?.ShowInDock != false ? 1 : 0);
+ _factory.MacOptions.SetShowInDock(macOpts.ShowInDock ? 1 : 0);
}
AvaloniaLocator.CurrentMutable
@@ -118,7 +124,7 @@ namespace Avalonia.Native
hotkeys.MoveCursorToTheStartOfLineWithSelection.Add(new KeyGesture(Key.Left, hotkeys.CommandModifiers | hotkeys.SelectionModifiers));
hotkeys.MoveCursorToTheEndOfLine.Add(new KeyGesture(Key.Right, hotkeys.CommandModifiers));
hotkeys.MoveCursorToTheEndOfLineWithSelection.Add(new KeyGesture(Key.Right, hotkeys.CommandModifiers | hotkeys.SelectionModifiers));
-
+
if (_options.UseGpu)
{
try
@@ -133,7 +139,7 @@ namespace Avalonia.Native
}
}
- public ITrayIconImpl CreateTrayIcon ()
+ public ITrayIconImpl CreateTrayIcon()
{
return new TrayIconImpl(_factory);
}
@@ -159,8 +165,8 @@ namespace Avalonia.Native
ShowInDock = true;
}
- public bool ShowInDock
- {
+ public bool ShowInDock
+ {
get => _showInDock;
set
{
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 4a3baa2788..87b7a7608e 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -28,18 +28,18 @@ namespace Avalonia.Native
public string HandleDescriptor => "NSWindow";
- public IntPtr NSView => _native.ObtainNSViewHandle();
+ public IntPtr NSView => _native?.ObtainNSViewHandle() ?? IntPtr.Zero;
- public IntPtr NSWindow => _native.ObtainNSWindowHandle();
+ public IntPtr NSWindow => _native?.ObtainNSWindowHandle() ?? IntPtr.Zero;
public IntPtr GetNSViewRetained()
{
- return _native.ObtainNSViewHandleRetained();
+ return _native?.ObtainNSViewHandleRetained() ?? IntPtr.Zero;
}
public IntPtr GetNSWindowRetained()
{
- return _native.ObtainNSWindowHandleRetained();
+ return _native?.ObtainNSWindowHandleRetained() ?? IntPtr.Zero;
}
}
@@ -260,7 +260,7 @@ namespace Avalonia.Native
public void Activate()
{
- _native.Activate();
+ _native?.Activate();
}
public bool RawTextInputEvent(uint timeStamp, string text)
@@ -322,7 +322,7 @@ namespace Avalonia.Native
public void Resize(Size clientSize, PlatformResizeReason reason)
{
- _native.Resize(clientSize.Width, clientSize.Height, (AvnPlatformResizeReason)reason);
+ _native?.Resize(clientSize.Width, clientSize.Height, (AvnPlatformResizeReason)reason);
}
public IRenderer CreateRenderer(IRenderRoot root)
@@ -367,14 +367,14 @@ namespace Avalonia.Native
public virtual void Show(bool activate, bool isDialog)
{
- _native.Show(activate.AsComBool(), isDialog.AsComBool());
+ _native?.Show(activate.AsComBool(), isDialog.AsComBool());
}
public PixelPoint Position
{
- get => _native.Position.ToAvaloniaPixelPoint();
- set => _native.SetPosition(value.ToAvnPoint());
+ get => _native?.Position.ToAvaloniaPixelPoint() ?? default;
+ set => _native?.SetPosition(value.ToAvnPoint());
}
public Point PointToClient(PixelPoint point)
@@ -389,12 +389,12 @@ namespace Avalonia.Native
public void Hide()
{
- _native.Hide();
+ _native?.Hide();
}
public void BeginMoveDrag(PointerPressedEventArgs e)
{
- _native.BeginMoveDrag();
+ _native?.BeginMoveDrag();
}
public Size MaxAutoSizeHint => Screen.AllScreens.Select(s => s.Bounds.Size.ToSize(1))
@@ -402,7 +402,7 @@ namespace Avalonia.Native
public void SetTopmost(bool value)
{
- _native.SetTopMost(value.AsComBool());
+ _native?.SetTopMost(value.AsComBool());
}
public double RenderScaling => _native?.Scaling ?? 1;
@@ -438,7 +438,7 @@ namespace Avalonia.Native
public void SetMinMaxSize(Size minSize, Size maxSize)
{
- _native.SetMinMaxSize(minSize.ToAvnSize(), maxSize.ToAvnSize());
+ _native?.SetMinMaxSize(minSize.ToAvnSize(), maxSize.ToAvnSize());
}
public void BeginResizeDrag(WindowEdge edge, PointerPressedEventArgs e)
@@ -449,7 +449,7 @@ namespace Avalonia.Native
internal void BeginDraggingSession(AvnDragDropEffects effects, AvnPoint point, IAvnClipboard clipboard,
IAvnDndResultCallback callback, IntPtr sourceHandle)
{
- _native.BeginDragAndDropOperation(effects, point, clipboard, callback, sourceHandle);
+ _native?.BeginDragAndDropOperation(effects, point, clipboard, callback, sourceHandle);
}
public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 5649d46102..2b32926008 100644
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
true
diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
index 189b156569..348f5f3a10 100644
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
Avalonia.ReactiveUI
false
diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
index 63456bc13a..a475cf5eac 100644
--- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs
+++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
@@ -57,7 +57,13 @@ namespace Avalonia.ReactiveUI
///
public static readonly StyledProperty RouterProperty =
AvaloniaProperty.Register(nameof(Router));
-
+
+ ///
+ /// for the property.
+ ///
+ public static readonly StyledProperty ViewContractProperty =
+ AvaloniaProperty.Register(nameof(ViewContract));
+
///
/// Initializes a new instance of the class.
///
@@ -70,15 +76,18 @@ namespace Avalonia.ReactiveUI
.Where(router => router == null)!
.Cast();
+ var viewContract = this.WhenAnyValue(x => x.ViewContract);
+
this.WhenAnyValue(x => x.Router)
.Where(router => router != null)
.SelectMany(router => router!.CurrentViewModel)
.Merge(routerRemoved)
- .Subscribe(NavigateToViewModel)
+ .CombineLatest(viewContract)
+ .Subscribe(tuple => NavigateToViewModel(tuple.First, tuple.Second))
.DisposeWith(disposables);
});
}
-
+
///
/// Gets or sets the of the view model stack.
///
@@ -87,17 +96,27 @@ namespace Avalonia.ReactiveUI
get => GetValue(RouterProperty);
set => SetValue(RouterProperty, value);
}
-
+
+ ///
+ /// Gets or sets the view contract.
+ ///
+ public string? ViewContract
+ {
+ get => GetValue(ViewContractProperty);
+ set => SetValue(ViewContractProperty, value);
+ }
+
///
/// Gets or sets the ReactiveUI view locator used by this router.
///
public IViewLocator? ViewLocator { get; set; }
-
+
///
/// Invoked when ReactiveUI router navigates to a view model.
///
/// ViewModel to which the user navigates.
- private void NavigateToViewModel(object? viewModel)
+ /// The contract for view resolution.
+ private void NavigateToViewModel(object? viewModel, string? contract)
{
if (Router == null)
{
@@ -112,17 +131,33 @@ namespace Avalonia.ReactiveUI
Content = DefaultContent;
return;
}
-
+
var viewLocator = ViewLocator ?? global::ReactiveUI.ViewLocator.Current;
- var viewInstance = viewLocator.ResolveView(viewModel);
+ var viewInstance = viewLocator.ResolveView(viewModel, contract);
if (viewInstance == null)
{
- this.Log().Warn($"Couldn't find view for '{viewModel}'. Is it registered? Falling back to default content.");
+ if (contract == null)
+ {
+ this.Log().Warn($"Couldn't find view for '{viewModel}'. Is it registered? Falling back to default content.");
+ }
+ else
+ {
+ this.Log().Warn($"Couldn't find view with contract '{contract}' for '{viewModel}'. Is it registered? Falling back to default content.");
+ }
+
Content = DefaultContent;
return;
}
-
- this.Log().Info($"Ready to show {viewInstance} with autowired {viewModel}.");
+
+ if (contract == null)
+ {
+ this.Log().Info($"Ready to show {viewInstance} with autowired {viewModel}.");
+ }
+ else
+ {
+ this.Log().Info($"Ready to show {viewInstance} with autowired {viewModel} and contract '{contract}'.");
+ }
+
viewInstance.ViewModel = viewModel;
if (viewInstance is IDataContextProvider provider)
provider.DataContext = viewModel;
diff --git a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
index c88323d674..16dee00ebc 100644
--- a/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
+++ b/src/Avalonia.ReactiveUI/ViewModelViewHost.cs
@@ -3,7 +3,7 @@ using System.Reactive.Disposables;
using ReactiveUI;
using Splat;
-namespace Avalonia.ReactiveUI
+namespace Avalonia.ReactiveUI
{
///
/// This content control will automatically load the View associated with
@@ -18,6 +18,12 @@ namespace Avalonia.ReactiveUI
public static readonly AvaloniaProperty ViewModelProperty =
AvaloniaProperty.Register(nameof(ViewModel));
+ ///
+ /// for the property.
+ ///
+ public static readonly StyledProperty ViewContractProperty =
+ AvaloniaProperty.Register(nameof(ViewContract));
+
///
/// Initializes a new instance of the class.
///
@@ -25,8 +31,8 @@ namespace Avalonia.ReactiveUI
{
this.WhenActivated(disposables =>
{
- this.WhenAnyValue(x => x.ViewModel)
- .Subscribe(NavigateToViewModel)
+ this.WhenAnyValue(x => x.ViewModel, x => x.ViewContract)
+ .Subscribe(tuple => NavigateToViewModel(tuple.Item1, tuple.Item2))
.DisposeWith(disposables);
});
}
@@ -39,7 +45,16 @@ namespace Avalonia.ReactiveUI
get => GetValue(ViewModelProperty);
set => SetValue(ViewModelProperty, value);
}
-
+
+ ///
+ /// Gets or sets the view contract.
+ ///
+ public string? ViewContract
+ {
+ get => GetValue(ViewContractProperty);
+ set => SetValue(ViewContractProperty, value);
+ }
+
///
/// Gets or sets the view locator.
///
@@ -49,7 +64,8 @@ namespace Avalonia.ReactiveUI
/// Invoked when ReactiveUI router navigates to a view model.
///
/// ViewModel to which the user navigates.
- private void NavigateToViewModel(object? viewModel)
+ /// The contract for view resolution.
+ private void NavigateToViewModel(object? viewModel, string? contract)
{
if (viewModel == null)
{
@@ -57,17 +73,33 @@ namespace Avalonia.ReactiveUI
Content = DefaultContent;
return;
}
-
+
var viewLocator = ViewLocator ?? global::ReactiveUI.ViewLocator.Current;
- var viewInstance = viewLocator.ResolveView(viewModel);
+ var viewInstance = viewLocator.ResolveView(viewModel, contract);
if (viewInstance == null)
{
- this.Log().Warn($"Couldn't find view for '{viewModel}'. Is it registered? Falling back to default content.");
+ if (contract == null)
+ {
+ this.Log().Warn($"Couldn't find view for '{viewModel}'. Is it registered? Falling back to default content.");
+ }
+ else
+ {
+ this.Log().Warn($"Couldn't find view with contract '{contract}' for '{viewModel}'. Is it registered? Falling back to default content.");
+ }
+
Content = DefaultContent;
return;
}
-
- this.Log().Info($"Ready to show {viewInstance} with autowired {viewModel}.");
+
+ if (contract == null)
+ {
+ this.Log().Info($"Ready to show {viewInstance} with autowired {viewModel}.");
+ }
+ else
+ {
+ this.Log().Info($"Ready to show {viewInstance} with autowired {viewModel} and contract '{contract}'.");
+ }
+
viewInstance.ViewModel = viewModel;
if (viewInstance is IStyledElement styled)
styled.DataContext = viewModel;
diff --git a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
index 3be0a688ab..5a8301a2e9 100644
--- a/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
+++ b/src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
AVALONIA_REMOTE_PROTOCOL;$(DefineConstants)
true
Key.snk
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
index 3548749846..139ba1bd2e 100644
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
Avalonia.Styling
Avalonia
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index d132dc4f5d..678f75b43f 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
diff --git a/src/Avalonia.Themes.Default/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
index ce2b85d2b5..561ca8bedd 100644
--- a/src/Avalonia.Themes.Default/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
@@ -5,6 +5,7 @@
+
+
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index 47704c12bd..1b4d66405b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -20,6 +20,7 @@
-
+
+
+
+
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.cs b/src/Avalonia.Themes.Fluent/FluentTheme.cs
index 43b71567fa..53be41e4d1 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.cs
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
using Avalonia.Styling;
#nullable enable
@@ -17,11 +18,14 @@ namespace Avalonia.Themes.Fluent
///
/// Includes the fluent theme in an application.
///
- public class FluentTheme : IStyle, IResourceProvider
+ public class FluentTheme : AvaloniaObject, IStyle, IResourceProvider
{
private readonly Uri _baseUri;
- private IStyle[]? _loaded;
+ private Styles _fluentDark = new();
+ private Styles _fluentLight = new();
+ private Styles _sharedStyles = new();
private bool _isLoading;
+ private IStyle? _loaded;
///
/// Initializes a new instance of the class.
@@ -30,6 +34,7 @@ namespace Avalonia.Themes.Fluent
public FluentTheme(Uri baseUri)
{
_baseUri = baseUri;
+ InitStyles(baseUri);
}
///
@@ -39,12 +44,37 @@ namespace Avalonia.Themes.Fluent
public FluentTheme(IServiceProvider serviceProvider)
{
_baseUri = ((IUriContext)serviceProvider.GetService(typeof(IUriContext))).BaseUri;
+ InitStyles(_baseUri);
}
+
+ public static readonly StyledProperty ModeProperty =
+ AvaloniaProperty.Register(nameof(Mode));
///
/// Gets or sets the mode of the fluent theme (light, dark).
///
- public FluentThemeMode Mode { get; set; }
+ public FluentThemeMode Mode
+ {
+ get => GetValue(ModeProperty);
+ set => SetValue(ModeProperty, value);
+ }
+ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+ {
+ base.OnPropertyChanged(change);
+ if (change.Property == ModeProperty)
+ {
+ if (Mode == FluentThemeMode.Dark)
+ {
+ (Loaded as Styles)![1] = _fluentDark[0];
+ (Loaded as Styles)![2] = _fluentDark[1];
+ }
+ else
+ {
+ (Loaded as Styles)![1] = _fluentLight[0];
+ (Loaded as Styles)![2] = _fluentLight[1];
+ }
+ }
+ }
public IResourceHost? Owner => (Loaded as IResourceProvider)?.Owner;
@@ -58,18 +88,25 @@ namespace Avalonia.Themes.Fluent
if (_loaded == null)
{
_isLoading = true;
- var loaded = (IStyle)AvaloniaXamlLoader.Load(GetUri(), _baseUri);
- _loaded = new[] { loaded };
+
+ if (Mode == FluentThemeMode.Light)
+ {
+ _loaded = new Styles() { _sharedStyles , _fluentLight[0], _fluentLight[1] };
+ }
+ else if (Mode == FluentThemeMode.Dark)
+ {
+ _loaded = new Styles() { _sharedStyles, _fluentDark[0], _fluentDark[1] };
+ }
_isLoading = false;
}
- return _loaded?[0]!;
+ return _loaded!;
}
}
bool IResourceNode.HasResources => (Loaded as IResourceProvider)?.HasResources ?? false;
- IReadOnlyList IStyle.Children => _loaded ?? Array.Empty();
+ IReadOnlyList IStyle.Children => _loaded?.Children ?? Array.Empty();
public event EventHandler OwnerChanged
{
@@ -105,10 +142,47 @@ namespace Avalonia.Themes.Fluent
void IResourceProvider.AddOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.AddOwner(owner);
void IResourceProvider.RemoveOwner(IResourceHost owner) => (Loaded as IResourceProvider)?.RemoveOwner(owner);
- private Uri GetUri() => Mode switch
+ private void InitStyles(Uri baseUri)
{
- FluentThemeMode.Dark => new Uri("avares://Avalonia.Themes.Fluent/FluentDark.xaml", UriKind.Absolute),
- _ => new Uri("avares://Avalonia.Themes.Fluent/FluentLight.xaml", UriKind.Absolute),
- };
+ _sharedStyles = new Styles
+ {
+ new StyleInclude(baseUri)
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml")
+ },
+ new StyleInclude(baseUri)
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/Base.xaml")
+ },
+ new StyleInclude(baseUri)
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml")
+ }
+ };
+
+ _fluentLight = new Styles
+ {
+ new StyleInclude(baseUri)
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml")
+ },
+ new StyleInclude(baseUri)
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml")
+ }
+ };
+
+ _fluentDark = new Styles
+ {
+ new StyleInclude(baseUri)
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml")
+ },
+ new StyleInclude(baseUri)
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml")
+ }
+ };
+ }
}
}
diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt
index ad9a5fd71a..68e3673cfe 100644
--- a/src/Avalonia.Visuals/ApiCompatBaseline.txt
+++ b/src/Avalonia.Visuals/ApiCompatBaseline.txt
@@ -7,6 +7,9 @@ InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Task
MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.PageSlide.Start(Avalonia.Visual, Avalonia.Visual, System.Boolean)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public void Avalonia.Media.GlyphRun..ctor()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public void Avalonia.Media.GlyphRun.GlyphTypeface.set(Avalonia.Media.GlyphTypeface)' does not exist in the implementation but it does exist in the contract.
+CannotSealType : Type 'Avalonia.Media.Pen' is actually (has the sealed modifier) sealed in the implementation but not sealed in the contract.
+MembersMustExist : Member 'protected void Avalonia.Media.Pen.AffectsRender(Avalonia.AvaloniaProperty[])' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected void Avalonia.Media.Pen.RaiseInvalidated(System.EventArgs)' does not exist in the implementation but it does exist in the contract.
TypeCannotChangeClassification : Type 'Avalonia.Media.Immutable.ImmutableSolidColorBrush' is a 'class' in the implementation but is a 'struct' in the contract.
MembersMustExist : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext)' does not exist in the implementation but it does exist in the contract.
CannotAddAbstractMembers : Member 'public void Avalonia.Media.TextFormatting.DrawableTextRun.Draw(Avalonia.Media.DrawingContext, Avalonia.Point)' is abstract in the implementation but is missing in the contract.
@@ -79,4 +82,8 @@ InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWr
InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.String)' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToHeight(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToWidth(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
-Total Issues: 79
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avalonia.Platform.IPlatformSettings.TouchDoubleClickSize' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Size Avalonia.Platform.IPlatformSettings.TouchDoubleClickSize.get()' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.TimeSpan Avalonia.Platform.IPlatformSettings.TouchDoubleClickTime.get()' is present in the implementation but not in the contract.
+Total Issues: 87
diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
index 486f08913c..6c978e970e 100644
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
Avalonia
true
diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs
index 7c966a35cf..65ba851100 100644
--- a/src/Avalonia.Visuals/Media/Pen.cs
+++ b/src/Avalonia.Visuals/Media/Pen.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Media
///
/// Describes how a stroke is drawn.
///
- public class Pen : AvaloniaObject, IPen
+ public sealed class Pen : AvaloniaObject, IPen, IWeakEventSubscriber
{
///
/// Defines the property.
@@ -45,6 +45,10 @@ namespace Avalonia.Media
public static readonly StyledProperty MiterLimitProperty =
AvaloniaProperty.Register(nameof(MiterLimit), 10.0);
+ private EventHandler? _invalidated;
+ private IAffectsRender? _subscribedToBrush;
+ private IAffectsRender? _subscribedToDashes;
+
///
/// Initializes a new instance of the class.
///
@@ -96,17 +100,6 @@ namespace Avalonia.Media
DashStyle = dashStyle;
}
- static Pen()
- {
- AffectsRender(
- BrushProperty,
- ThicknessProperty,
- DashStyleProperty,
- LineCapProperty,
- LineJoinProperty,
- MiterLimitProperty);
- }
-
///
/// Gets or sets the brush used to draw the stroke.
///
@@ -116,6 +109,11 @@ namespace Avalonia.Media
set => SetValue(BrushProperty, value);
}
+ private static readonly WeakEvent InvalidatedWeakEvent =
+ WeakEvent.Register(
+ (s, h) => s.Invalidated += h,
+ (s, h) => s.Invalidated -= h);
+
///
/// Gets or sets the stroke thickness.
///
@@ -165,7 +163,19 @@ namespace Avalonia.Media
///
/// Raised when the pen changes.
///
- public event EventHandler? Invalidated;
+ public event EventHandler? Invalidated
+ {
+ add
+ {
+ _invalidated += value;
+ UpdateSubscriptions();
+ }
+ remove
+ {
+ _invalidated -= value;
+ UpdateSubscriptions();
+ }
+ }
///
/// Creates an immutable clone of the brush.
@@ -182,68 +192,42 @@ namespace Avalonia.Media
MiterLimit);
}
- ///
- /// Marks a property as affecting the pen's visual representation.
- ///
- /// The properties.
- ///
- /// After a call to this method in a pen's static constructor, any change to the
- /// property will cause the event to be raised on the pen.
- ///
- protected static void AffectsRender(params AvaloniaProperty[] properties)
- where T : Pen
+ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
- static void Invalidate(AvaloniaPropertyChangedEventArgs e)
- {
- if (e.Sender is T sender)
- {
- sender.RaiseInvalidated(EventArgs.Empty);
- }
- }
+ _invalidated?.Invoke(this, EventArgs.Empty);
+ if(change.Property == BrushProperty)
+ UpdateSubscription(ref _subscribedToBrush, Brush);
+ if(change.Property == DashStyleProperty)
+ UpdateSubscription(ref _subscribedToDashes, DashStyle);
+ base.OnPropertyChanged(change);
+ }
- static void InvalidateAndSubscribe(AvaloniaPropertyChangedEventArgs e)
+
+ void UpdateSubscription(ref IAffectsRender? field, object? value)
+ {
+ if ((_invalidated == null || field != value) && field != null)
{
- if (e.Sender is T sender)
- {
- if (e.OldValue is IAffectsRender oldValue)
- {
- WeakEventHandlerManager.Unsubscribe(
- oldValue,
- nameof(oldValue.Invalidated),
- sender.AffectsRenderInvalidated);
- }
-
- if (e.NewValue is IAffectsRender newValue)
- {
- WeakEventHandlerManager.Subscribe(
- newValue,
- nameof(newValue.Invalidated),
- sender.AffectsRenderInvalidated);
- }
-
- sender.RaiseInvalidated(EventArgs.Empty);
- }
+ InvalidatedWeakEvent.Unsubscribe(field, this);
+ field = null;
}
- foreach (var property in properties)
+ if (_invalidated != null && field != value && value is IAffectsRender affectsRender)
{
- if (property.CanValueAffectRender())
- {
- property.Changed.Subscribe(e => InvalidateAndSubscribe(e));
- }
- else
- {
- property.Changed.Subscribe(e => Invalidate(e));
- }
+ InvalidatedWeakEvent.Subscribe(affectsRender, this);
+ field = affectsRender;
}
}
- ///
- /// Raises the event.
- ///
- /// The event args.
- protected void RaiseInvalidated(EventArgs e) => Invalidated?.Invoke(this, e);
-
- private void AffectsRenderInvalidated(object? sender, EventArgs e) => RaiseInvalidated(EventArgs.Empty);
+ void UpdateSubscriptions()
+ {
+ UpdateSubscription(ref _subscribedToBrush, Brush);
+ UpdateSubscription(ref _subscribedToDashes, DashStyle);
+ }
+
+ void IWeakEventSubscriber.OnEvent(object? sender, WeakEvent ev, EventArgs e)
+ {
+ if (ev == InvalidatedWeakEvent)
+ _invalidated?.Invoke(this, EventArgs.Empty);
+ }
}
}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
index 40891a700d..0f6b81975a 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
@@ -80,12 +80,12 @@ namespace Avalonia.Media.TextFormatting.Unicode
}
}
- var shouldBreak = GetSimpleBreak() ?? (bool?)GetPairTableBreak(lastClass);
+ var shouldBreak = GetSimpleBreak() ?? GetPairTableBreak(lastClass);
// Rule LB8a
_lb8a = _nextClass == LineBreakClass.ZWJ;
- if (shouldBreak.Value)
+ if (shouldBreak)
{
Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition);
return true;
diff --git a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs b/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
index bcb00df5d6..e4b28e6575 100644
--- a/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
+++ b/src/Avalonia.Visuals/Platform/IPlatformSettings.cs
@@ -7,5 +7,15 @@ namespace Avalonia.Platform
Size DoubleClickSize { get; }
TimeSpan DoubleClickTime { get; }
+
+ ///
+ /// Determines the size of the area within that you should click twice in order for a double click to be counted.
+ ///
+ Size TouchDoubleClickSize { get; }
+
+ ///
+ /// Determines the time span that what will be used to determine the double-click.
+ ///
+ TimeSpan TouchDoubleClickTime { get; }
}
}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
index cb916293ac..63c22efc3f 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@@ -126,7 +126,12 @@ namespace Avalonia.Rendering.SceneGraph
while (node == null && visual.IsVisible)
{
- visual = visual.VisualParent!;
+ var parent = visual.VisualParent;
+
+ if (parent is null)
+ return null;
+
+ visual = parent;
node = scene.FindNode(visual);
}
diff --git a/src/Avalonia.X11/Avalonia.X11.csproj b/src/Avalonia.X11/Avalonia.X11.csproj
index f9efe5581f..9ba5c9d15f 100644
--- a/src/Avalonia.X11/Avalonia.X11.csproj
+++ b/src/Avalonia.X11/Avalonia.X11.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
true
Avalonia.X11
diff --git a/src/Avalonia.X11/Glx/GlxDisplay.cs b/src/Avalonia.X11/Glx/GlxDisplay.cs
index fa8c866c09..fcdc10e999 100644
--- a/src/Avalonia.X11/Glx/GlxDisplay.cs
+++ b/src/Avalonia.X11/Glx/GlxDisplay.cs
@@ -95,8 +95,8 @@ namespace Avalonia.X11.Glx
if (Environment.GetEnvironmentVariable("AVALONIA_GLX_IGNORE_RENDERER_BLACKLIST") != "1")
{
- var blacklist = AvaloniaLocator.Current.GetService()
- ?.GlxRendererBlacklist;
+ var opts = AvaloniaLocator.Current.GetService() ?? new X11PlatformOptions();
+ var blacklist = opts.GlxRendererBlacklist;
if (blacklist != null)
foreach (var item in blacklist)
if (glInterface.Renderer.Contains(item))
diff --git a/src/Avalonia.X11/Stubs.cs b/src/Avalonia.X11/Stubs.cs
index ec694ba9a8..f73512f1e8 100644
--- a/src/Avalonia.X11/Stubs.cs
+++ b/src/Avalonia.X11/Stubs.cs
@@ -1,10 +1,4 @@
using System;
-using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Controls.Platform;
-using Avalonia.Input;
-using Avalonia.Input.Platform;
using Avalonia.Platform;
namespace Avalonia.X11
@@ -13,5 +7,11 @@ namespace Avalonia.X11
{
public Size DoubleClickSize { get; } = new Size(2, 2);
public TimeSpan DoubleClickTime { get; } = TimeSpan.FromMilliseconds(500);
+
+ ///
+ public Size TouchDoubleClickSize => new Size(16, 16);
+
+ ///
+ public TimeSpan TouchDoubleClickTime => DoubleClickTime;
}
}
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index a18f91d301..ec3f29c806 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -68,6 +68,7 @@ namespace Avalonia.X11
//TODO: log
if (options.UseDBusMenu)
DBusHelper.TryInitialize();
+
AvaloniaLocator.CurrentMutable.BindToSelf(this)
.Bind().ToConstant(this)
.Bind().ToConstant(new X11PlatformThreading(this))
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 982bca6439..211a8e4f79 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -1157,7 +1157,7 @@ namespace Avalonia.X11
public ITextInputMethodImpl TextInputMethod => _ime;
public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel) =>
- _transparencyHelper.SetTransparencyRequest(transparencyLevel);
+ _transparencyHelper?.SetTransparencyRequest(transparencyLevel);
public void SetWindowManagerAddShadowHint(bool enabled)
{
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index a3f0c01a51..869602e452 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,4 +2,10 @@
+
+
+ Shared\_ModuleInitializer.cs
+ false
+
+
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
index 41e3049bb8..6a2eb18385 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
true
Avalonia.LinuxFramebuffer
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
index f4db6bf48a..4add4c423b 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs
@@ -38,11 +38,11 @@ namespace Avalonia.LinuxFramebuffer
if (_fb is IGlOutputBackend gl)
AvaloniaLocator.CurrentMutable.Bind().ToConstant(gl.PlatformOpenGlInterface);
- var opts = AvaloniaLocator.Current.GetService();
+ var opts = AvaloniaLocator.Current.GetService() ?? new LinuxFramebufferPlatformOptions();
AvaloniaLocator.CurrentMutable
.Bind().ToConstant(Threading)
- .Bind().ToConstant(new DefaultRenderTimer(opts?.Fps ?? 60))
+ .Bind().ToConstant(new DefaultRenderTimer(opts.Fps))
.Bind().ToConstant(new RenderLoop())
.Bind().ToTransient()
.Bind().ToConstant(new KeyboardDevice())
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs b/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
index 642be28c69..dd60d5f09d 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Stubs.cs
@@ -18,5 +18,9 @@ namespace Avalonia.LinuxFramebuffer
{
public Size DoubleClickSize { get; } = new Size(4, 4);
public TimeSpan DoubleClickTime { get; } = new TimeSpan(0, 0, 0, 0, 500);
+
+ public Size TouchDoubleClickSize => new Size(16,16);
+
+ public TimeSpan TouchDoubleClickTime => DoubleClickTime;
}
}
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
index fdfb99789e..f75c96c759 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
true
Avalonia.Markup.Xaml.Loader
$(DefineConstants);XAMLX_INTERNAL
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
index 4d21a29eb9..048a6220c5 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathTransformer.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using XamlX.Ast;
using XamlX.Transform;
+using XamlX.Transform.Transformers;
using XamlX.TypeSystem;
namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
@@ -15,7 +16,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
{
IXamlType startType = null;
var sourceProperty = binding.Children.OfType().FirstOrDefault(c => c.Property.Name == "Source");
- if ((sourceProperty?.Values.Count ?? 0) == 1)
+ var dataTypeProperty = binding.Children.OfType().FirstOrDefault(c => c.Property.Name == "DataType");
+ if (sourceProperty?.Values.Count is 1)
{
var sourceValue = sourceProperty.Values[0];
switch (sourceValue)
@@ -99,6 +101,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
}
}
+ if (dataTypeProperty?.Values.Count is 1 && dataTypeProperty.Values[0] is XamlAstTextNode text)
+ {
+ startType = TypeReferenceResolver.ResolveType(context, text.Text, isMarkupExtension: false, text, strict: true).Type;
+ }
+
Func startTypeResolver = startType is not null ? () => startType : () =>
{
var parentDataContextNode = context.ParentNodes().OfType().FirstOrDefault();
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
index 24dd3f7771..cf691db860 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDataContextTypeTransformer.cs
@@ -155,6 +155,12 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
{
Func startTypeResolver = () =>
{
+ var dataTypeProperty = obj.Children.OfType().FirstOrDefault(c => c.Property.Name == "DataType");
+ if (dataTypeProperty?.Values.Count is 1 && dataTypeProperty.Values[0] is XamlAstTextNode text)
+ {
+ return TypeReferenceResolver.ResolveType(context, text.Text, isMarkupExtension: false, text, strict: true).Type;
+ }
+
var parentDataContextNode = context.ParentNodes().OfType().FirstOrDefault();
if (parentDataContextNode is null)
{
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index ac6aced8cb..86132c5d27 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -1,6 +1,6 @@
- netstandard2.0;net6.0
+ net6.0;netstandard2.0
$(DefineConstants);PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER;XAMLX_INTERNAL
false
$(DefineConstants);RUNTIME_XAML_CECIL
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
index 41de2355aa..0125156750 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindingExtension.cs
@@ -71,5 +71,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
public CompiledBindingPath Path { get; set; }
public object Source { get; set; }
+
+ public Type DataType { get; set; }
}
}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
index b3f78bfbe3..c21a2d4299 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/PropertyInfoAccessorFactory.cs
@@ -72,7 +72,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
}
}
- internal class InpcPropertyAccessor : PropertyAccessorBase
+ internal class InpcPropertyAccessor : PropertyAccessorBase, IWeakEventSubscriber
{
protected readonly WeakReference