diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 34f931ff41..46e8665945 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,7 +18,7 @@
- [ ] Added unit tests (if possible)?
- [ ] Added XML documentation to any related classes?
-- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Avaloniaui.net with user documentation
+- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Documentation with user documentation
## Breaking changes
diff --git a/Documentation/build.md b/Documentation/build.md
index 5f75290424..a7d68eb599 100644
--- a/Documentation/build.md
+++ b/Documentation/build.md
@@ -9,10 +9,24 @@ git clone https://github.com/AvaloniaUI/Avalonia.git
git submodule update --init
```
+### Install the required version of the .NET Core SDK
+
+Go to https://dotnet.microsoft.com/download/visual-studio-sdks and install the latest version of the .NET Core SDK compatible with Avalonia UI. Make sure to download the SDK (not just the "runtime") package. The version compatible is indicated within the [global.json](https://github.com/AvaloniaUI/Avalonia/blob/master/global.json) file. Note that Avalonia UI does not always use the latest version and is hardcoded to use the last version known to be compatible (SDK releases may break the builds from time-to-time).
+
### Open in Visual Studio
-Open the `Avalonia.sln` solution in Visual Studio 2019 or newer. The free Visual Studio Community
-edition works fine. Run the `Samples\ControlCatalog.Desktop` project to see the sample application.
+Open the `Avalonia.sln` solution in Visual Studio 2019 or newer. The free Visual Studio Community edition works fine. Build and run the `Samples\ControlCatalog.Desktop` or `ControlCatalog.NetCore` project to see the sample application.
+
+### Troubleshooting
+
+ * **Error CS0006: Avalonia.DesktopRuntime.dll could not be found**
+
+ It is common for the first build to fail with the errors below (also discussed in [#4257](https://github.com/AvaloniaUI/Avalonia/issues/4257)).
+ ```
+ >CSC : error CS0006: Metadata file 'C:\...\Avalonia\src\Avalonia.DesktopRuntime\bin\Debug\netcoreapp2.0\Avalonia.DesktopRuntime.dll' could not be found
+ >CSC : error CS0006: Metadata file 'C:\...\Avalonia\packages\Avalonia\bin\Debug\netcoreapp2.0\Avalonia.dll' could not be found
+ ```
+ To correct this, right click on the `Avalonia.DesktopRuntime` project then press `Build` to build the project manually. Afterwards the solution should build normally and the ControlCatalog can be run.
# Linux/macOS
@@ -20,9 +34,9 @@ It's *not* possible to build the *whole* project on Linux/macOS. You can only bu
MonoDevelop, Xamarin Studio and Visual Studio for Mac aren't capable of properly opening our solution. You can use Rider (at least 2017.2 EAP) or VSCode instead. They will fail to load most of platform specific projects, but you don't need them to run on .NET Core.
-### Install the latest version of .NET Core
+### Install the latest version of the .NET Core SDK
-Go to https://www.microsoft.com/net/core and follow instructions for your OS. You need SDK (not just "runtime") package.
+Go to https://www.microsoft.com/net/core and follow the instructions for your OS. Make sure to download the SDK (not just the "runtime") package.
### Additional requirements for macOS
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index d7afbdaa3a..c0936356d2 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -50,7 +50,6 @@ public:
[Window setBackingType:NSBackingStoreBuffered];
[Window setOpaque:false];
- [Window setContentView: StandardContainer];
}
virtual HRESULT ObtainNSWindowHandle(void** ret) override
@@ -112,6 +111,9 @@ public:
{
SetPosition(lastPositionSet);
UpdateStyle();
+
+ [Window setContentView: StandardContainer];
+
if(ShouldTakeFocusOnShow() && activate)
{
[Window makeKeyAndOrderFront:Window];
@@ -124,7 +126,7 @@ public:
[Window setTitle:_lastTitle];
_shown = true;
-
+
return S_OK;
}
}
@@ -191,9 +193,11 @@ public:
{
if(ret == nullptr)
return E_POINTER;
+
auto frame = [View frame];
ret->Width = frame.size.width;
ret->Height = frame.size.height;
+
return S_OK;
}
}
@@ -254,6 +258,12 @@ public:
y = maxSize.height;
}
+ if(!_shown)
+ {
+ BaseEvents->Resized(AvnSize{x,y});
+ }
+
+ [StandardContainer setFrameSize:NSSize{x,y}];
[Window setContentSize:NSSize{x, y}];
return S_OK;
@@ -503,6 +513,7 @@ private:
bool _fullScreenActive;
SystemDecorations _decorations;
AvnWindowState _lastWindowState;
+ AvnWindowState _actualWindowState;
bool _inSetWindowState;
NSRect _preZoomSize;
bool _transitioningWindowState;
@@ -529,6 +540,7 @@ private:
_transitioningWindowState = false;
_inSetWindowState = false;
_lastWindowState = Normal;
+ _actualWindowState = Normal;
WindowEvents = events;
[Window setCanBecomeKeyAndMain];
[Window disableCursorRects];
@@ -623,7 +635,7 @@ private:
void WindowStateChanged () override
{
- if(!_inSetWindowState && !_transitioningWindowState)
+ if(_shown && !_inSetWindowState && !_transitioningWindowState)
{
AvnWindowState state;
GetWindowState(&state);
@@ -953,14 +965,14 @@ private:
{
@autoreleasepool
{
- if(_lastWindowState == state)
+ if(_actualWindowState == state)
{
return S_OK;
}
_inSetWindowState = true;
- auto currentState = _lastWindowState;
+ auto currentState = _actualWindowState;
_lastWindowState = state;
if(currentState == Normal)
@@ -1039,8 +1051,11 @@ private:
}
break;
}
+
+ _actualWindowState = _lastWindowState;
}
+
_inSetWindowState = false;
return S_OK;
@@ -1996,7 +2011,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
_lastScaling = [self backingScaleFactor];
[self setOpaque:NO];
[self setBackgroundColor: [NSColor clearColor]];
- [self invalidateShadow];
_isExtended = false;
return self;
}
@@ -2237,6 +2251,7 @@ protected:
{
if (Window != nullptr)
{
+ [StandardContainer setFrameSize:NSSize{x,y}];
[Window setContentSize:NSSize{x, y}];
[Window setFrameTopLeftPoint:ToNSPoint(ConvertPointY(lastPositionSet))];
diff --git a/readme.md b/readme.md
index 67b706f428..7959bc5540 100644
--- a/readme.md
+++ b/readme.md
@@ -14,7 +14,7 @@ To see the status of some of our features, please see our [Roadmap](https://gith
## 🚀 Getting Started
-The Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started, or you can use the .NET Core CLI. For a starter guide see our [documentation](https://avaloniaui.net/docs/quickstart/create-new-project).
+The Avalonia [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio) contains project and control templates that will help you get started, or you can use the .NET Core CLI. For a starter guide see our [documentation](https://docs.avaloniaui.net/docs/getting-started).
Avalonia is delivered via NuGet package manager. You can find the packages here: https://www.nuget.org/packages/Avalonia/
@@ -52,7 +52,7 @@ We also have a [nightly build](https://github.com/AvaloniaUI/Avalonia/wiki/Using
## Documentation
-Documentation can be found on our website at https://avaloniaui.net/docs/. We also have a [tutorial](https://avaloniaui.net/docs/tutorial/) over there for newcomers.
+Documentation can be found at https://docs.avaloniaui.net. We also have a [tutorial](https://docs.avaloniaui.net/docs/getting-started/programming-with-avalonia) over there for newcomers.
## Building and Using
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 020fb2fff3..f3ec7b48aa 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -39,6 +39,10 @@ namespace ControlCatalog
public static Styles DefaultLight = new Styles
{
+ new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml")
+ },
new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
{
Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/Base.xaml")
@@ -60,6 +64,10 @@ namespace ControlCatalog
public static Styles DefaultDark = new Styles
{
+ new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml")
+ },
new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
{
Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/Base.xaml")
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 723351ae57..2446c0e1c9 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -17,7 +17,10 @@ namespace ControlCatalog
public MainWindow()
{
this.InitializeComponent();
- this.AttachDevTools();
+ this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
+ {
+ StartupScreenIndex = 1,
+ });
//Renderer.DrawFps = true;
//Renderer.DrawDirtyRects = Renderer.DrawFps = true;
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
index e15637aa0f..f0e079ad91 100644
--- a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
@@ -84,13 +84,13 @@
-
+
-
+
-
+
diff --git a/samples/ControlCatalog/Pages/ViewboxPage.xaml b/samples/ControlCatalog/Pages/ViewboxPage.xaml
index e78cf2bc22..ef802db33e 100644
--- a/samples/ControlCatalog/Pages/ViewboxPage.xaml
+++ b/samples/ControlCatalog/Pages/ViewboxPage.xaml
@@ -1,66 +1,36 @@
-
-
- F1 M 16.6309,18.6563C 17.1309,
- 8.15625 29.8809,14.1563 29.8809,
- 14.1563C 30.8809,11.1563 34.1308,
- 11.4063 34.1308,11.4063C 33.5,12
- 34.6309,13.1563 34.6309,13.1563C
- 32.1309,13.1562 31.1309,14.9062
- 31.1309,14.9062C 41.1309,23.9062
- 32.6309,27.9063 32.6309,27.9062C
- 24.6309,24.9063 21.1309,22.1562
- 16.6309,18.6563 Z M 16.6309,19.9063C
- 21.6309,24.1563 25.1309,26.1562
- 31.6309,28.6562C 31.6309,28.6562
- 26.3809,39.1562 18.3809,36.1563C
- 18.3809,36.1563 18,38 16.3809,36.9063C
- 15,36 16.3809,34.9063 16.3809,34.9063C
- 16.3809,34.9063 10.1309,30.9062 16.6309,19.9063 Z
-
-
-
+
Viewbox
A control used to scale single child.
-
- None
- Fill
- Uniform
- UniformToFill
-
- Hello World!
-
-
- Hello World!
-
-
- Hello World!
-
-
- Hello World!
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs b/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
index 1b5f4bc7f4..94b3f3ea14 100644
--- a/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
@@ -1,5 +1,6 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
+using Avalonia.Media;
namespace ControlCatalog.Pages
{
@@ -7,7 +8,25 @@ namespace ControlCatalog.Pages
{
public ViewboxPage()
{
- this.InitializeComponent();
+ InitializeComponent();
+
+ var stretchSelector = this.FindControl("StretchSelector");
+
+ stretchSelector.Items = new[]
+ {
+ Stretch.Uniform, Stretch.UniformToFill, Stretch.Fill, Stretch.None
+ };
+
+ stretchSelector.SelectedIndex = 0;
+
+ var stretchDirectionSelector = this.FindControl("StretchDirectionSelector");
+
+ stretchDirectionSelector.Items = new[]
+ {
+ StretchDirection.Both, StretchDirection.DownOnly, StretchDirection.UpOnly
+ };
+
+ stretchDirectionSelector.SelectedIndex = 0;
}
private void InitializeComponent()
diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml
index aa165d13f7..f37df56b73 100644
--- a/samples/RenderDemo/MainWindow.xaml
+++ b/samples/RenderDemo/MainWindow.xaml
@@ -36,6 +36,9 @@
+
+
diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml
index 12fb31ea59..21c7d68b5d 100644
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml
@@ -1,7 +1,8 @@
+ x:Class="RenderDemo.Pages.AnimationsPage"
+ MaxWidth="600">
@@ -167,8 +168,8 @@
-
- Hover to activate Transform Keyframe Animations.
+
+ Hover to activate Keyframe Animations.
diff --git a/samples/RenderDemo/Pages/CustomAnimatorPage.xaml b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
new file mode 100644
index 0000000000..b386636cae
--- /dev/null
+++ b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
diff --git a/samples/RenderDemo/Pages/CustomAnimatorPage.xaml.cs b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml.cs
new file mode 100644
index 0000000000..eed8ee29ce
--- /dev/null
+++ b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml.cs
@@ -0,0 +1,27 @@
+using System.Reactive.Linq;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using RenderDemo.ViewModels;
+
+namespace RenderDemo.Pages
+{
+ public class CustomAnimatorPage : UserControl
+ {
+ public CustomAnimatorPage()
+ {
+ InitializeComponent();
+ }
+
+ private void InitializeComponent()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+ }
+}
diff --git a/samples/RenderDemo/Pages/CustomStringAnimator.cs b/samples/RenderDemo/Pages/CustomStringAnimator.cs
new file mode 100644
index 0000000000..851a2d0187
--- /dev/null
+++ b/samples/RenderDemo/Pages/CustomStringAnimator.cs
@@ -0,0 +1,16 @@
+using Avalonia.Animation.Animators;
+
+namespace RenderDemo.Pages
+{
+ public class CustomStringAnimator : Animator
+ {
+ public override string Interpolate(double progress, string oldValue, string newValue)
+ {
+ if (newValue.Length == 0) return "";
+ var step = 1.0 / newValue.Length;
+ var length = (int)(progress / step);
+ var result = newValue.Substring(0, length + 1);
+ return result;
+ }
+ }
+}
diff --git a/samples/RenderDemo/Pages/TransitionsPage.xaml b/samples/RenderDemo/Pages/TransitionsPage.xaml
index d6da293ff3..1985074b0f 100644
--- a/samples/RenderDemo/Pages/TransitionsPage.xaml
+++ b/samples/RenderDemo/Pages/TransitionsPage.xaml
@@ -1,7 +1,8 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:Class="RenderDemo.Pages.TransitionsPage"
+ MaxWidth="600">
@@ -90,6 +91,89 @@
@@ -98,8 +182,8 @@
-
- Hover to activate Transform Keyframe Animations.
+
+ Hover to activate Transitions.
@@ -109,6 +193,15 @@
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index 05142532e9..172782c5a9 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -3,10 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Linq;
+using System.Threading;
using System.Threading.Tasks;
+
using Avalonia.Animation.Animators;
using Avalonia.Animation.Easings;
-using Avalonia.Collections;
using Avalonia.Data;
using Avalonia.Metadata;
@@ -194,6 +195,33 @@ namespace Avalonia.Animation
[Content]
public KeyFrames Children { get; } = new KeyFrames();
+ // Store values for the Animator attached properties for IAnimationSetter objects.
+ private static readonly Dictionary s_animators = new Dictionary();
+
+ ///
+ /// Gets the value of the Animator attached property for a setter.
+ ///
+ /// The property animator type.
+ public static Type GetAnimator(IAnimationSetter setter)
+ {
+ if (s_animators.TryGetValue(setter, out var type))
+ {
+ return type;
+ }
+ return null;
+ }
+
+ ///
+ /// Sets the value of the Animator attached property for a setter.
+ ///
+ /// Condition, Type Animator)> Animators = new List<(Func, Type)>
{
( prop => typeof(bool).IsAssignableFrom(prop.PropertyType), typeof(BoolAnimator) ),
@@ -209,6 +237,17 @@ namespace Avalonia.Animation
( prop => typeof(decimal).IsAssignableFrom(prop.PropertyType), typeof(DecimalAnimator) ),
};
+ ///
+ /// Registers a
+ ///
+ /// The type of the animator to instantiate.
+ ///
public static void RegisterAnimator(Func condition)
where TAnimator : IAnimator
{
@@ -237,7 +276,7 @@ namespace Avalonia.Animation
{
foreach (var setter in keyframe.Setters)
{
- var handler = GetAnimatorType(setter.Property);
+ var handler = Animation.GetAnimator(setter) ?? GetAnimatorType(setter.Property);
if (handler == null)
{
@@ -281,7 +320,7 @@ namespace Avalonia.Animation
return (newAnimatorInstances, subscriptions);
}
- /// match, Action onComplete)
{
var (animators, subscriptions) = InterpretKeyframes(control);
@@ -306,25 +345,40 @@ namespace Avalonia.Animation
if (onComplete != null)
{
- Task.WhenAll(completionTasks).ContinueWith(_ => onComplete());
+ Task.WhenAll(completionTasks).ContinueWith(
+ (_, state) => ((Action)state).Invoke(),
+ onComplete);
}
}
return new CompositeDisposable(subscriptions);
}
- /// ();
if (this.IterationCount == IterationCount.Infinite)
run.SetException(new InvalidOperationException("Looping animations must not use the Run method."));
- IDisposable subscriptions = null;
+ IDisposable subscriptions = null, cancellation = null;
subscriptions = this.Apply(control, clock, Observable.Return(true), () =>
{
- run.SetResult(null);
+ run.TrySetResult(null);
+ subscriptions?.Dispose();
+ cancellation?.Dispose();
+ });
+
+ cancellation = cancellationToken.Register(() =>
+ {
+ run.TrySetResult(null);
subscriptions?.Dispose();
+ cancellation?.Dispose();
});
return run.Task;
diff --git a/src/Avalonia.Animation/AnimationInstance`1.cs b/src/Avalonia.Animation/AnimationInstance`1.cs
index 6f601a3e13..cf79640150 100644
--- a/src/Avalonia.Animation/AnimationInstance`1.cs
+++ b/src/Avalonia.Animation/AnimationInstance`1.cs
@@ -5,6 +5,7 @@ using Avalonia.Animation.Animators;
using Avalonia.Animation.Utils;
using Avalonia.Data;
using Avalonia.Reactive;
+using JetBrains.Annotations;
namespace Avalonia.Animation
{
@@ -36,6 +37,7 @@ namespace Avalonia.Animation
private IDisposable _timerSub;
private readonly IClock _baseClock;
private IClock _clock;
+ private EventHandler _propertyChangedDelegate;
public AnimationInstance(Animation animation, Animatable control, Animator animator, IClock baseClock, Action OnComplete, Func Interpolator)
{
@@ -45,8 +47,6 @@ namespace Avalonia.Animation
_onCompleteAction = OnComplete;
_interpolator = Interpolator;
_baseClock = baseClock;
- _neutralValue = (T)_targetControl.GetValue(_animator.Property);
-
FetchProperties();
}
@@ -80,6 +80,7 @@ namespace Avalonia.Animation
// Animation may have been stopped before it has finished.
ApplyFinalFill();
+ _targetControl.PropertyChanged -= _propertyChangedDelegate;
_timerSub?.Dispose();
_clock.PlayState = PlayState.Stop;
}
@@ -88,6 +89,9 @@ namespace Avalonia.Animation
{
_clock = new Clock(_baseClock);
_timerSub = _clock.Subscribe(Step);
+ _propertyChangedDelegate ??= ControlPropertyChanged;
+ _targetControl.PropertyChanged += _propertyChangedDelegate;
+ UpdateNeutralValue();
}
public void Step(TimeSpan frameTick)
@@ -216,5 +220,22 @@ namespace Avalonia.Animation
}
}
}
+
+ private void UpdateNeutralValue()
+ {
+ var property = _animator.Property;
+ var baseValue = _targetControl.GetBaseValue(property, BindingPriority.LocalValue);
+
+ _neutralValue = baseValue != AvaloniaProperty.UnsetValue ?
+ (T)baseValue : (T)_targetControl.GetValue(property);
+ }
+
+ private void ControlPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+ {
+ if (e.Property == _animator.Property && e.Priority > BindingPriority.Animation)
+ {
+ UpdateNeutralValue();
+ }
+ }
}
}
diff --git a/src/Avalonia.Animation/AnimatorDrivenTransition.cs b/src/Avalonia.Animation/AnimatorDrivenTransition.cs
new file mode 100644
index 0000000000..88c8ec5ec1
--- /dev/null
+++ b/src/Avalonia.Animation/AnimatorDrivenTransition.cs
@@ -0,0 +1,20 @@
+using System;
+using Avalonia.Animation.Animators;
+
+namespace Avalonia.Animation
+{
+ ///
+ ///
+ /// Type of the transitioned value.
+ /// Type of the animator.
+ public abstract class AnimatorDrivenTransition : Transition where TAnimator : Animator, new()
+ {
+ private static readonly TAnimator s_animator = new TAnimator();
+
+ public override IObservable DoTransition(IObservable progress, T oldValue, T newValue)
+ {
+ return new AnimatorTransitionObservable(s_animator, progress, Easing, oldValue, newValue);
+ }
+ }
+}
diff --git a/src/Avalonia.Animation/AnimatorTransitionObservable.cs b/src/Avalonia.Animation/AnimatorTransitionObservable.cs
new file mode 100644
index 0000000000..3cc185179b
--- /dev/null
+++ b/src/Avalonia.Animation/AnimatorTransitionObservable.cs
@@ -0,0 +1,32 @@
+using System;
+using Avalonia.Animation.Animators;
+using Avalonia.Animation.Easings;
+
+namespace Avalonia.Animation
+{
+ ///
+ /// Transition observable based on an
+ /// Type of the transitioned value.
+ /// Type of the animator.
+ public class AnimatorTransitionObservable : TransitionObservableBase where TAnimator : Animator
+ {
+ private readonly TAnimator _animator;
+ private readonly Easing _easing;
+ private readonly T _oldValue;
+ private readonly T _newValue;
+
+ public AnimatorTransitionObservable(TAnimator animator, IObservable progress, Easing easing, T oldValue, T newValue) : base(progress, easing)
+ {
+ _animator = animator;
+ _easing = easing;
+ _oldValue = oldValue;
+ _newValue = newValue;
+ }
+
+ protected override T ProduceValue(double progress)
+ {
+ return _animator.Interpolate(progress, _oldValue, _newValue);
+ }
+ }
+}
diff --git a/src/Avalonia.Animation/Animators/Animator`1.cs b/src/Avalonia.Animation/Animators/Animator`1.cs
index 0660440e30..d784227620 100644
--- a/src/Avalonia.Animation/Animators/Animator`1.cs
+++ b/src/Avalonia.Animation/Animators/Animator`1.cs
@@ -104,6 +104,11 @@ namespace Avalonia.Animation.Animators
throw new Exception("Index time is out of keyframe time range.");
}
+ public virtual IDisposable BindAnimation(Animatable control, IObservable instance)
+ {
+ return control.Bind((AvaloniaProperty)Property, instance, BindingPriority.Animation);
+ }
+
///
/// Runs the KeyFrames Animation.
///
@@ -116,7 +121,8 @@ namespace Avalonia.Animation.Animators
clock ?? control.Clock ?? Clock.GlobalClock,
onComplete,
InterpolationHandler);
- return control.Bind((AvaloniaProperty)Property, instance, BindingPriority.Animation);
+
+ return BindAnimation(control, instance);
}
///
diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..58cb7830e7
--- /dev/null
+++ b/src/Avalonia.Animation/ApiCompatBaseline.txt
@@ -0,0 +1,6 @@
+Compat issues with assembly Avalonia.Animation:
+MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.Animation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' is present in the contract but not in the implementation.
+MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
+Total Issues: 4
diff --git a/src/Avalonia.Animation/Clock.cs b/src/Avalonia.Animation/Clock.cs
index bea6c75982..5c2b7ce0dd 100644
--- a/src/Avalonia.Animation/Clock.cs
+++ b/src/Avalonia.Animation/Clock.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Text;
-using Avalonia.Reactive;
namespace Avalonia.Animation
{
@@ -10,10 +6,9 @@ namespace Avalonia.Animation
{
public static IClock GlobalClock => AvaloniaLocator.Current.GetService();
- private IDisposable _parentSubscription;
+ private readonly IDisposable _parentSubscription;
- public Clock()
- :this(GlobalClock)
+ public Clock() : this(GlobalClock)
{
}
diff --git a/src/Avalonia.Animation/ClockBase.cs b/src/Avalonia.Animation/ClockBase.cs
index a2b29e728e..c6e5a363be 100644
--- a/src/Avalonia.Animation/ClockBase.cs
+++ b/src/Avalonia.Animation/ClockBase.cs
@@ -1,16 +1,11 @@
using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Text;
using Avalonia.Reactive;
namespace Avalonia.Animation
{
public class ClockBase : IClock
{
- private ClockObservable _observable;
-
- private IObservable _connectedObservable;
+ private readonly ClockObservable _observable;
private TimeSpan? _previousTime;
private TimeSpan _internalTime;
@@ -18,7 +13,6 @@ namespace Avalonia.Animation
protected ClockBase()
{
_observable = new ClockObservable();
- _connectedObservable = _observable.Publish().RefCount();
}
protected bool HasSubscriptions => _observable.HasSubscriptions;
@@ -58,10 +52,10 @@ namespace Avalonia.Animation
public IDisposable Subscribe(IObserver observer)
{
- return _connectedObservable.Subscribe(observer);
+ return _observable.Subscribe(observer);
}
- private class ClockObservable : LightweightObservableBase
+ private sealed class ClockObservable : LightweightObservableBase
{
public bool HasSubscriptions { get; private set; }
public void Pulse(TimeSpan time) => PublishNext(time);
diff --git a/src/Avalonia.Animation/IAnimation.cs b/src/Avalonia.Animation/IAnimation.cs
index ff85535d8a..d037834630 100644
--- a/src/Avalonia.Animation/IAnimation.cs
+++ b/src/Avalonia.Animation/IAnimation.cs
@@ -1,4 +1,5 @@
using System;
+using System.Threading;
using System.Threading.Tasks;
namespace Avalonia.Animation
@@ -16,6 +17,6 @@ namespace Avalonia.Animation
///
/// Run the animation on the specified control.
///
- Task RunAsync(Animatable control, IClock clock);
+ Task RunAsync(Animatable control, IClock clock, CancellationToken cancellationToken = default);
}
}
diff --git a/src/Avalonia.Animation/Transition`1.cs b/src/Avalonia.Animation/Transition.cs
similarity index 96%
rename from src/Avalonia.Animation/Transition`1.cs
rename to src/Avalonia.Animation/Transition.cs
index 4542a137e5..4115c95c0f 100644
--- a/src/Avalonia.Animation/Transition`1.cs
+++ b/src/Avalonia.Animation/Transition.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Reactive.Linq;
+using System;
using Avalonia.Animation.Easings;
-using Avalonia.Animation.Utils;
namespace Avalonia.Animation
{
@@ -56,4 +54,4 @@ namespace Avalonia.Animation
return control.Bind((AvaloniaProperty)Property, transition, Data.BindingPriority.Animation);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Animation/TransitionInstance.cs b/src/Avalonia.Animation/TransitionInstance.cs
index 5184341324..b522d1961e 100644
--- a/src/Avalonia.Animation/TransitionInstance.cs
+++ b/src/Avalonia.Animation/TransitionInstance.cs
@@ -1,8 +1,5 @@
-using Avalonia.Metadata;
using System;
-using System.Reactive.Linq;
-using Avalonia.Animation.Easings;
-using Avalonia.Animation.Utils;
+using System.Runtime.ExceptionServices;
using Avalonia.Reactive;
using Avalonia.Utilities;
@@ -11,13 +8,13 @@ namespace Avalonia.Animation
///
/// Handles the timing and lifetime of a
- internal class TransitionInstance : SingleSubscriberObservableBase
+ internal class TransitionInstance : SingleSubscriberObservableBase, IObserver
{
private IDisposable _timerSubscription;
private TimeSpan _delay;
private TimeSpan _duration;
private readonly IClock _baseClock;
- private IClock _clock;
+ private TransitionClock _clock;
public TransitionInstance(IClock clock, TimeSpan delay, TimeSpan duration)
{
@@ -75,9 +72,56 @@ namespace Avalonia.Animation
protected override void Subscribed()
{
- _clock = new Clock(_baseClock);
- _timerSubscription = _clock.Subscribe(TimerTick);
+ _clock = new TransitionClock(_baseClock);
+ _timerSubscription = _clock.Subscribe(this);
PublishNext(0.0d);
}
+
+ void IObserver.OnCompleted()
+ {
+ PublishCompleted();
+ }
+
+ void IObserver.OnError(Exception error)
+ {
+ PublishError(error);
+ }
+
+ void IObserver.OnNext(TimeSpan value)
+ {
+ TimerTick(value);
+ }
+
+ ///
+ /// TODO: This clock is still fairly expensive due to
+ private sealed class TransitionClock : ClockBase, IObserver
+ {
+ private readonly IDisposable _parentSubscription;
+
+ public TransitionClock(IClock parent)
+ {
+ _parentSubscription = parent.Subscribe(this);
+ }
+
+ protected override void Stop()
+ {
+ _parentSubscription.Dispose();
+ }
+
+ void IObserver.OnNext(TimeSpan value)
+ {
+ Pulse(value);
+ }
+
+ void IObserver.OnCompleted()
+ {
+ }
+
+ void IObserver.OnError(Exception error)
+ {
+ ExceptionDispatchInfo.Capture(error).Throw();
+ }
+ }
}
}
diff --git a/src/Avalonia.Animation/TransitionObservableBase.cs b/src/Avalonia.Animation/TransitionObservableBase.cs
new file mode 100644
index 0000000000..c4ac803135
--- /dev/null
+++ b/src/Avalonia.Animation/TransitionObservableBase.cs
@@ -0,0 +1,58 @@
+using System;
+using Avalonia.Animation.Easings;
+using Avalonia.Reactive;
+
+#nullable enable
+
+namespace Avalonia.Animation
+{
+ ///
+ /// Provides base for observables implementing transitions.
+ ///
+ /// Type of the transitioned value.
+ public abstract class TransitionObservableBase : SingleSubscriberObservableBase, IObserver
+ {
+ private readonly Easing _easing;
+ private readonly IObservable _progress;
+ private IDisposable? _progressSubscription;
+
+ protected TransitionObservableBase(IObservable progress, Easing easing)
+ {
+ _progress = progress;
+ _easing = easing;
+ }
+
+ ///
+ /// Produces value at given progress time point.
+ ///
+ /// .OnCompleted()
+ {
+ PublishCompleted();
+ }
+
+ void IObserver.OnError(Exception error)
+ {
+ PublishError(error);
+ }
+
+ void IObserver.OnNext(double value)
+ {
+ double progress = _easing.Ease(value);
+
+ PublishNext(ProduceValue(progress));
+ }
+ }
+}
diff --git a/src/Avalonia.Animation/Transitions/DoubleTransition.cs b/src/Avalonia.Animation/Transitions/DoubleTransition.cs
index 8cae1e1f81..7232d87863 100644
--- a/src/Avalonia.Animation/Transitions/DoubleTransition.cs
+++ b/src/Avalonia.Animation/Transitions/DoubleTransition.cs
@@ -1,22 +1,11 @@
-using System;
-using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
namespace Avalonia.Animation
{
///
/// Transition class that handles
- public class DoubleTransition : Transition
+ public class DoubleTransition : AnimatorDrivenTransition
{
- /// DoTransition(IObservable progress, double oldValue, double newValue)
- {
- return progress
- .Select(p =>
- {
- var f = Easing.Ease(p);
- return ((newValue - oldValue) * f) + oldValue;
- });
- }
}
}
diff --git a/src/Avalonia.Animation/Transitions/FloatTransition.cs b/src/Avalonia.Animation/Transitions/FloatTransition.cs
index 427563e559..a96db8ba5b 100644
--- a/src/Avalonia.Animation/Transitions/FloatTransition.cs
+++ b/src/Avalonia.Animation/Transitions/FloatTransition.cs
@@ -1,19 +1,11 @@
-using System;
-using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
namespace Avalonia.Animation
{
///
/// Transition class that handles
- public class FloatTransition : Transition
+ public class FloatTransition : AnimatorDrivenTransition
{
- /// DoTransition(IObservable progress, float oldValue, float newValue)
- {
- var delta = newValue - oldValue;
- return progress
- .Select(p => (float)Easing.Ease(p) * delta + oldValue);
- }
}
}
diff --git a/src/Avalonia.Animation/Transitions/IntegerTransition.cs b/src/Avalonia.Animation/Transitions/IntegerTransition.cs
index 7a85bd75dc..343da7b689 100644
--- a/src/Avalonia.Animation/Transitions/IntegerTransition.cs
+++ b/src/Avalonia.Animation/Transitions/IntegerTransition.cs
@@ -1,19 +1,11 @@
-using System;
-using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
namespace Avalonia.Animation
{
///
/// Transition class that handles
- public class IntegerTransition : Transition
+ public class IntegerTransition : AnimatorDrivenTransition
{
- /// DoTransition(IObservable progress, int oldValue, int newValue)
- {
- var delta = newValue - oldValue;
- return progress
- .Select(p => (int)(Easing.Ease(p) * delta + oldValue));
- }
}
}
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index fdd688cf9d..6a9cff6b71 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -7,6 +7,8 @@ using Avalonia.Logging;
using Avalonia.PropertyStore;
using Avalonia.Threading;
+#nullable enable
+
namespace Avalonia
{
///
@@ -17,12 +19,12 @@ namespace Avalonia
///
public class AvaloniaObject : IAvaloniaObject, IAvaloniaObjectDebug, INotifyPropertyChanged, IValueSink
{
- private IAvaloniaObject _inheritanceParent;
- private List _directBindings;
- private PropertyChangedEventHandler _inpcChanged;
- private EventHandler _propertyChanged;
- private List _inheritanceChildren;
- private ValueStore _values;
+ private IAvaloniaObject? _inheritanceParent;
+ private List? _directBindings;
+ private PropertyChangedEventHandler? _inpcChanged;
+ private EventHandler? _propertyChanged;
+ private List? _inheritanceChildren;
+ private ValueStore? _values;
private bool _batchUpdate;
///
@@ -36,7 +38,7 @@ namespace Avalonia
///
/// Raised when a
- public event EventHandler PropertyChanged
+ public event EventHandler? PropertyChanged
{
add { _propertyChanged += value; }
remove { _propertyChanged -= value; }
@@ -58,7 +60,7 @@ namespace Avalonia
///
/// The inheritance parent.
///
- protected IAvaloniaObject InheritanceParent
+ protected IAvaloniaObject? InheritanceParent
{
get
{
@@ -289,7 +291,8 @@ namespace Avalonia
/// True if the property is animating, otherwise false.
public bool IsAnimating(AvaloniaProperty property)
{
- Contract.Requires(property != null);
+ property = property ?? throw new ArgumentNullException(nameof(property));
+
VerifyAccess();
return _values?.IsAnimating(property) ?? false;
@@ -306,7 +309,8 @@ namespace Avalonia
///
public bool IsSet(AvaloniaProperty property)
{
- Contract.Requires(property != null);
+ property = property ?? throw new ArgumentNullException(nameof(property));
+
VerifyAccess();
return _values?.IsSet(property) ?? false;
@@ -320,7 +324,7 @@ namespace Avalonia
///
/// An
- public IDisposable SetValue(
+ public IDisposable? SetValue(
StyledPropertyBase property,
T value,
BindingPriority priority = BindingPriority.LocalValue)
@@ -497,7 +501,7 @@ namespace Avalonia
}
///
+ /// Subscribes to a property changed notifications for changes that originate from a
+ ///
+ /// The type of the property change sender.
+ /// /// The type of the property..
+ /// A disposable that can be used to terminate the subscription.
+ public static IDisposable AddClassHandler(
+ this IObservable> observable,
+ Action> action) where TTarget : AvaloniaObject
+ {
+ return observable.Subscribe(e =>
+ {
+ if (e.Sender is TTarget target)
+ {
+ action(target, e);
+ }
+ });
+ }
+
///
/// Subscribes to a property changed notifications for changes that originate from a
/// reference)
{
- GetPlugin(reference)?.Start(reference).Subscribe(ValueChanged);
+ _subscription = GetPlugin(reference)?.Start(reference).Subscribe(ValueChanged);
}
protected override void StopListeningCore()
diff --git a/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs b/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs
index 7f09425905..4b9f12ddf8 100644
--- a/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs
+++ b/src/Avalonia.Base/Diagnostics/IAvaloniaObjectDebug.cs
@@ -1,5 +1,7 @@
using System;
+#nullable enable
+
namespace Avalonia.Diagnostics
{
///
@@ -14,6 +16,6 @@ namespace Avalonia.Diagnostics
///
/// The subscribers or null if no subscribers.
///
- Delegate[] GetPropertyChangedSubscribers();
+ Delegate[]? GetPropertyChangedSubscribers();
}
}
diff --git a/src/Avalonia.Base/IAvaloniaObject.cs b/src/Avalonia.Base/IAvaloniaObject.cs
index 0452f77d4c..2e992f8616 100644
--- a/src/Avalonia.Base/IAvaloniaObject.cs
+++ b/src/Avalonia.Base/IAvaloniaObject.cs
@@ -1,6 +1,8 @@
using System;
using Avalonia.Data;
+#nullable enable
+
namespace Avalonia
{
///
@@ -11,7 +13,7 @@ namespace Avalonia
///
/// Raised when a
- event EventHandler PropertyChanged;
+ event EventHandler? PropertyChanged;
///
/// Clears an (
+ ///
+ /// An
+ IDisposable? SetValue(
StyledPropertyBase property,
T value,
BindingPriority priority = BindingPriority.LocalValue);
diff --git a/src/Avalonia.Base/Metadata/NullableAttributes.cs b/src/Avalonia.Base/Metadata/NullableAttributes.cs
index 91f5e81863..b6f0f3a47c 100644
--- a/src/Avalonia.Base/Metadata/NullableAttributes.cs
+++ b/src/Avalonia.Base/Metadata/NullableAttributes.cs
@@ -1,6 +1,5 @@
#pragma warning disable MA0048 // File name must match type name
#define INTERNAL_NULLABLE_ATTRIBUTES
-#if NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
// https://github.com/dotnet/corefx/blob/48363ac826ccf66fbe31a5dcb1dc2aab9a7dd768/src/Common/src/CoreLib/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
@@ -10,6 +9,7 @@
namespace System.Diagnostics.CodeAnalysis
{
+#if NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
/// Specifies that null is allowed as an input even if the corresponding type disallows it.
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
#if INTERNAL_NULLABLE_ATTRIBUTES
@@ -136,5 +136,82 @@ namespace System.Diagnostics.CodeAnalysis
/// Gets the condition parameter value.
public bool ParameterValue { get; }
}
-}
+#endif // NETSTANDARD2_0 attributes
+
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_1 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
+ ///
+ /// Specifies that the method or property will ensure that the listed field and property members have
+ /// not-
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+ internal
+#else
+ public
#endif
+ sealed class MemberNotNullAttribute : Attribute
+ {
+ /// Gets field or property member names.
+ public string[] Members { get; }
+
+ /// Initializes the attribute with a field or property member.
+ /// Initializes the attribute with the list of field and property members.
+ ///
+ /// Specifies that the method or property will ensure that the listed field and property members have
+ /// non-
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+#if INTERNAL_NULLABLE_ATTRIBUTES
+ internal
+#else
+ public
+#endif
+ sealed class MemberNotNullWhenAttribute : Attribute
+ {
+ /// Gets the return value condition.
+ public bool ReturnValue { get; }
+
+ /// Gets field or property member names.
+ public string[] Members { get; }
+
+ /// Initializes the attribute with the specified return value condition and a field or property member.
+ /// Initializes the attribute with the specified return value condition and list of field and property members.
+ ///
+ /// value)
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index a070a1b9d7..83f13fe199 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -75,7 +75,6 @@ namespace Avalonia.Controls
private const double DATAGRID_defaultMinColumnWidth = 20;
private const double DATAGRID_defaultMaxColumnWidth = double.PositiveInfinity;
- private List _validationErrors;
private List _bindingValidationErrors;
private IDisposable _validationSubscription;
@@ -102,7 +101,6 @@ namespace Avalonia.Controls
private bool _areHandlersSuspended;
private bool _autoSizingColumns;
private IndexToValueTable _collapsedSlotsTable;
- private DataGridCellCoordinates _currentCellCoordinates;
private Control _clickedElement;
// used to store the current column during a Reset
@@ -141,7 +139,6 @@ namespace Avalonia.Controls
private DataGridSelectedItemsCollection _selectedItems;
private bool _temporarilyResetCurrentCell;
private object _uneditedValue; // Represents the original current cell value at the time it enters editing mode.
- private ICellEditBinding _currentCellEditBinding;
// An approximation of the sum of the heights in pixels of the scrolling rows preceding
// the first displayed scrolling row. Since the scrolled off rows are discarded, the grid
@@ -535,7 +532,8 @@ namespace Avalonia.Controls
AvaloniaProperty.RegisterDirect(
nameof(SelectedIndex),
o => o.SelectedIndex,
- (o, v) => o.SelectedIndex = v);
+ (o, v) => o.SelectedIndex = v,
+ defaultBindingMode: BindingMode.TwoWay);
///
/// Gets or sets the index of the current selection.
@@ -553,7 +551,8 @@ namespace Avalonia.Controls
AvaloniaProperty.RegisterDirect(
nameof(SelectedItem),
o => o.SelectedItem,
- (o, v) => o.SelectedItem = v);
+ (o, v) => o.SelectedItem = v,
+ defaultBindingMode: BindingMode.TwoWay);
///
/// Gets or sets the data item corresponding to the selected row.
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
index a69b8eafe1..4bfbd7d818 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -425,7 +425,7 @@ namespace Avalonia.Controls
UpdateDisplayedRows(DisplayData.FirstScrollingSlot, CellsHeight);
}
- if (DisplayData.FirstScrollingSlot < slot && DisplayData.LastScrollingSlot > slot)
+ if (DisplayData.FirstScrollingSlot < slot && (DisplayData.LastScrollingSlot > slot || DisplayData.LastScrollingSlot == -1))
{
// The row is already displayed in its entirety
return true;
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 998198cc1c..0c4f8249ce 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -163,6 +163,10 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.cs b/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.cs
new file mode 100644
index 0000000000..66fad557d5
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/FilterTextBox.cs
@@ -0,0 +1,52 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Styling;
+
+namespace Avalonia.Diagnostics.Controls
+{
+ internal class FilterTextBox : TextBox, IStyleable
+ {
+ public static readonly DirectProperty UseRegexFilterProperty =
+ AvaloniaProperty.RegisterDirect(nameof(UseRegexFilter),
+ o => o.UseRegexFilter, (o, v) => o.UseRegexFilter = v,
+ defaultBindingMode: BindingMode.TwoWay);
+
+ public static readonly DirectProperty UseCaseSensitiveFilterProperty =
+ AvaloniaProperty.RegisterDirect(nameof(UseCaseSensitiveFilter),
+ o => o.UseCaseSensitiveFilter, (o, v) => o.UseCaseSensitiveFilter = v,
+ defaultBindingMode: BindingMode.TwoWay);
+
+ public static readonly DirectProperty UseWholeWordFilterProperty =
+ AvaloniaProperty.RegisterDirect(nameof(UseWholeWordFilter),
+ o => o.UseWholeWordFilter, (o, v) => o.UseWholeWordFilter = v,
+ defaultBindingMode: BindingMode.TwoWay);
+
+ private bool _useRegexFilter, _useCaseSensitiveFilter, _useWholeWordFilter;
+
+ public FilterTextBox()
+ {
+ Classes.Add("filter-text-box");
+ }
+
+ public bool UseRegexFilter
+ {
+ get => _useRegexFilter;
+ set => SetAndRaise(UseRegexFilterProperty, ref _useRegexFilter, value);
+ }
+
+ public bool UseCaseSensitiveFilter
+ {
+ get => _useCaseSensitiveFilter;
+ set => SetAndRaise(UseCaseSensitiveFilterProperty, ref _useCaseSensitiveFilter, value);
+ }
+
+ public bool UseWholeWordFilter
+ {
+ get => _useWholeWordFilter;
+ set => SetAndRaise(UseWholeWordFilterProperty, ref _useWholeWordFilter, value);
+ }
+
+ Type IStyleable.StyleKey => typeof(TextBox);
+ }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml
new file mode 100644
index 0000000000..c202d13778
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
similarity index 87%
rename from src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs
rename to src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
index c7611c8c46..cb98fb70f3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
@@ -1,29 +1,17 @@
using Avalonia.Controls;
using Avalonia.Data;
-using Avalonia.Data.Converters;
using Avalonia.Media;
-namespace Avalonia.Diagnostics.Views
+namespace Avalonia.Diagnostics.Controls
{
- internal static class Converters
- {
- public static IValueConverter HasConstraintConverter =
- new FuncValueConverter(ConvertToDecoration);
-
- private static TextDecorationCollection ConvertToDecoration(object arg)
- {
- return arg != null ? TextDecorations.Underline : null;
- }
- }
-
internal class ThicknessEditor : ContentControl
{
public static readonly DirectProperty ThicknessProperty =
AvaloniaProperty.RegisterDirect(nameof(Thickness), o => o.Thickness,
(o, v) => o.Thickness = v, defaultBindingMode: BindingMode.TwoWay);
- public static readonly DirectProperty HeaderProperty =
- AvaloniaProperty.RegisterDirect(nameof(Header), o => o.Header,
+ public static readonly DirectProperty HeaderProperty =
+ AvaloniaProperty.RegisterDirect(nameof(Header), o => o.Header,
(o, v) => o.Header = v);
public static readonly DirectProperty IsPresentProperty =
@@ -44,15 +32,16 @@ namespace Avalonia.Diagnostics.Views
AvaloniaProperty.RegisterDirect(nameof(Bottom), o => o.Bottom,
(o, v) => o.Bottom = v);
-
+ public static readonly StyledProperty HighlightProperty =
+ AvaloniaProperty.Register(nameof(Highlight));
+
private Thickness _thickness;
- private string _header;
+ private string? _header;
private bool _isPresent = true;
private double _left;
private double _top;
private double _right;
private double _bottom;
-
private bool _isUpdatingThickness;
public Thickness Thickness
@@ -61,7 +50,7 @@ namespace Avalonia.Diagnostics.Views
set => SetAndRaise(ThicknessProperty, ref _thickness, value);
}
- public string Header
+ public string? Header
{
get => _header;
set => SetAndRaise(HeaderProperty, ref _header, value);
@@ -97,6 +86,12 @@ namespace Avalonia.Diagnostics.Views
set => SetAndRaise(BottomProperty, ref _bottom, value);
}
+ public IBrush Highlight
+ {
+ get => GetValue(HighlightProperty);
+ set => SetValue(HighlightProperty, value);
+ }
+
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToBrushConverter.cs b/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToBrushConverter.cs
deleted file mode 100644
index 37ba5155fd..0000000000
--- a/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToBrushConverter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Data.Converters;
-using Avalonia.Media;
-
-namespace Avalonia.Diagnostics.Converters
-{
- internal class BoolToBrushConverter : IValueConverter
- {
- public IBrush Brush { get; set; }
-
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return (bool)value ? Brush : Brushes.Transparent;
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToOpacityConverter.cs b/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToOpacityConverter.cs
index 63ac3ab62f..0b9044e65e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToOpacityConverter.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Converters/BoolToOpacityConverter.cs
@@ -8,12 +8,17 @@ namespace Avalonia.Diagnostics.Converters
{
public double Opacity { get; set; }
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
- return (bool)value ? 1d : Opacity;
+ if (value is bool boolean && boolean)
+ {
+ return 1d;
+ }
+
+ return Opacity;
}
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Converters/EnumToCheckedConverter.cs b/src/Avalonia.Diagnostics/Diagnostics/Converters/EnumToCheckedConverter.cs
new file mode 100644
index 0000000000..4863782f44
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Converters/EnumToCheckedConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Diagnostics.Converters
+{
+ internal class EnumToCheckedConverter : IValueConverter
+ {
+ public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ return Equals(value, parameter);
+ }
+
+ public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ if (value is bool isChecked && isChecked)
+ {
+ return parameter;
+ }
+
+ return BindingOperations.DoNothing;
+ }
+ }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
index 7942d22962..2a386f106e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevTools.cs
@@ -6,13 +6,12 @@ using Avalonia.Diagnostics.Views;
using Avalonia.Input;
using Avalonia.Interactivity;
-#nullable enable
-
namespace Avalonia.Diagnostics
{
public static class DevTools
{
- private static readonly Dictionary s_open = new Dictionary();
+ private static readonly Dictionary s_open =
+ new Dictionary();
public static IDisposable Attach(TopLevel root, KeyGesture gesture)
{
@@ -24,7 +23,7 @@ namespace Avalonia.Diagnostics
public static IDisposable Attach(TopLevel root, DevToolsOptions options)
{
- void PreviewKeyDown(object sender, KeyEventArgs e)
+ void PreviewKeyDown(object? sender, KeyEventArgs e)
{
if (options.Gesture.Matches(e))
{
@@ -54,6 +53,7 @@ namespace Avalonia.Diagnostics
Width = options.Size.Width,
Height = options.Size.Height,
};
+ window.SetOptions(options);
window.Closed += DevToolsClosed;
s_open.Add(root, window);
@@ -71,10 +71,10 @@ namespace Avalonia.Diagnostics
return Disposable.Create(() => window?.Close());
}
- private static void DevToolsClosed(object sender, EventArgs e)
+ private static void DevToolsClosed(object? sender, EventArgs e)
{
- var window = (MainWindow)sender;
- s_open.Remove(window.Root);
+ var window = (MainWindow)sender!;
+ s_open.Remove(window.Root!);
window.Closed -= DevToolsClosed;
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index ee46192207..5336dca65b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -19,8 +19,13 @@ namespace Avalonia.Diagnostics
public bool ShowAsChildWindow { get; set; } = true;
///
- /// Gets or sets the initial size of the DevTools window. The default value is 1024x512.
+ /// Gets or sets the initial size of the DevTools window. The default value is 1280x720.
///
- public Size Size { get; set; } = new Size(1024, 512);
+ public Size Size { get; set; } = new Size(1280, 720);
+
+ ///
+ /// Get or set the startup screen index where the DevTools window will be displayed.
+ ///
+ public int? StartupScreenIndex { get; set; }
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs
index 5927bd785e..4f4579c7d9 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Models/ConsoleContext.cs
@@ -22,8 +22,8 @@ The following commands are available:
clear(): Clear the output history
";
- public dynamic e { get; internal set; }
- public dynamic root { get; internal set; }
+ public dynamic? e { get; internal set; }
+ public dynamic? root { get; internal set; }
internal static object NoOutput { get; } = new object();
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs b/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs
index 65117dc3d1..4f493bdcc2 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs
@@ -7,15 +7,15 @@ namespace Avalonia.Diagnostics.Models
{
public EventChainLink(object handler, bool handled, RoutingStrategies route)
{
- Contract.Requires(handler != null);
-
- Handler = handler;
+ Handler = handler ?? throw new ArgumentNullException(nameof(handler));
Handled = handled;
Route = route;
}
public object Handler { get; }
+ public bool BeginsNewRoute { get; set; }
+
public string HandlerName
{
get
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewLocator.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewLocator.cs
index be3564e781..16852001da 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewLocator.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewLocator.cs
@@ -9,12 +9,12 @@ namespace Avalonia.Diagnostics
{
public IControl Build(object data)
{
- var name = data.GetType().FullName.Replace("ViewModel", "View");
+ var name = data.GetType().FullName!.Replace("ViewModel", "View");
var type = Type.GetType(name);
if (type != null)
{
- return (Control)Activator.CreateInstance(type);
+ return (Control)Activator.CreateInstance(type)!;
}
else
{
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
index a9353eba8b..e4c4ca6115 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
@@ -1,17 +1,17 @@
-using System.ComponentModel;
-using Avalonia.Collections;
-
namespace Avalonia.Diagnostics.ViewModels
{
internal class AvaloniaPropertyViewModel : PropertyViewModel
{
private readonly AvaloniaObject _target;
private string _type;
- private object _value;
+ private object? _value;
private string _priority;
private string _group;
+#nullable disable
+ // Remove "nullable disable" after MemberNotNull will work on our CI.
public AvaloniaPropertyViewModel(AvaloniaObject o, AvaloniaProperty property)
+#nullable restore
{
_target = o;
Property = property;
@@ -20,25 +20,17 @@ namespace Avalonia.Diagnostics.ViewModels
$"[{property.OwnerType.Name}.{property.Name}]" :
property.Name;
- if (property.IsDirect)
- {
- _group = "Properties";
- Priority = "Direct";
- }
-
Update();
}
public AvaloniaProperty Property { get; }
public override object Key => Property;
public override string Name { get; }
- public bool IsAttached => Property.IsAttached;
+ public override bool? IsAttached =>
+ Property.IsAttached;
- public string Priority
- {
- get => _priority;
- private set => RaiseAndSetIfChanged(ref _priority, value);
- }
+ public override string Priority =>
+ _priority;
public override string Type => _type;
@@ -56,40 +48,37 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- public override string Group
- {
- get => _group;
- }
+ public override string Group => _group;
+ // [MemberNotNull(nameof(_type), nameof(_group), nameof(_priority))]
public override void Update()
{
if (Property.IsDirect)
{
RaiseAndSetIfChanged(ref _value, _target.GetValue(Property), nameof(Value));
- RaiseAndSetIfChanged(ref _type, _value?.GetType().Name, nameof(Type));
+ RaiseAndSetIfChanged(ref _type, _value?.GetType().Name ?? Property.PropertyType.Name, nameof(Type));
+ RaiseAndSetIfChanged(ref _priority, "Direct", nameof(Priority));
+
+ _group = "Properties";
}
else
{
var val = _target.GetDiagnostic(Property);
RaiseAndSetIfChanged(ref _value, val?.Value, nameof(Value));
- RaiseAndSetIfChanged(ref _type, _value?.GetType().Name, nameof(Type));
+ RaiseAndSetIfChanged(ref _type, _value?.GetType().Name ?? Property.PropertyType.Name, nameof(Type));
if (val != null)
{
- SetGroup(IsAttached ? "Attached Properties" : "Properties");
- Priority = val.Priority.ToString();
+ RaiseAndSetIfChanged(ref _priority, val.Priority.ToString(), nameof(Priority));
+ RaiseAndSetIfChanged(ref _group, IsAttached == true ? "Attached Properties" : "Properties", nameof(Group));
}
else
{
- SetGroup(Priority = "Unset");
+ RaiseAndSetIfChanged(ref _priority, "Unset", nameof(Priority));
+ RaiseAndSetIfChanged(ref _group, "Unset", nameof(Group));
}
}
}
-
- private void SetGroup(string group)
- {
- RaiseAndSetIfChanged(ref _group, group, nameof(Group));
- }
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
index af5e254204..65626aeea5 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using System.Reflection;
+using System.Reflection;
namespace Avalonia.Diagnostics.ViewModels
{
@@ -7,14 +6,17 @@ namespace Avalonia.Diagnostics.ViewModels
{
private readonly object _target;
private string _type;
- private object _value;
+ private object? _value;
+#nullable disable
+ // Remove "nullable disable" after MemberNotNull will work on our CI.
public ClrPropertyViewModel(object o, PropertyInfo property)
+#nullable restore
{
_target = o;
Property = property;
- if (!property.DeclaringType.IsInterface)
+ if (property.DeclaringType == null || !property.DeclaringType.IsInterface)
{
Name = property.Name;
}
@@ -47,11 +49,18 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
+ public override string Priority =>
+ string.Empty;
+
+ public override bool? IsAttached =>
+ default;
+
+ // [MemberNotNull(nameof(_type))]
public override void Update()
{
var val = Property.GetValue(_target);
RaiseAndSetIfChanged(ref _value, val, nameof(Value));
- RaiseAndSetIfChanged(ref _type, _value?.GetType().Name, nameof(Type));
+ RaiseAndSetIfChanged(ref _type, _value?.GetType().Name ?? Property.PropertyType.Name, nameof(Type));
}
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
index 0e0c44ded8..717b49d074 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ConsoleViewModel.cs
@@ -15,11 +15,12 @@ namespace Avalonia.Diagnostics.ViewModels
private int _historyIndex = -1;
private string _input;
private bool _isVisible;
- private ScriptState _state;
+ private ScriptState? _state;
public ConsoleViewModel(Action updateContext)
{
_context = new ConsoleContext(this);
+ _input = string.Empty;
_updateContext = updateContext;
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 32592559e5..3790951b0c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -18,11 +18,10 @@ namespace Avalonia.Diagnostics.ViewModels
{
private readonly IVisual _control;
private readonly IDictionary> _propertyIndex;
- private AvaloniaPropertyViewModel _selectedProperty;
- private string _styleFilter;
+ private PropertyViewModel? _selectedProperty;
private bool _snapshotStyles;
private bool _showInactiveStyles;
- private string _styleStatus;
+ private string? _styleStatus;
public ControlDetailsViewModel(TreePageViewModel treePage, IVisual control)
{
@@ -84,7 +83,8 @@ namespace Avalonia.Diagnostics.ViewModels
{
foreach (var setter in style.Setters)
{
- if (setter is Setter regularSetter)
+ if (setter is Setter regularSetter
+ && regularSetter.Property != null)
{
var setterValue = regularSetter.Value;
@@ -116,13 +116,14 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- private (object resourceKey, bool isDynamic)? GetResourceInfo(object value)
+ private (object resourceKey, bool isDynamic)? GetResourceInfo(object? value)
{
if (value is StaticResourceExtension staticResource)
{
return (staticResource.ResourceKey, false);
}
- else if (value is DynamicResourceExtension dynamicResource)
+ else if (value is DynamicResourceExtension dynamicResource
+ && dynamicResource.ResourceKey != null)
{
return (dynamicResource.ResourceKey, true);
}
@@ -138,18 +139,12 @@ namespace Avalonia.Diagnostics.ViewModels
public ObservableCollection PseudoClasses { get; }
- public AvaloniaPropertyViewModel SelectedProperty
+ public PropertyViewModel? SelectedProperty
{
get => _selectedProperty;
set => RaiseAndSetIfChanged(ref _selectedProperty, value);
}
- public string StyleFilter
- {
- get => _styleFilter;
- set => RaiseAndSetIfChanged(ref _styleFilter, value);
- }
-
public bool SnapshotStyles
{
get => _snapshotStyles;
@@ -162,7 +157,7 @@ namespace Avalonia.Diagnostics.ViewModels
set => RaiseAndSetIfChanged(ref _showInactiveStyles, value);
}
- public string StyleStatus
+ public string? StyleStatus
{
get => _styleStatus;
set => RaiseAndSetIfChanged(ref _styleStatus, value);
@@ -174,11 +169,7 @@ namespace Avalonia.Diagnostics.ViewModels
{
base.OnPropertyChanged(e);
- if (e.PropertyName == nameof(StyleFilter))
- {
- UpdateStyleFilters();
- }
- else if (e.PropertyName == nameof(SnapshotStyles))
+ if (e.PropertyName == nameof(SnapshotStyles))
{
if (!SnapshotStyles)
{
@@ -187,19 +178,15 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- private void UpdateStyleFilters()
+ public void UpdateStyleFilters()
{
- var filter = StyleFilter;
- bool hasFilter = !string.IsNullOrEmpty(filter);
-
foreach (var style in AppliedStyles)
{
var hasVisibleSetter = false;
foreach (var setter in style.Setters)
{
- setter.IsVisible =
- !hasFilter || setter.Name.IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0;
+ setter.IsVisible = TreePage.SettersFilter.Filter(setter.Name);
hasVisibleSetter |= setter.IsVisible;
}
@@ -263,7 +250,7 @@ namespace Avalonia.Diagnostics.ViewModels
.Select(x => new ClrPropertyViewModel(o, x));
}
- private void ControlPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+ private void ControlPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
{
if (_propertyIndex.TryGetValue(e.Property, out var properties))
{
@@ -276,9 +263,10 @@ namespace Avalonia.Diagnostics.ViewModels
Layout.ControlPropertyChanged(sender, e);
}
- private void ControlPropertyChanged(object sender, PropertyChangedEventArgs e)
+ private void ControlPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
- if (_propertyIndex.TryGetValue(e.PropertyName, out var properties))
+ if (e.PropertyName != null
+ && _propertyIndex.TryGetValue(e.PropertyName, out var properties))
{
foreach (var property in properties)
{
@@ -292,7 +280,7 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- private void OnClassesChanged(object sender, NotifyCollectionChangedEventArgs e)
+ private void OnClassesChanged(object? sender, NotifyCollectionChangedEventArgs e)
{
if (!SnapshotStyles)
{
@@ -357,27 +345,17 @@ namespace Avalonia.Diagnostics.ViewModels
private bool FilterProperty(object arg)
{
- if (!string.IsNullOrWhiteSpace(TreePage.PropertyFilter) && arg is PropertyViewModel property)
- {
- if (TreePage.UseRegexFilter)
- {
- return TreePage.FilterRegex?.IsMatch(property.Name) ?? true;
- }
-
- return property.Name.IndexOf(TreePage.PropertyFilter, StringComparison.OrdinalIgnoreCase) != -1;
- }
-
- return true;
+ return !(arg is PropertyViewModel property) || TreePage.PropertiesFilter.Filter(property.Name);
}
private class PropertyComparer : IComparer
{
public static PropertyComparer Instance { get; } = new PropertyComparer();
- public int Compare(PropertyViewModel x, PropertyViewModel y)
+ public int Compare(PropertyViewModel? x, PropertyViewModel? y)
{
- var groupX = GroupIndex(x.Group);
- var groupY = GroupIndex(y.Group);
+ var groupX = GroupIndex(x?.Group);
+ var groupY = GroupIndex(y?.Group);
if (groupX != groupY)
{
@@ -385,11 +363,11 @@ namespace Avalonia.Diagnostics.ViewModels
}
else
{
- return string.CompareOrdinal(x.Name, y.Name);
+ return string.CompareOrdinal(x?.Name, y?.Name);
}
}
- private int GroupIndex(string group)
+ private int GroupIndex(string? group)
{
switch (group)
{
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
index fd2e4c3355..4dc0c34c0a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
@@ -1,4 +1,6 @@
+using System;
using System.ComponentModel;
+using System.Text;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.VisualTree;
@@ -8,27 +10,58 @@ namespace Avalonia.Diagnostics.ViewModels
internal class ControlLayoutViewModel : ViewModelBase
{
private readonly IVisual _control;
- private Thickness _marginThickness;
private Thickness _borderThickness;
- private Thickness _paddingThickness;
- private double _width;
private double _height;
- private string _widthConstraint;
- private string _heightConstraint;
+ private string? _heightConstraint;
+ private HorizontalAlignment _horizontalAlignment;
+ private Thickness _marginThickness;
+ private Thickness _paddingThickness;
private bool _updatingFromControl;
+ private VerticalAlignment _verticalAlignment;
+ private double _width;
+ private string? _widthConstraint;
+
+ public ControlLayoutViewModel(IVisual control)
+ {
+ _control = control;
+
+ HasPadding = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Decorator.PaddingProperty);
+ HasBorder = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Border.BorderThicknessProperty);
+
+ if (control is AvaloniaObject ao)
+ {
+ MarginThickness = ao.GetValue(Layoutable.MarginProperty);
+
+ if (HasPadding)
+ {
+ PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
+ }
+
+ if (HasBorder)
+ {
+ BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
+ }
+
+ HorizontalAlignment = ao.GetValue(Layoutable.HorizontalAlignmentProperty);
+ VerticalAlignment = ao.GetValue(Layoutable.VerticalAlignmentProperty);
+ }
+
+ UpdateSize();
+ UpdateSizeConstraints();
+ }
public Thickness MarginThickness
{
get => _marginThickness;
set => RaiseAndSetIfChanged(ref _marginThickness, value);
}
-
+
public Thickness BorderThickness
{
get => _borderThickness;
set => RaiseAndSetIfChanged(ref _borderThickness, value);
}
-
+
public Thickness PaddingThickness
{
get => _paddingThickness;
@@ -47,60 +80,61 @@ namespace Avalonia.Diagnostics.ViewModels
private set => RaiseAndSetIfChanged(ref _height, value);
}
- public string WidthConstraint
+ public string? WidthConstraint
{
get => _widthConstraint;
private set => RaiseAndSetIfChanged(ref _widthConstraint, value);
}
- public string HeightConstraint
+ public string? HeightConstraint
{
get => _heightConstraint;
private set => RaiseAndSetIfChanged(ref _heightConstraint, value);
}
- public bool HasPadding { get; }
-
- public bool HasBorder { get; }
-
- public ControlLayoutViewModel(IVisual control)
+ public HorizontalAlignment HorizontalAlignment
{
- _control = control;
-
- HasPadding = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Decorator.PaddingProperty);
- HasBorder = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Border.BorderThicknessProperty);
-
- if (control is AvaloniaObject ao)
- {
- MarginThickness = ao.GetValue(Layoutable.MarginProperty);
+ get => _horizontalAlignment;
+ private set => RaiseAndSetIfChanged(ref _horizontalAlignment, value);
+ }
- if (HasPadding)
- {
- PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
- }
+ public VerticalAlignment VerticalAlignment
+ {
+ get => _verticalAlignment;
+ private set => RaiseAndSetIfChanged(ref _verticalAlignment, value);
+ }
- if (HasBorder)
- {
- BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
- }
- }
+ public bool HasPadding { get; }
- UpdateSize();
- UpdateSizeConstraints();
- }
+ public bool HasBorder { get; }
private void UpdateSizeConstraints()
{
if (_control is IAvaloniaObject ao)
{
- string CreateConstraintInfo(StyledProperty minProperty, StyledProperty maxProperty)
+ string? CreateConstraintInfo(StyledProperty minProperty, StyledProperty maxProperty)
{
- if (ao.IsSet(minProperty) || ao.IsSet(maxProperty))
+ bool hasMin = ao.IsSet(minProperty);
+ bool hasMax = ao.IsSet(maxProperty);
+
+ if (hasMin || hasMax)
{
- var minValue = ao.GetValue(minProperty);
- var maxValue = ao.GetValue(maxProperty);
+ var builder = new StringBuilder();
+
+ if (hasMin)
+ {
+ var minValue = ao.GetValue(minProperty);
+ builder.AppendFormat("Min: {0}", Math.Round(minValue, 2));
+ builder.AppendLine();
+ }
- return $"{minValue} < size < {maxValue}";
+ if (hasMax)
+ {
+ var maxValue = ao.GetValue(maxProperty);
+ builder.AppendFormat("Max: {0}", Math.Round(maxValue, 2));
+ }
+
+ return builder.ToString();
}
return null;
@@ -134,10 +168,18 @@ namespace Avalonia.Diagnostics.ViewModels
{
ao.SetValue(Border.BorderThicknessProperty, BorderThickness);
}
+ else if (e.PropertyName == nameof(HorizontalAlignment))
+ {
+ ao.SetValue(Layoutable.HorizontalAlignmentProperty, HorizontalAlignment);
+ }
+ else if (e.PropertyName == nameof(VerticalAlignment))
+ {
+ ao.SetValue(Layoutable.VerticalAlignmentProperty, VerticalAlignment);
+ }
}
}
- public void ControlPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+ public void ControlPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
{
try
{
@@ -154,15 +196,15 @@ namespace Avalonia.Diagnostics.ViewModels
if (e.Property == Layoutable.MarginProperty)
{
MarginThickness = ao.GetValue(Layoutable.MarginProperty);
- }
+ }
else if (e.Property == Decorator.PaddingProperty)
{
PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
- }
+ }
else if (e.Property == Border.BorderThicknessProperty)
{
BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
- }
+ }
else if (e.Property == Layoutable.MinWidthProperty ||
e.Property == Layoutable.MaxWidthProperty ||
e.Property == Layoutable.MinHeightProperty ||
@@ -170,6 +212,14 @@ namespace Avalonia.Diagnostics.ViewModels
{
UpdateSizeConstraints();
}
+ else if (e.Property == Layoutable.HorizontalAlignmentProperty)
+ {
+ HorizontalAlignment = ao.GetValue(Layoutable.HorizontalAlignmentProperty);
+ }
+ else if (e.Property == Layoutable.VerticalAlignmentProperty)
+ {
+ VerticalAlignment = ao.GetValue(Layoutable.VerticalAlignmentProperty);
+ }
}
}
}
@@ -183,8 +233,8 @@ namespace Avalonia.Diagnostics.ViewModels
{
var size = _control.Bounds;
- Width = size.Width;
- Height = size.Height;
+ Width = Math.Round(size.Width, 2);
+ Height = Math.Round(size.Height, 2);
}
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventOwnerTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventOwnerTreeNode.cs
index 60f247ead1..5b7ddc98ee 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventOwnerTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventOwnerTreeNode.cs
@@ -2,25 +2,17 @@
using System.Collections.Generic;
using System.Linq;
using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Input;
using Avalonia.Interactivity;
namespace Avalonia.Diagnostics.ViewModels
{
internal class EventOwnerTreeNode : EventTreeNodeBase
{
- private static readonly RoutedEvent[] s_defaultEvents =
- {
- Button.ClickEvent, InputElement.KeyDownEvent, InputElement.KeyUpEvent, InputElement.TextInputEvent,
- InputElement.PointerReleasedEvent, InputElement.PointerPressedEvent
- };
-
public EventOwnerTreeNode(Type type, IEnumerable events, EventsPageViewModel vm)
: base(null, type.Name)
{
Children = new AvaloniaList(events.OrderBy(e => e.Name)
- .Select(e => new EventTreeNode(this, e, vm) { IsEnabled = s_defaultEvents.Contains(e) }));
+ .Select(e => new EventTreeNode(this, e, vm)));
IsExpanded = true;
}
@@ -35,7 +27,7 @@ namespace Avalonia.Diagnostics.ViewModels
if (_updateChildren && value != null)
{
- foreach (var child in Children)
+ foreach (var child in Children!)
{
try
{
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
index 9291b3bdf7..65fd81cc78 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
@@ -9,21 +9,19 @@ namespace Avalonia.Diagnostics.ViewModels
{
internal class EventTreeNode : EventTreeNodeBase
{
- private readonly RoutedEvent _event;
private readonly EventsPageViewModel _parentViewModel;
private bool _isRegistered;
- private FiredEvent _currentEvent;
+ private FiredEvent? _currentEvent;
public EventTreeNode(EventOwnerTreeNode parent, RoutedEvent @event, EventsPageViewModel vm)
: base(parent, @event.Name)
{
- Contract.Requires(@event != null);
- Contract.Requires(vm != null);
-
- _event = @event;
- _parentViewModel = vm;
+ Event = @event ?? throw new ArgumentNullException(nameof(@event));
+ _parentViewModel = vm ?? throw new ArgumentNullException(nameof(vm));
}
+ public RoutedEvent Event { get; }
+
public override bool? IsEnabled
{
get => base.IsEnabled;
@@ -53,24 +51,26 @@ namespace Avalonia.Diagnostics.ViewModels
{
if (IsEnabled.GetValueOrDefault() && !_isRegistered)
{
+ var allRoutes = RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble;
+
// FIXME: This leaks event handlers.
- _event.AddClassHandler(typeof(object), HandleEvent, (RoutingStrategies)7, handledEventsToo: true);
+ Event.AddClassHandler(typeof(object), HandleEvent, allRoutes, handledEventsToo: true);
_isRegistered = true;
}
}
- private void HandleEvent(object sender, RoutedEventArgs e)
+ private void HandleEvent(object? sender, RoutedEventArgs e)
{
if (!_isRegistered || IsEnabled == false)
return;
if (sender is IVisual v && BelongsToDevTool(v))
return;
- var s = sender;
+ var s = sender!;
var handled = e.Handled;
var route = e.Route;
- Action handler = delegate
+ void handler()
{
if (_currentEvent == null || !_currentEvent.IsPartOfSameEventChain(e))
{
@@ -95,14 +95,16 @@ namespace Avalonia.Diagnostics.ViewModels
private static bool BelongsToDevTool(IVisual v)
{
- while (v != null)
+ var current = v;
+
+ while (current != null)
{
- if (v is MainView || v is MainWindow)
+ if (current is MainView || current is MainWindow)
{
return true;
}
- v = v.VisualParent;
+ current = current.VisualParent;
}
return false;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNodeBase.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNodeBase.cs
index 1bd4117f23..e6d7335297 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNodeBase.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNodeBase.cs
@@ -8,14 +8,16 @@ namespace Avalonia.Diagnostics.ViewModels
internal bool _updateParent = true;
private bool _isExpanded;
private bool? _isEnabled = false;
+ private bool _isVisible;
- protected EventTreeNodeBase(EventTreeNodeBase parent, string text)
+ protected EventTreeNodeBase(EventTreeNodeBase? parent, string text)
{
Parent = parent;
Text = text;
+ IsVisible = true;
}
- public IAvaloniaReadOnlyList Children
+ public IAvaloniaReadOnlyList? Children
{
get;
protected set;
@@ -33,7 +35,13 @@ namespace Avalonia.Diagnostics.ViewModels
set => RaiseAndSetIfChanged(ref _isEnabled, value);
}
- public EventTreeNodeBase Parent
+ public bool IsVisible
+ {
+ get => _isVisible;
+ set => RaiseAndSetIfChanged(ref _isVisible, value);
+ }
+
+ public EventTreeNodeBase? Parent
{
get;
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventsPageViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventsPageViewModel.cs
index 361e82bc73..fbcedb2e74 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventsPageViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventsPageViewModel.cs
@@ -1,28 +1,44 @@
using System;
+using System.Collections.Generic;
using System.Collections.ObjectModel;
-using System.Globalization;
using System.Linq;
using Avalonia.Controls;
-using Avalonia.Data.Converters;
+using Avalonia.Diagnostics.Models;
+using Avalonia.Input;
using Avalonia.Interactivity;
-using Avalonia.Media;
namespace Avalonia.Diagnostics.ViewModels
{
internal class EventsPageViewModel : ViewModelBase
{
- private readonly IControl _root;
- private FiredEvent _selectedEvent;
+ private static readonly HashSet s_defaultEvents = new HashSet()
+ {
+ Button.ClickEvent,
+ InputElement.KeyDownEvent,
+ InputElement.KeyUpEvent,
+ InputElement.TextInputEvent,
+ InputElement.PointerReleasedEvent,
+ InputElement.PointerPressedEvent
+ };
+
+ private readonly MainViewModel _mainViewModel;
+ private FiredEvent? _selectedEvent;
+ private EventTreeNodeBase? _selectedNode;
- public EventsPageViewModel(IControl root)
+ public EventsPageViewModel(MainViewModel mainViewModel)
{
- _root = root;
+ _mainViewModel = mainViewModel;
Nodes = RoutedEventRegistry.Instance.GetAllRegistered()
.GroupBy(e => e.OwnerType)
.OrderBy(e => e.Key.Name)
.Select(g => new EventOwnerTreeNode(g.Key, g, this))
.ToArray();
+
+ EventsFilter = new FilterViewModel();
+ EventsFilter.RefreshFilter += (s, e) => UpdateEventFilters();
+
+ EnableDefault();
}
public string Name => "Events";
@@ -31,15 +47,129 @@ namespace Avalonia.Diagnostics.ViewModels
public ObservableCollection RecordedEvents { get; } = new ObservableCollection();
- public FiredEvent SelectedEvent
+ public FiredEvent? SelectedEvent
{
get => _selectedEvent;
set => RaiseAndSetIfChanged(ref _selectedEvent, value);
}
- private void Clear()
+ public EventTreeNodeBase? SelectedNode
+ {
+ get => _selectedNode;
+ set => RaiseAndSetIfChanged(ref _selectedNode, value);
+ }
+
+ public FilterViewModel EventsFilter { get; }
+
+ public void Clear()
{
RecordedEvents.Clear();
}
+
+ public void DisableAll()
+ {
+ EvaluateNodeEnabled(_ => false);
+ }
+
+ public void EnableDefault()
+ {
+ EvaluateNodeEnabled(node => s_defaultEvents.Contains(node.Event));
+ }
+
+ public void RequestTreeNavigateTo(EventChainLink navTarget)
+ {
+ if (navTarget.Handler is IControl control)
+ {
+ _mainViewModel.RequestTreeNavigateTo(control, true);
+ }
+ }
+
+ public void SelectEventByType(RoutedEvent evt)
+ {
+ foreach (var node in Nodes)
+ {
+ var result = FindNode(node, evt);
+
+ if (result != null && result.IsVisible)
+ {
+ SelectedNode = result;
+
+ break;
+ }
+ }
+
+ static EventTreeNodeBase? FindNode(EventTreeNodeBase node, RoutedEvent eventType)
+ {
+ if (node is EventTreeNode eventNode && eventNode.Event == eventType)
+ {
+ return node;
+ }
+
+ if (node.Children != null)
+ {
+ foreach (var child in node.Children)
+ {
+ var result = FindNode(child, eventType);
+
+ if (result != null)
+ {
+ return result;
+ }
+ }
+ }
+
+ return null;
+ }
+ }
+
+ private void EvaluateNodeEnabled(Func eval)
+ {
+ void ProcessNode(EventTreeNodeBase node)
+ {
+ if (node is EventTreeNode eventNode)
+ {
+ node.IsEnabled = eval(eventNode);
+ }
+
+ if (node.Children != null)
+ {
+ foreach (var childNode in node.Children)
+ {
+ ProcessNode(childNode);
+ }
+ }
+ }
+
+ foreach (var node in Nodes)
+ {
+ ProcessNode(node);
+ }
+ }
+
+ private void UpdateEventFilters()
+ {
+ foreach (var node in Nodes)
+ {
+ FilterNode(node, false);
+ }
+
+ bool FilterNode(EventTreeNodeBase node, bool isParentVisible)
+ {
+ bool matchesFilter = EventsFilter.Filter(node.Text);
+ bool hasVisibleChild = false;
+
+ if (node.Children != null)
+ {
+ foreach (var childNode in node.Children)
+ {
+ hasVisibleChild |= FilterNode(childNode, matchesFilter);
+ }
+ }
+
+ node.IsVisible = hasVisibleChild || matchesFilter || isParentVisible;
+
+ return node.IsVisible;
+ }
+ }
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FilterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FilterViewModel.cs
new file mode 100644
index 0000000000..5b27236f2e
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FilterViewModel.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.RegularExpressions;
+
+namespace Avalonia.Diagnostics.ViewModels
+{
+ internal class FilterViewModel : ViewModelBase, INotifyDataErrorInfo
+ {
+ private readonly Dictionary _errors = new Dictionary();
+ private string _filterString = string.Empty;
+ private bool _useRegexFilter, _useCaseSensitiveFilter, _useWholeWordFilter;
+ private Regex? _filterRegex;
+
+ public event EventHandler? RefreshFilter;
+
+ public bool HasErrors => _errors.Count > 0;
+
+ public event EventHandler? ErrorsChanged;
+
+ public bool Filter(string input)
+ {
+ return _filterRegex?.IsMatch(input) ?? true;
+ }
+
+ private void UpdateFilterRegex()
+ {
+ void ClearError()
+ {
+ if (_errors.Remove(nameof(FilterString)))
+ {
+ ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(FilterString)));
+ }
+ }
+
+ try
+ {
+ var options = RegexOptions.Compiled;
+ var pattern = UseRegexFilter
+ ? FilterString.Trim() : Regex.Escape(FilterString.Trim());
+ if (!UseCaseSensitiveFilter)
+ {
+ options |= RegexOptions.IgnoreCase;
+ }
+ if (UseWholeWordFilter)
+ {
+ pattern = $"\\b(?:{pattern})\\b";
+ }
+
+ _filterRegex = new Regex(pattern, options);
+ ClearError();
+ }
+ catch (Exception exception)
+ {
+ _errors[nameof(FilterString)] = exception.Message;
+ ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(FilterString)));
+ }
+ }
+
+ public string FilterString
+ {
+ get => _filterString;
+ set
+ {
+ if (RaiseAndSetIfChanged(ref _filterString, value))
+ {
+ UpdateFilterRegex();
+ RefreshFilter?.Invoke(this, EventArgs.Empty);
+ }
+ }
+ }
+
+ public bool UseRegexFilter
+ {
+ get => _useRegexFilter;
+ set
+ {
+ if (RaiseAndSetIfChanged(ref _useRegexFilter, value))
+ {
+ UpdateFilterRegex();
+ RefreshFilter?.Invoke(this, EventArgs.Empty);
+ }
+ }
+ }
+
+ public bool UseCaseSensitiveFilter
+ {
+ get => _useCaseSensitiveFilter;
+ set
+ {
+ if (RaiseAndSetIfChanged(ref _useCaseSensitiveFilter, value))
+ {
+ UpdateFilterRegex();
+ RefreshFilter?.Invoke(this, EventArgs.Empty);
+ }
+ }
+ }
+
+ public bool UseWholeWordFilter
+ {
+ get => _useWholeWordFilter;
+ set
+ {
+ if (RaiseAndSetIfChanged(ref _useWholeWordFilter, value))
+ {
+ UpdateFilterRegex();
+ RefreshFilter?.Invoke(this, EventArgs.Empty);
+ }
+ }
+ }
+
+ public IEnumerable GetErrors(string? propertyName)
+ {
+ if (propertyName != null
+ && _errors.TryGetValue(propertyName, out var error))
+ {
+ yield return error;
+ }
+ }
+ }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs
index ae53cf6154..32df2f8745 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs
@@ -8,15 +8,12 @@ namespace Avalonia.Diagnostics.ViewModels
internal class FiredEvent : ViewModelBase
{
private readonly RoutedEventArgs _eventArgs;
- private EventChainLink _handledBy;
+ private EventChainLink? _handledBy;
public FiredEvent(RoutedEventArgs eventArgs, EventChainLink originator)
{
- Contract.Requires(eventArgs != null);
- Contract.Requires(originator != null);
-
- _eventArgs = eventArgs;
- Originator = originator;
+ _eventArgs = eventArgs ?? throw new ArgumentNullException(nameof(eventArgs));
+ Originator = originator ?? throw new ArgumentNullException(nameof(originator));
AddToChain(originator);
}
@@ -25,7 +22,7 @@ namespace Avalonia.Diagnostics.ViewModels
return e == _eventArgs;
}
- public RoutedEvent Event => _eventArgs.RoutedEvent;
+ public RoutedEvent Event => _eventArgs.RoutedEvent!;
public bool IsHandled => HandledBy?.Handled == true;
@@ -38,7 +35,7 @@ namespace Avalonia.Diagnostics.ViewModels
if (IsHandled)
{
return $"{Event.Name} on {Originator.HandlerName};" + Environment.NewLine +
- $"strategies: {Event.RoutingStrategies}; handled by: {HandledBy.HandlerName}";
+ $"strategies: {Event.RoutingStrategies}; handled by: {HandledBy!.HandlerName}";
}
return $"{Event.Name} on {Originator.HandlerName}; strategies: {Event.RoutingStrategies}";
@@ -47,7 +44,7 @@ namespace Avalonia.Diagnostics.ViewModels
public EventChainLink Originator { get; }
- public EventChainLink HandledBy
+ public EventChainLink? HandledBy
{
get => _handledBy;
set
@@ -62,13 +59,18 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- public void AddToChain(object handler, bool handled, RoutingStrategies route)
- {
- AddToChain(new EventChainLink(handler, handled, route));
- }
-
public void AddToChain(EventChainLink link)
{
+ if (EventChain.Count > 0)
+ {
+ var prevLink = EventChain[EventChain.Count-1];
+
+ if (prevLink.Route != link.Route)
+ {
+ link.BeginsNewRoute = true;
+ }
+ }
+
EventChain.Add(link);
if (HandledBy == null && link.Handled)
HandledBy = link;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs
index 38788ef8ee..04215fa8ae 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/LogicalTreeNode.cs
@@ -7,22 +7,24 @@ namespace Avalonia.Diagnostics.ViewModels
{
internal class LogicalTreeNode : TreeNode
{
- public LogicalTreeNode(ILogical logical, TreeNode parent)
+ public LogicalTreeNode(ILogical logical, TreeNode? parent)
: base((Control)logical, parent)
{
Children = new LogicalTreeNodeCollection(this, logical);
}
+ public override TreeNodeCollection Children { get; }
+
public static LogicalTreeNode[] Create(object control)
{
var logical = control as ILogical;
- return logical != null ? new[] { new LogicalTreeNode(logical, null) } : null;
+ return logical != null ? new[] { new LogicalTreeNode(logical, null) } : Array.Empty();
}
internal class LogicalTreeNodeCollection : TreeNodeCollection
{
private readonly ILogical _control;
- private IDisposable _subscription;
+ private IDisposable? _subscription;
public LogicalTreeNodeCollection(TreeNode owner, ILogical control)
: base(owner)
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index 3049431361..3f367165ac 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
+
using Avalonia.Controls;
using Avalonia.Diagnostics.Models;
using Avalonia.Input;
@@ -16,18 +17,21 @@ namespace Avalonia.Diagnostics.ViewModels
private readonly IDisposable _pointerOverSubscription;
private ViewModelBase _content;
private int _selectedTab;
- private string _focusedControl;
- private string _pointerOverElement;
+ private string? _focusedControl;
+ private string? _pointerOverElement;
private bool _shouldVisualizeMarginPadding = true;
private bool _shouldVisualizeDirtyRects;
private bool _showFpsOverlay;
+#nullable disable
+ // Remove "nullable disable" after MemberNotNull will work on our CI.
public MainViewModel(TopLevel root)
+#nullable restore
{
_root = root;
_logicalTree = new TreePageViewModel(this, LogicalTreeNode.Create(root));
_visualTree = new TreePageViewModel(this, VisualTreeNode.Create(root));
- _events = new EventsPageViewModel(root);
+ _events = new EventsPageViewModel(this);
UpdateFocusedControl();
KeyboardDevice.Instance.PropertyChanged += KeyboardPropertyChanged;
@@ -83,6 +87,7 @@ namespace Avalonia.Diagnostics.ViewModels
public ViewModelBase Content
{
get { return _content; }
+ // [MemberNotNull(nameof(_content))]
private set
{
if (_content is TreePageViewModel oldTree &&
@@ -113,39 +118,40 @@ namespace Avalonia.Diagnostics.ViewModels
public int SelectedTab
{
get { return _selectedTab; }
+ // [MemberNotNull(nameof(_content))]
set
{
_selectedTab = value;
switch (value)
{
- case 0:
- Content = _logicalTree;
- break;
case 1:
Content = _visualTree;
break;
case 2:
Content = _events;
break;
+ default:
+ Content = _logicalTree;
+ break;
}
RaisePropertyChanged();
}
}
- public string FocusedControl
+ public string? FocusedControl
{
get { return _focusedControl; }
private set { RaiseAndSetIfChanged(ref _focusedControl, value); }
}
- public string PointerOverElement
+ public string? PointerOverElement
{
get { return _pointerOverElement; }
private set { RaiseAndSetIfChanged(ref _pointerOverElement, value); }
}
-
+
private void UpdateConsoleContext(ConsoleContext context)
{
context.root = _root;
@@ -186,12 +192,33 @@ namespace Avalonia.Diagnostics.ViewModels
FocusedControl = KeyboardDevice.Instance.FocusedElement?.GetType().Name;
}
- private void KeyboardPropertyChanged(object sender, PropertyChangedEventArgs e)
+ private void KeyboardPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(KeyboardDevice.Instance.FocusedElement))
{
UpdateFocusedControl();
}
}
+
+ public void RequestTreeNavigateTo(IControl control, bool isVisualTree)
+ {
+ var tree = isVisualTree ? _visualTree : _logicalTree;
+
+ var node = tree.FindNode(control);
+
+ if (node != null)
+ {
+ SelectedTab = isVisualTree ? 1 : 0;
+
+ tree.SelectControl(control);
+ }
+ }
+
+ public int? StartupScreenIndex { get; private set; } = default;
+
+ public void SetOptions(DevToolsOptions options)
+ {
+ StartupScreenIndex = options.StartupScreenIndex;
+ }
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
index e23d6f1471..fdbd8c1aa3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
@@ -16,9 +16,11 @@ namespace Avalonia.Diagnostics.ViewModels
public abstract string Group { get; }
public abstract string Type { get; }
public abstract string Value { get; set; }
- public abstract void Update();
+ public abstract string Priority { get; }
+ public abstract bool? IsAttached { get; }
+ public abstract void Update();
- protected static string ConvertToString(object value)
+ protected static string ConvertToString(object? value)
{
if (value is null)
{
@@ -31,13 +33,13 @@ namespace Avalonia.Diagnostics.ViewModels
if (!converter.CanConvertTo(typeof(string)) ||
converter.GetType() == typeof(CollectionConverter))
{
- return value.ToString();
+ return value.ToString() ?? "(null)";
}
return converter.ConvertToString(value);
}
- private static object InvokeParse(string s, Type targetType)
+ private static object? InvokeParse(string s, Type targetType)
{
var method = targetType.GetMethod("Parse", PublicStatic, null, StringIFormatProviderParameters, null);
@@ -56,7 +58,7 @@ namespace Avalonia.Diagnostics.ViewModels
throw new InvalidCastException("Unable to convert value.");
}
- protected static object ConvertFromString(string s, Type targetType)
+ protected static object? ConvertFromString(string s, Type targetType)
{
var converter = TypeDescriptor.GetConverter(targetType);
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
index a82e13fcfa..e93dc7361b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Diagnostics.ViewModels
public IBrush Tint { get; }
- public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object resourceValue, bool isDynamic) : base(property, resourceValue)
+ public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object? resourceValue, bool isDynamic) : base(property, resourceValue)
{
Key = resourceKey;
Tint = isDynamic ? Brushes.Orange : Brushes.Brown;
@@ -16,12 +16,14 @@ namespace Avalonia.Diagnostics.ViewModels
public void CopyResourceKey()
{
- if (Key is null)
+ var textToCopy = Key?.ToString();
+
+ if (textToCopy is null)
{
return;
}
- CopyToClipboard(Key.ToString());
+ CopyToClipboard(textToCopy);
}
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
index e835f5a878..38cbefcb93 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Diagnostics.ViewModels
public string Name { get; }
- public object Value { get; }
+ public object? Value { get; }
public bool IsActive
{
@@ -25,7 +25,7 @@ namespace Avalonia.Diagnostics.ViewModels
set => RaiseAndSetIfChanged(ref _isVisible, value);
}
- public SetterViewModel(AvaloniaProperty property, object value)
+ public SetterViewModel(AvaloniaProperty property, object? value)
{
Property = property;
Name = property.Name;
@@ -36,12 +36,14 @@ namespace Avalonia.Diagnostics.ViewModels
public void CopyValue()
{
- if (Value is null)
+ var textToCopy = Value?.ToString();
+
+ if (textToCopy is null)
{
return;
}
- CopyToClipboard(Value.ToString());
+ CopyToClipboard(textToCopy);
}
public void CopyPropertyName()
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
index 9363c28705..4cb470eeac 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
@@ -9,17 +9,18 @@ using Avalonia.VisualTree;
namespace Avalonia.Diagnostics.ViewModels
{
- internal class TreeNode : ViewModelBase, IDisposable
+ internal abstract class TreeNode : ViewModelBase, IDisposable
{
- private IDisposable _classesSubscription;
+ private IDisposable? _classesSubscription;
private string _classes;
private bool _isExpanded;
- public TreeNode(IVisual visual, TreeNode parent)
+ public TreeNode(IVisual visual, TreeNode? parent)
{
Parent = parent;
Type = visual.GetType().Name;
Visual = visual;
+ _classes = string.Empty;
if (visual is IControl control)
{
@@ -51,10 +52,9 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- public TreeNodeCollection Children
+ public abstract TreeNodeCollection Children
{
get;
- protected set;
}
public string Classes
@@ -63,7 +63,7 @@ namespace Avalonia.Diagnostics.ViewModels
private set { RaiseAndSetIfChanged(ref _classes, value); }
}
- public string ElementName
+ public string? ElementName
{
get;
}
@@ -79,7 +79,7 @@ namespace Avalonia.Diagnostics.ViewModels
set { RaiseAndSetIfChanged(ref _isExpanded, value); }
}
- public TreeNode Parent
+ public TreeNode? Parent
{
get;
}
@@ -92,7 +92,7 @@ namespace Avalonia.Diagnostics.ViewModels
public void Dispose()
{
- _classesSubscription.Dispose();
+ _classesSubscription?.Dispose();
Children.Dispose();
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNodeCollection.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNodeCollection.cs
index 8b4f03bd23..c007411f49 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNodeCollection.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNodeCollection.cs
@@ -3,46 +3,33 @@ using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
+
using Avalonia.Collections;
namespace Avalonia.Diagnostics.ViewModels
{
internal abstract class TreeNodeCollection : IAvaloniaReadOnlyList, IDisposable
{
- private AvaloniaList _inner;
+ private AvaloniaList? _inner;
public TreeNodeCollection(TreeNode owner) => Owner = owner;
- public TreeNode this[int index]
- {
- get
- {
- EnsureInitialized();
- return _inner[index];
- }
- }
+ public TreeNode this[int index] => EnsureInitialized()[index];
- public int Count
- {
- get
- {
- EnsureInitialized();
- return _inner.Count;
- }
- }
+ public int Count => EnsureInitialized().Count;
protected TreeNode Owner { get; }
- public event NotifyCollectionChangedEventHandler CollectionChanged
+ public event NotifyCollectionChangedEventHandler? CollectionChanged
{
- add => _inner.CollectionChanged += value;
- remove => _inner.CollectionChanged -= value;
+ add => EnsureInitialized().CollectionChanged += value;
+ remove => EnsureInitialized().CollectionChanged -= value;
}
- public event PropertyChangedEventHandler PropertyChanged
+ public event PropertyChangedEventHandler? PropertyChanged
{
- add => _inner.PropertyChanged += value;
- remove => _inner.PropertyChanged -= value;
+ add => EnsureInitialized().PropertyChanged += value;
+ remove => EnsureInitialized().PropertyChanged -= value;
}
public virtual void Dispose()
@@ -58,21 +45,21 @@ namespace Avalonia.Diagnostics.ViewModels
public IEnumerator GetEnumerator()
{
- EnsureInitialized();
- return _inner.GetEnumerator();
+ return EnsureInitialized().GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
protected abstract void Initialize(AvaloniaList nodes);
- private void EnsureInitialized()
+ private AvaloniaList EnsureInitialized()
{
if (_inner is null)
{
_inner = new AvaloniaList();
Initialize(_inner);
}
+ return _inner;
}
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
index 6b779cd6ac..4b18cf414a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
@@ -1,53 +1,50 @@
using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text.RegularExpressions;
using Avalonia.Controls;
using Avalonia.VisualTree;
namespace Avalonia.Diagnostics.ViewModels
{
- internal class TreePageViewModel : ViewModelBase, IDisposable, INotifyDataErrorInfo
+ internal class TreePageViewModel : ViewModelBase, IDisposable
{
- private readonly Dictionary _errors = new Dictionary();
- private TreeNode _selectedNode;
- private ControlDetailsViewModel _details;
- private string _propertyFilter = string.Empty;
- private bool _useRegexFilter;
+ private TreeNode? _selectedNode;
+ private ControlDetailsViewModel? _details;
public TreePageViewModel(MainViewModel mainView, TreeNode[] nodes)
{
MainView = mainView;
Nodes = nodes;
+
+ PropertiesFilter = new FilterViewModel();
+ PropertiesFilter.RefreshFilter += (s, e) => Details?.PropertiesView.Refresh();
+
+ SettersFilter = new FilterViewModel();
+ SettersFilter.RefreshFilter += (s, e) => Details?.UpdateStyleFilters();
}
public MainViewModel MainView { get; }
+ public FilterViewModel PropertiesFilter { get; }
+
+ public FilterViewModel SettersFilter { get; }
+
public TreeNode[] Nodes { get; protected set; }
- public TreeNode SelectedNode
+ public TreeNode? SelectedNode
{
get => _selectedNode;
private set
{
- var oldDetails = Details;
-
if (RaiseAndSetIfChanged(ref _selectedNode, value))
{
Details = value != null ?
new ControlDetailsViewModel(this, value.Visual) :
null;
-
- if (Details != null && oldDetails != null)
- {
- Details.StyleFilter = oldDetails.StyleFilter;
- }
+ Details?.UpdateStyleFilters();
}
}
}
- public ControlDetailsViewModel Details
+ public ControlDetailsViewModel? Details
{
get => _details;
private set
@@ -61,63 +58,6 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- public Regex FilterRegex { get; set; }
-
- private void UpdateFilterRegex()
- {
- void ClearError()
- {
- if (_errors.Remove(nameof(PropertyFilter)))
- {
- ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(PropertyFilter)));
- }
- }
-
- if (UseRegexFilter)
- {
- try
- {
- FilterRegex = new Regex(PropertyFilter, RegexOptions.Compiled);
- ClearError();
- }
- catch (Exception exception)
- {
- _errors[nameof(PropertyFilter)] = exception.Message;
- ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(PropertyFilter)));
- }
- }
- else
- {
- ClearError();
- }
- }
-
- public string PropertyFilter
- {
- get => _propertyFilter;
- set
- {
- if (RaiseAndSetIfChanged(ref _propertyFilter, value))
- {
- UpdateFilterRegex();
- Details.PropertiesView.Refresh();
- }
- }
- }
-
- public bool UseRegexFilter
- {
- get => _useRegexFilter;
- set
- {
- if (RaiseAndSetIfChanged(ref _useRegexFilter, value))
- {
- UpdateFilterRegex();
- Details.PropertiesView.Refresh();
- }
- }
- }
-
public void Dispose()
{
foreach (var node in Nodes)
@@ -128,7 +68,7 @@ namespace Avalonia.Diagnostics.ViewModels
_details?.Dispose();
}
- public TreeNode FindNode(IControl control)
+ public TreeNode? FindNode(IControl control)
{
foreach (var node in Nodes)
{
@@ -164,7 +104,7 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- private void ExpandNode(TreeNode node)
+ private void ExpandNode(TreeNode? node)
{
if (node != null)
{
@@ -173,7 +113,7 @@ namespace Avalonia.Diagnostics.ViewModels
}
}
- private TreeNode FindNode(TreeNode node, IControl control)
+ private TreeNode? FindNode(TreeNode node, IControl control)
{
if (node.Visual == control)
{
@@ -194,17 +134,5 @@ namespace Avalonia.Diagnostics.ViewModels
return null;
}
-
- public IEnumerable GetErrors(string propertyName)
- {
- if (_errors.TryGetValue(propertyName, out var error))
- {
- yield return error;
- }
- }
-
- public bool HasErrors => _errors.Count > 0;
-
- public event EventHandler ErrorsChanged;
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
index 66e9c34657..a2ee37c625 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ViewModelBase.cs
@@ -1,16 +1,16 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
namespace Avalonia.Diagnostics.ViewModels
{
internal class ViewModelBase : INotifyPropertyChanged
{
- private PropertyChangedEventHandler _propertyChanged;
+ private PropertyChangedEventHandler? _propertyChanged;
private List events = new List();
- public event PropertyChangedEventHandler PropertyChanged
+ public event PropertyChangedEventHandler? PropertyChanged
{
add { _propertyChanged += value; events.Add("added"); }
remove { _propertyChanged -= value; events.Add("removed"); }
@@ -20,7 +20,7 @@ namespace Avalonia.Diagnostics.ViewModels
{
}
- protected bool RaiseAndSetIfChanged(ref T field, T value, [CallerMemberName] string propertyName = null)
+ protected bool RaiseAndSetIfChanged([NotNullIfNotNull("value")] ref T field, T value, [CallerMemberName] string propertyName = null!)
{
if (!EqualityComparer.Default.Equals(field, value))
{
@@ -32,7 +32,7 @@ namespace Avalonia.Diagnostics.ViewModels
return false;
}
- protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+ protected void RaisePropertyChanged([CallerMemberName] string propertyName = null!)
{
var e = new PropertyChangedEventArgs(propertyName);
OnPropertyChanged(e);
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
index bc40edf477..48fa636664 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Diagnostics.ViewModels
{
internal class VisualTreeNode : TreeNode
{
- public VisualTreeNode(IVisual visual, TreeNode parent)
+ public VisualTreeNode(IVisual visual, TreeNode? parent)
: base(visual, parent)
{
Children = new VisualTreeNodeCollection(this, visual);
@@ -20,16 +20,18 @@ namespace Avalonia.Diagnostics.ViewModels
public bool IsInTemplate { get; private set; }
+ public override TreeNodeCollection Children { get; }
+
public static VisualTreeNode[] Create(object control)
{
var visual = control as IVisual;
- return visual != null ? new[] { new VisualTreeNode(visual, null) } : null;
+ return visual != null ? new[] { new VisualTreeNode(visual, null) } : Array.Empty();
}
internal class VisualTreeNodeCollection : TreeNodeCollection
{
private readonly IVisual _control;
- private IDisposable _subscription;
+ private IDisposable? _subscription;
public VisualTreeNodeCollection(TreeNode owner, IVisual control)
: base(owner)
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs
index ae70b59fde..ab523fb75a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ConsoleView.xaml.cs
@@ -30,22 +30,26 @@ namespace Avalonia.Diagnostics.Views
AvaloniaXamlLoader.Load(this);
}
- private void HistoryChanged(object sender, NotifyCollectionChangedEventArgs e)
+ private void HistoryChanged(object? sender, NotifyCollectionChangedEventArgs e)
{
- if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems[0] is IControl control)
+ if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems?[0] is IControl control)
{
DispatcherTimer.RunOnce(control.BringIntoView, TimeSpan.Zero);
}
}
- private void InputKeyDown(object sender, KeyEventArgs e)
+ private void InputKeyDown(object? sender, KeyEventArgs e)
{
- var vm = (ConsoleViewModel)DataContext;
+ var vm = (ConsoleViewModel?)DataContext;
+ if (vm is null)
+ {
+ return;
+ }
switch (e.Key)
{
case Key.Enter:
- vm.Execute();
+ _ = vm.Execute();
e.Handled = true;
break;
case Key.Up:
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index 9ba576c826..4b37438993 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -2,90 +2,30 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:conv="clr-namespace:Avalonia.Diagnostics.Converters"
xmlns:local="clr-namespace:Avalonia.Diagnostics.Views"
+ xmlns:controls="clr-namespace:Avalonia.Diagnostics.Controls"
xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
x:Class="Avalonia.Diagnostics.Views.ControlDetailsView"
x:Name="Main">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
- (
- )
+
+
+
-
-
+
-
-
-
-
-
-
+
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ (
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
index c9568509f6..c6bd5a18aa 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -1,24 +1,10 @@
-using System;
using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
using Avalonia.Markup.Xaml;
-using Avalonia.VisualTree;
namespace Avalonia.Diagnostics.Views
{
internal class ControlDetailsView : UserControl
{
- private ThicknessEditor _borderArea;
- private ThicknessEditor _paddingArea;
- private Rectangle _horizontalSizeBegin;
- private Rectangle _horizontalSizeEnd;
- private Rectangle _verticalSizeBegin;
- private Rectangle _verticalSizeEnd;
- private Grid _layoutRoot;
- private Border _horizontalSize;
- private Border _verticalSize;
- private Border _contentArea;
-
public ControlDetailsView()
{
InitializeComponent();
@@ -27,101 +13,6 @@ namespace Avalonia.Diagnostics.Views
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
-
- _borderArea = this.FindControl("BorderArea");
- _paddingArea = this.FindControl("PaddingArea");
-
- _horizontalSizeBegin = this.FindControl("HorizontalSizeBegin");
- _horizontalSizeEnd = this.FindControl("HorizontalSizeEnd");
- _verticalSizeBegin = this.FindControl("VerticalSizeBegin");
- _verticalSizeEnd = this.FindControl("VerticalSizeEnd");
-
- _horizontalSize = this.FindControl("HorizontalSize");
- _verticalSize = this.FindControl("VerticalSize");
-
- _contentArea = this.FindControl("ContentArea");
-
- _layoutRoot = this.FindControl("LayoutRoot");
-
- void SubscribeToBounds(Visual visual)
- {
- visual.GetPropertyChangedObservable(TransformedBoundsProperty)
- .Subscribe(UpdateSizeGuidelines);
- }
-
- SubscribeToBounds(_borderArea);
- SubscribeToBounds(_paddingArea);
- SubscribeToBounds(_contentArea);
- }
-
- private void UpdateSizeGuidelines(AvaloniaPropertyChangedEventArgs e)
- {
- void UpdateGuidelines(Visual area)
- {
- if (area.TransformedBounds is TransformedBounds bounds)
- {
- // Horizontal guideline
- {
- var sizeArea = TranslateToRoot((_horizontalSize.TransformedBounds ?? default).Bounds.BottomLeft,
- _horizontalSize);
-
- var start = TranslateToRoot(bounds.Bounds.BottomLeft, area);
-
- SetPosition(_horizontalSizeBegin, start);
-
- var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
-
- SetPosition(_horizontalSizeEnd, end.WithX(end.X - 1));
-
- var height = sizeArea.Y - start.Y + 2;
-
- _horizontalSizeBegin.Height = height;
- _horizontalSizeEnd.Height = height;
- }
-
- // Vertical guideline
- {
- var sizeArea = TranslateToRoot((_verticalSize.TransformedBounds ?? default).Bounds.TopRight, _verticalSize);
-
- var start = TranslateToRoot(bounds.Bounds.TopRight, area);
-
- SetPosition(_verticalSizeBegin, start);
-
- var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
-
- SetPosition(_verticalSizeEnd, end.WithY(end.Y - 1));
-
- var width = sizeArea.X - start.X + 2;
-
- _verticalSizeBegin.Width = width;
- _verticalSizeEnd.Width = width;
- }
- }
- }
-
- Point TranslateToRoot(Point point, IVisual from)
- {
- return from.TranslatePoint(point, _layoutRoot) ?? default;
- }
-
- static void SetPosition(Rectangle rect, Point start)
- {
- Canvas.SetLeft(rect, start.X);
- Canvas.SetTop(rect, start.Y);
- }
-
- if (_borderArea.IsPresent)
- {
- UpdateGuidelines(_borderArea);
- }
- else if (_paddingArea.IsPresent)
- {
- UpdateGuidelines(_paddingArea);
- }
- else
- {
- UpdateGuidelines(_contentArea);
- }
}
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
index b7f0860e70..a9c2688a18 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
@@ -2,58 +2,136 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
xmlns:conv="clr-namespace:Avalonia.Diagnostics.Converters"
- x:Class="Avalonia.Diagnostics.Views.EventsPageView">
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:controls="clr-namespace:Avalonia.Diagnostics.Controls"
+ x:Class="Avalonia.Diagnostics.Views.EventsPageView"
+ Margin="2">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
index c1c78d38f6..ba7ab41e35 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml.cs
@@ -1,7 +1,14 @@
-using System.Linq;
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
using Avalonia.Controls;
+using Avalonia.Diagnostics.Models;
using Avalonia.Diagnostics.ViewModels;
+using Avalonia.Input;
+using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
namespace Avalonia.Diagnostics.Views
{
@@ -12,13 +19,53 @@ namespace Avalonia.Diagnostics.Views
public EventsPageView()
{
InitializeComponent();
- _events = this.FindControl("events");
+ _events = this.FindControl("EventsList");
}
- private void RecordedEvents_CollectionChanged(object sender,
- System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+ public void NavigateTo(object sender, TappedEventArgs e)
{
- _events.ScrollIntoView(_events.Items.OfType().LastOrDefault());
+ if (DataContext is EventsPageViewModel vm && sender is Control control)
+ {
+ switch (control.Tag)
+ {
+ case EventChainLink chainLink:
+ {
+ vm.RequestTreeNavigateTo(chainLink);
+ break;
+ }
+ case RoutedEvent evt:
+ {
+ vm.SelectEventByType(evt);
+
+ break;
+ }
+ }
+ }
+ }
+
+ protected override void OnDataContextChanged(EventArgs e)
+ {
+ base.OnDataContextChanged(e);
+
+ if (DataContext is EventsPageViewModel vm)
+ {
+ vm.RecordedEvents.CollectionChanged += OnRecordedEventsChanged;
+ }
+ }
+
+ private void OnRecordedEventsChanged(object? sender, NotifyCollectionChangedEventArgs e)
+ {
+ if (sender is ObservableCollection events)
+ {
+ var evt = events.LastOrDefault();
+
+ if (evt is null)
+ {
+ return;
+ }
+
+ Dispatcher.UIThread.Post(() => _events.ScrollIntoView(evt));
+ }
}
private void InitializeComponent()
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
new file mode 100644
index 0000000000..af6c84a76a
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml.cs
new file mode 100644
index 0000000000..d4a09f7296
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml.cs
@@ -0,0 +1,128 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Diagnostics.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.Views
+{
+ internal class LayoutExplorerView : UserControl
+ {
+ private readonly ThicknessEditor _borderArea;
+ private readonly ThicknessEditor _paddingArea;
+ private readonly Rectangle _horizontalSizeBegin;
+ private readonly Rectangle _horizontalSizeEnd;
+ private readonly Rectangle _verticalSizeBegin;
+ private readonly Rectangle _verticalSizeEnd;
+ private readonly Grid _layoutRoot;
+ private readonly Border _horizontalSize;
+ private readonly Border _verticalSize;
+ private readonly Border _contentArea;
+
+ public LayoutExplorerView()
+ {
+ InitializeComponent();
+
+ _borderArea = this.FindControl("BorderArea");
+ _paddingArea = this.FindControl("PaddingArea");
+
+ _horizontalSizeBegin = this.FindControl("HorizontalSizeBegin");
+ _horizontalSizeEnd = this.FindControl("HorizontalSizeEnd");
+ _verticalSizeBegin = this.FindControl("VerticalSizeBegin");
+ _verticalSizeEnd = this.FindControl("VerticalSizeEnd");
+
+ _horizontalSize = this.FindControl("HorizontalSize");
+ _verticalSize = this.FindControl("VerticalSize");
+
+ _contentArea = this.FindControl("ContentArea");
+
+ _layoutRoot = this.FindControl("LayoutRoot");
+
+ void SubscribeToBounds(Visual visual)
+ {
+ visual.GetPropertyChangedObservable(TransformedBoundsProperty)
+ .Subscribe(UpdateSizeGuidelines);
+ }
+
+ SubscribeToBounds(_borderArea);
+ SubscribeToBounds(_paddingArea);
+ SubscribeToBounds(_contentArea);
+ }
+
+ private void InitializeComponent()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+
+ private void UpdateSizeGuidelines(AvaloniaPropertyChangedEventArgs e)
+ {
+ void UpdateGuidelines(Visual area)
+ {
+ if (area.TransformedBounds is TransformedBounds bounds)
+ {
+ // Horizontal guideline
+ {
+ var sizeArea = TranslateToRoot((_horizontalSize.TransformedBounds ?? default).Bounds.BottomLeft,
+ _horizontalSize);
+
+ var start = TranslateToRoot(bounds.Bounds.BottomLeft, area);
+
+ SetPosition(_horizontalSizeBegin, start);
+
+ var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
+
+ SetPosition(_horizontalSizeEnd, end.WithX(end.X - 1));
+
+ var height = sizeArea.Y - start.Y + 2;
+
+ _horizontalSizeBegin.Height = height;
+ _horizontalSizeEnd.Height = height;
+ }
+
+ // Vertical guideline
+ {
+ var sizeArea = TranslateToRoot((_verticalSize.TransformedBounds ?? default).Bounds.TopRight, _verticalSize);
+
+ var start = TranslateToRoot(bounds.Bounds.TopRight, area);
+
+ SetPosition(_verticalSizeBegin, start);
+
+ var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
+
+ SetPosition(_verticalSizeEnd, end.WithY(end.Y - 1));
+
+ var width = sizeArea.X - start.X + 2;
+
+ _verticalSizeBegin.Width = width;
+ _verticalSizeEnd.Width = width;
+ }
+ }
+ }
+
+ Point TranslateToRoot(Point point, IVisual from)
+ {
+ return from.TranslatePoint(point, _layoutRoot) ?? default;
+ }
+
+ static void SetPosition(Rectangle rect, Point start)
+ {
+ Canvas.SetLeft(rect, start.X);
+ Canvas.SetTop(rect, start.Y);
+ }
+
+ if (_borderArea.IsPresent)
+ {
+ UpdateGuidelines(_borderArea);
+ }
+ else if (_paddingArea.IsPresent)
+ {
+ UpdateGuidelines(_paddingArea);
+ }
+ else
+ {
+ UpdateGuidelines(_contentArea);
+ }
+ }
+ }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml.cs
index 783709e54b..b688ad7676 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml.cs
@@ -27,7 +27,11 @@ namespace Avalonia.Diagnostics.Views
public void ToggleConsole()
{
- var vm = (MainViewModel)DataContext;
+ var vm = (MainViewModel?)DataContext;
+ if (vm is null)
+ {
+ return;
+ }
if (_consoleHeight == -1)
{
@@ -54,7 +58,7 @@ namespace Avalonia.Diagnostics.Views
AvaloniaXamlLoader.Load(this);
}
- private void PreviewKeyDown(object sender, KeyEventArgs e)
+ private void PreviewKeyDown(object? sender, KeyEventArgs e)
{
if (e.Key == Key.Escape)
{
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index 7dd4ed0832..70d70f0b79 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -15,6 +15,8 @@
+ ()
.Subscribe(RawKeyDown);
+
+ EventHandler? lh = default;
+ lh = (s, e) =>
+ {
+ this.Opened -= lh;
+ if ((DataContext as MainViewModel)?.StartupScreenIndex is int index)
+ {
+ var screens = this.Screens;
+ if (index > -1 && index < screens.ScreenCount)
+ {
+ var screen = screens.All[index];
+ this.Position = screen.Bounds.TopLeft;
+ this.WindowState = WindowState.Maximized;
+ }
+ }
+ };
+ this.Opened += lh;
}
- public TopLevel Root
+ public TopLevel? Root
{
get => _root;
set
@@ -43,7 +60,7 @@ namespace Avalonia.Diagnostics.Views
if (_root != null)
{
_root.Closed += RootClosed;
- DataContext = new MainViewModel(value);
+ DataContext = new MainViewModel(_root);
}
else
{
@@ -53,15 +70,20 @@ namespace Avalonia.Diagnostics.Views
}
}
- IStyleHost IStyleHost.StylingParent => null;
+ IStyleHost? IStyleHost.StylingParent => null;
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
_keySubscription.Dispose();
- _root.Closed -= RootClosed;
- _root = null;
- ((MainViewModel)DataContext)?.Dispose();
+
+ if (_root != null)
+ {
+ _root.Closed -= RootClosed;
+ _root = null;
+ }
+
+ ((MainViewModel?)DataContext)?.Dispose();
}
private void InitializeComponent()
@@ -71,12 +93,20 @@ namespace Avalonia.Diagnostics.Views
private void RawKeyDown(RawKeyEventArgs e)
{
+ var vm = (MainViewModel?)DataContext;
+ if (vm is null)
+ {
+ return;
+ }
+
const RawInputModifiers modifiers = RawInputModifiers.Control | RawInputModifiers.Shift;
if (e.Modifiers == modifiers)
{
+#pragma warning disable CS0618 // Type or member is obsolete
var point = (Root as IInputRoot)?.MouseDevice?.GetPosition(Root) ?? default;
-
+#pragma warning restore CS0618 // Type or member is obsolete
+
var control = Root.GetVisualsAt(point, x =>
{
if (x is AdornerLayer || !x.IsVisible) return false;
@@ -87,7 +117,6 @@ namespace Avalonia.Diagnostics.Views
if (control != null)
{
- var vm = (MainViewModel)DataContext;
vm.SelectControl((IControl)control);
}
}
@@ -97,12 +126,14 @@ namespace Avalonia.Diagnostics.Views
{
var enable = e.Key == Key.S;
- var vm = (MainViewModel)DataContext;
vm.EnableSnapshotStyles(enable);
}
}
}
- private void RootClosed(object sender, EventArgs e) => Close();
+ private void RootClosed(object? sender, EventArgs e) => Close();
+
+ public void SetOptions(DevToolsOptions options) =>
+ (DataContext as MainViewModel)?.SetOptions(options);
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
index 86137dfc57..a5328716fc 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
x:Class="Avalonia.Diagnostics.Views.TreePageView">
-
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
index 1b61986ce6..3543b1adea 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
using System.Linq;
using Avalonia.Controls;
using Avalonia.Controls.Generators;
@@ -6,18 +7,20 @@ using Avalonia.Diagnostics.ViewModels;
using Avalonia.Input;
using Avalonia.Markup.Xaml;
using Avalonia.Media;
+using Avalonia.VisualTree;
namespace Avalonia.Diagnostics.Views
{
internal class TreePageView : UserControl
{
private readonly Panel _adorner;
- private AdornerLayer _currentLayer;
+ private AdornerLayer? _currentLayer;
private TreeView _tree;
public TreePageView()
{
InitializeComponent();
+ _tree = this.FindControl("tree");
_tree.ItemContainerGenerator.Index.Materialized += TreeViewItemMaterialized;
_adorner = new Panel
@@ -35,9 +38,15 @@ namespace Avalonia.Diagnostics.Views
};
}
- protected void AddAdorner(object sender, PointerEventArgs e)
+ protected void AddAdorner(object? sender, PointerEventArgs e)
{
- var node = (TreeNode)((Control)sender).DataContext;
+ var node = (TreeNode?)((Control)sender!).DataContext;
+ var vm = (TreePageViewModel?)DataContext;
+ if (node is null || vm is null)
+ {
+ return;
+ }
+
var visual = (Visual)node.Visual;
_currentLayer = AdornerLayer.GetAdornerLayer(visual);
@@ -51,8 +60,6 @@ namespace Avalonia.Diagnostics.Views
_currentLayer.Children.Add(_adorner);
AdornerLayer.SetAdornedElement(_adorner, visual);
- var vm = (TreePageViewModel) DataContext;
-
if (vm.MainView.ShouldVisualizeMarginPadding)
{
var paddingBorder = (Border)_adorner.Children[0];
@@ -72,7 +79,7 @@ namespace Avalonia.Diagnostics.Views
return new Thickness(-input.Left, -input.Top, -input.Right, -input.Bottom);
}
- protected void RemoveAdorner(object sender, PointerEventArgs e)
+ protected void RemoveAdorner(object? sender, PointerEventArgs e)
{
foreach (var border in _adorner.Children.OfType())
{
@@ -88,24 +95,30 @@ namespace Avalonia.Diagnostics.Views
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
- _tree = this.FindControl("tree");
}
- private void TreeViewItemMaterialized(object sender, ItemContainerEventArgs e)
+ private void TreeViewItemMaterialized(object? sender, ItemContainerEventArgs e)
{
var item = (TreeViewItem)e.Containers[0].ContainerControl;
item.TemplateApplied += TreeViewItemTemplateApplied;
}
- private void TreeViewItemTemplateApplied(object sender, TemplateAppliedEventArgs e)
+ private void TreeViewItemTemplateApplied(object? sender, TemplateAppliedEventArgs e)
{
- var item = (TreeViewItem)sender;
- var headerPresenter = item.HeaderPresenter;
- headerPresenter.ApplyTemplate();
+ var item = (TreeViewItem)sender!;
+
+ // This depends on the default tree item template.
+ // We want to handle events in the item header but exclude events coming from children.
+ var header = item.FindDescendantOfType();
+
+ Debug.Assert(header != null);
+
+ if (header != null)
+ {
+ header.PointerEnter += AddAdorner;
+ header.PointerLeave += RemoveAdorner;
+ }
- var header = headerPresenter.Child;
- header.PointerEnter += AddAdorner;
- header.PointerLeave += RemoveAdorner;
item.TemplateApplied -= TreeViewItemTemplateApplied;
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs b/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
index 6f699339e7..4adcd32302 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/VisualTreeDebug.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Diagnostics
private static void PrintVisualTree(IVisual visual, StringBuilder builder, int indent)
{
- Control control = visual as Control;
+ Control? control = visual as Control;
builder.Append(Indent(indent - 1));
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index addc89b205..268171d467 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -70,6 +70,28 @@ namespace Avalonia.Headless
return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
}
+ public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
{
return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
diff --git a/src/Avalonia.Input/IInputElement.cs b/src/Avalonia.Input/IInputElement.cs
index 7aa9c32bca..2245ff9986 100644
--- a/src/Avalonia.Input/IInputElement.cs
+++ b/src/Avalonia.Input/IInputElement.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
using Avalonia.Interactivity;
using Avalonia.VisualTree;
+#nullable enable
+
namespace Avalonia.Input
{
///
diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs
index 8f99770b3b..65b9acae76 100644
--- a/src/Avalonia.Input/InputElement.cs
+++ b/src/Avalonia.Input/InputElement.cs
@@ -9,6 +9,8 @@ using Avalonia.Input.TextInput;
using Avalonia.Interactivity;
using Avalonia.VisualTree;
+#nullable enable
+
namespace Avalonia.Input
{
///
diff --git a/src/Avalonia.Input/KeyboardDevice.cs b/src/Avalonia.Input/KeyboardDevice.cs
index 5899824c29..a159b19026 100644
--- a/src/Avalonia.Input/KeyboardDevice.cs
+++ b/src/Avalonia.Input/KeyboardDevice.cs
@@ -60,7 +60,7 @@ namespace Avalonia.Input
ie.IsKeyboardFocusWithin = false;
}
- el = (IInputElement)el.VisualParent;
+ el = (IInputElement?)el.VisualParent;
}
}
@@ -212,17 +212,36 @@ namespace Avalonia.Input
Source = element,
};
- IVisual currentHandler = element;
+ IVisual? currentHandler = element;
while (currentHandler != null && !ev.Handled && keyInput.Type == RawKeyEventType.KeyDown)
{
var bindings = (currentHandler as IInputElement)?.KeyBindings;
if (bindings != null)
+ {
+ KeyBinding[]? bindingsCopy = null;
+
+ // Create a copy of the KeyBindings list if there's a binding which matches the event.
+ // If we don't do this the foreach loop will throw an InvalidOperationException when the KeyBindings list is changed.
+ // This can happen when a new view is loaded which adds its own KeyBindings to the handler.
foreach (var binding in bindings)
{
- if (ev.Handled)
+ if (binding.Gesture?.Matches(ev) == true)
+ {
+ bindingsCopy = bindings.ToArray();
break;
- binding.TryHandle(ev);
+ }
+ }
+
+ if (bindingsCopy is object)
+ {
+ foreach (var binding in bindingsCopy)
+ {
+ if (ev.Handled)
+ break;
+ binding.TryHandle(ev);
+ }
}
+ }
currentHandler = currentHandler.VisualParent;
}
diff --git a/src/Avalonia.Input/MouseDevice.cs b/src/Avalonia.Input/MouseDevice.cs
index 6e937b7e13..cfa3690daf 100644
--- a/src/Avalonia.Input/MouseDevice.cs
+++ b/src/Avalonia.Input/MouseDevice.cs
@@ -377,7 +377,7 @@ namespace Avalonia.Input
e.Source = element;
e.Handled = false;
element.RaiseEvent(e);
- element = (IInputElement)element.VisualParent;
+ element = (IInputElement?)element.VisualParent;
}
root.PointerOverElement = null;
@@ -444,7 +444,7 @@ namespace Avalonia.Input
branch = el;
break;
}
- el = (IInputElement)el.VisualParent;
+ el = (IInputElement?)el.VisualParent;
}
el = root.PointerOverElement;
@@ -460,7 +460,7 @@ namespace Avalonia.Input
e.Source = el;
e.Handled = false;
el.RaiseEvent(e);
- el = (IInputElement)el.VisualParent;
+ el = (IInputElement?)el.VisualParent;
}
el = root.PointerOverElement = element;
@@ -471,7 +471,7 @@ namespace Avalonia.Input
e.Source = el;
e.Handled = false;
el.RaiseEvent(e);
- el = (IInputElement)el.VisualParent;
+ el = (IInputElement?)el.VisualParent;
}
}
diff --git a/src/Avalonia.Interactivity/IInteractive.cs b/src/Avalonia.Interactivity/IInteractive.cs
index 5c01f870ab..afda29e329 100644
--- a/src/Avalonia.Interactivity/IInteractive.cs
+++ b/src/Avalonia.Interactivity/IInteractive.cs
@@ -1,5 +1,7 @@
using System;
+#nullable enable
+
namespace Avalonia.Interactivity
{
///
diff --git a/src/Avalonia.Interactivity/Interactive.cs b/src/Avalonia.Interactivity/Interactive.cs
index 580704bb19..4cd810af20 100644
--- a/src/Avalonia.Interactivity/Interactive.cs
+++ b/src/Avalonia.Interactivity/Interactive.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
using Avalonia.Layout;
using Avalonia.VisualTree;
+#nullable enable
+
namespace Avalonia.Interactivity
{
///
diff --git a/src/Avalonia.Layout/ElementManager.cs b/src/Avalonia.Layout/ElementManager.cs
index cb13deb15f..3f106708e6 100644
--- a/src/Avalonia.Layout/ElementManager.cs
+++ b/src/Avalonia.Layout/ElementManager.cs
@@ -325,7 +325,10 @@ namespace Avalonia.Layout
break;
case NotifyCollectionChangedAction.Move:
- throw new NotImplementedException();
+ int size = args.OldItems != null ? args.OldItems.Count : 1;
+ OnItemsRemoved(args.OldStartingIndex, size);
+ OnItemsAdded(args.NewStartingIndex, size);
+ break;
}
}
}
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
index a1d00017ed..7568ea8e09 100644
--- a/src/Avalonia.Layout/Layoutable.cs
+++ b/src/Avalonia.Layout/Layoutable.cs
@@ -782,7 +782,7 @@ namespace Avalonia.Layout
}
/// Input { get; set; }
- Action ScalingChanged { get; set; }
-
- Action ITopLevelImpl.ScalingChanged { get; set; }
+ public Action ScalingChanged { get; set; }
public Action TransparencyLevelChanged { get; set; }
diff --git a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
index 9685ecbe91..c4dd79f468 100644
--- a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
+++ b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
@@ -1,4 +1,6 @@
using System;
+using System.Threading;
+
using Avalonia.Animation;
using Avalonia.Controls;
using Avalonia.Styling;
@@ -22,7 +24,9 @@ namespace Avalonia.ReactiveUI
///
public static readonly StyledProperty DefaultContentProperty =
AvaloniaProperty.Register(nameof(DefaultContent));
-
+
+ private CancellationTokenSource? _lastTransitionCts;
+
///
/// Gets or sets the animation played when content appears and disappears.
///
@@ -62,11 +66,14 @@ namespace Avalonia.ReactiveUI
///
@@ -90,7 +92,7 @@ namespace Avalonia.Controls
}
///
- /// Remvoes all non-pseudoclasses from the collection.
+ /// Removes all non-pseudoclasses from the collection.
///
public override void Clear()
{
@@ -135,7 +137,7 @@ namespace Avalonia.Controls
///
public override void InsertRange(int index, IEnumerable names)
{
- var c = new List();
+ List? toInsert = null;
foreach (var name in names)
{
@@ -143,11 +145,16 @@ namespace Avalonia.Controls
if (!Contains(name))
{
- c.Add(name);
+ toInsert ??= new List();
+
+ toInsert.Add(name);
}
}
- base.InsertRange(index, c);
+ if (toInsert != null)
+ {
+ base.InsertRange(index, toInsert);
+ }
}
///
@@ -176,19 +183,21 @@ namespace Avalonia.Controls
///
public override void RemoveAll(IEnumerable names)
{
- var c = new List();
+ List? toRemove = null;
foreach (var name in names)
{
ThrowIfPseudoclass(name, "removed");
- if (Contains(name))
- {
- c.Add(name);
- }
+ toRemove ??= new List();
+
+ toRemove.Add(name);
}
- base.RemoveAll(c);
+ if (toRemove != null)
+ {
+ base.RemoveAll(toRemove);
+ }
}
///
@@ -223,7 +232,7 @@ namespace Avalonia.Controls
/// source)
{
- var toRemove = new List();
+ List? toRemove = null;
foreach (var name in source)
{
@@ -234,11 +243,17 @@ namespace Avalonia.Controls
{
if (!name.StartsWith(":"))
{
+ toRemove ??= new List();
+
toRemove.Add(name);
}
}
- base.RemoveAll(toRemove);
+ if (toRemove != null)
+ {
+ base.RemoveAll(toRemove);
+ }
+
base.AddRange(source);
}
diff --git a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
index ef3c1d5b89..dbf8c68892 100644
--- a/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
+++ b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
@@ -1,3 +1,5 @@
+#nullable enable
+
namespace Avalonia.Controls
{
///
@@ -14,6 +16,6 @@ namespace Avalonia.Controls
/// Sets the control's inheritance parent.
///
///
@@ -14,6 +16,6 @@ namespace Avalonia.Controls
/// Sets the control's parent.
///
///
/// Defines an element with a data context that can be used for binding.
@@ -8,6 +10,6 @@
///
/// Gets or sets the element's data context.
///
- object DataContext { get; set; }
+ object? DataContext { get; set; }
}
}
diff --git a/src/Avalonia.Styling/IStyledElement.cs b/src/Avalonia.Styling/IStyledElement.cs
index 046a6f9872..a068d4a5bf 100644
--- a/src/Avalonia.Styling/IStyledElement.cs
+++ b/src/Avalonia.Styling/IStyledElement.cs
@@ -4,6 +4,8 @@ using Avalonia.Controls;
using Avalonia.LogicalTree;
using Avalonia.Styling;
+#nullable enable
+
namespace Avalonia
{
public interface IStyledElement :
@@ -17,7 +19,7 @@ namespace Avalonia
///
/// Occurs when the control has finished initialization.
///
- event EventHandler Initialized;
+ event EventHandler? Initialized;
///
/// Gets a value that indicates whether the element has finished initialization.
@@ -32,6 +34,6 @@ namespace Avalonia
///
/// Gets the control's logical parent.
///
- IStyledElement Parent { get; }
+ IStyledElement? Parent { get; }
}
}
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
index 5f26f65512..2292f5c518 100644
--- a/src/Avalonia.Styling/StyledElement.cs
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -300,7 +300,7 @@ namespace Avalonia
bool IStyleHost.IsStylesInitialized => _styles != null;
///
/// .OnCompleted() { }
void IObserver.OnError(Exception error) { }
- void IObserver.OnNext(object value) => PublishNext(Equals(value, _value));
+ void IObserver.OnNext(object value) => PublishNext(PropertyEqualsSelector.Compare(_property.PropertyType, value, _value));
}
}
diff --git a/src/Avalonia.Styling/Styling/ISetterValue.cs b/src/Avalonia.Styling/Styling/ISetterValue.cs
index 63c544cf7d..0fd245a429 100644
--- a/src/Avalonia.Styling/Styling/ISetterValue.cs
+++ b/src/Avalonia.Styling/Styling/ISetterValue.cs
@@ -1,4 +1,6 @@
-namespace Avalonia.Styling
+#nullable enable
+
+namespace Avalonia.Styling
{
///
/// Customizes the behavior of a class when added as a value to an
+ VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+ AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
+ VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
+ AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}">
-
diff --git a/src/Avalonia.Themes.Fluent/Accents/Base.xaml b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
index 0e34eb3f3b..1e2acf736d 100644
--- a/src/Avalonia.Themes.Fluent/Accents/Base.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
@@ -1,6 +1,7 @@
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
index fb08b97b47..915be08e53 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
@@ -2,16 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=netstandard">
-
-
- #FF0078D7
- #FF005A9E
- #FF004275
- #FF002642
- #FF429CE3
- #FF76B9ED
- #FFA6D8FF
-
#FF000000
#33000000
@@ -40,6 +30,9 @@
#33FFFFFF
#FFF000
+ #18FFFFFF
+ #30FFFFFF
+
False
+
+
+
+ #FF000000
+ XamlAutoFontFamily
- XamlAutoFontFamily
- Segoe WP
- Segoe WP SemiLight
- XamlAutoFontFamily
- Segoe MDL2 Assets
- XamlAutoFontFamily
- 24
- 48
- 56
- 24
- 40
- 3
374
- 0
- 2
- 0
- 21
- 64
- 80
- 240
- 14
- 14
- 320
- 548
- 184
- 756
- 130
- 202
- 32
- 32
- 56
- 80
- 20
- 20
- 758
- 456
- 40
- 96
- 240
- 4
- 34
- 20
- 14
- 80
- 16.0
- 42
- 180
- 12
- 48
- 48
- 96
- 16
- 21
- 62
- -112
- 42
- 289
- 96
- 8
- 16
- 0.6
- 4
- 2
- 0
- 14
- 32
- 32
- 270
- 300
- 28
- 4
- 26.667
-
- 4
- 2
- 320
- 48
- 0.8
- 0.8
- 1
- 0.87
- 0.87
- 1
- 0.4
- 0.6
- 1
- 32
- 64
- 18.14
- 25.5
-
- 80
- 12
- 44
- 44
- 20
- 20
-
- 0
- 44
- 44
- 12
- 0,0,0,0
- 0,0,0,0
- 0,0,0,0
- 0,0,0,0
- 3,0,3,0
- 1
0,2,0,2
+ 1
-1,0,-1,0
- 12,11,0,13
- 2
- 2
- 2
- 1
- 0
- 0,4,0,4
- 0,0,0,4
- 2
- 11,5,11,7
- 11,11,11,13
- 11,11,11,13
- 1
- 0,0,4,0
- 0,0,0,0
- 0,0,0,0
- 0,0,0,0
- 0,24,0,0
- 0,0,0,12
- 24,18,24,24
- 0,0,0,4
+ 32
+ 64
+ 456
+ 0
1
0
- 0
- 0,37,0,0
- 0,19,0,0
- 19,0,19,17.5
- 0
- 0,0,0,0
+
12,11,12,12
- 4
- 2.5
- 5,6,5,6
- 0,0,0,9
- 24,0,0,11
- 0
- 0,9.5,0,0
- 0,0,0,19
- 19,19,19,0
- 19,37,19,0
- 0,0,0,32.5
- 0
- 2
- 1
- 12,11,8,13
- 12,11,8,13
- 12,11,8,13
- 0,0,12,0
- 12,4,8,4
- 0,2,0,0
- 2
- 0
- 0,0,0,4
- 0,0,1,0
- 1,0,0,0
- 2
- 0,9.5,0,9.5
- 10,3,6,6
- 0,0,-2,0
- 12,5,10,5
- 0,0,0,4
- 0,0,20,0
- 20,0,0,0
- 2
- 1
- 4
- Normal
- SemiLight
- Normal
- Normal
- Normal
- Normal
- Normal
- Light
- Normal
- 48
- 48,0,48,27
+ 96
+ 40
+ 758
+
+
+ 0
+
+
+ 0,4,0,4
+
+
+ 12,0,12,0
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
index 6c8d16ddfa..e5c0babb80 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
@@ -2,16 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=netstandard">
-
-
- #FF0078D7
- #FF005A9E
- #FF004275
- #FF002642
- #FF429CE3
- #FF76B9ED
- #FFA6D8FF
-
#FFFFFFFF
#33FFFFFF
@@ -40,6 +30,9 @@
#33000000
#C50500
+ #17000000
+ #2E000000
+
False
+
+
+
+ XamlAutoFontFamily
- XamlAutoFontFamily
- Segoe WP
- Segoe WP SemiLight
- XamlAutoFontFamily
- Segoe MDL2 Assets
- XamlAutoFontFamily
- 24
- 48
- 56
- 24
- 40
- 3
- 374
- 0
- 2
- 0
- 21
- 64
- 80
- 240
- 14
- 14
- 320
- 548
- 184
- 756
- 130
- 202
- 32
- 32
- 56
- 80
- 20
- 20
- 758
- 456
- 40
- 96
- 240
- 4
- 34
- 20
- 14
- 80
- 16.0
- 42
- 180
- 12
- 48
- 48
- 96
- 16
- 21
- 62
- -112
- 42
- 289
- 96
- 8
- 16
- 0.6
- 4
- 2
- 0
- 14
- 32
- 32
- 270
- 300
- 28
- 4
- 26.667
- 4
- 2
- 320
- 48
- 0.8
- 0.45
- 0.5625
- 0.87
- 0.73
- 0.839
- 0.4
- 0.6
- 1
- 32
- 64
- 18.14
- 25.5
+
+ #FFFFFFFF
+ 80
- 12
- 44
- 44
- 20
- 20
- 0
- 44
- 44
- 12
- 0,0,0,0
- 0,0,0,0
- 0,0,0,0
- 0,0,0,0
- 3,0,3,0
- 1
+ 374
0,2,0,2
+ 1
-1,0,-1,0
- 12,11,0,13
- 2
- 2
- 2
- 1
- 0
- 0,4,0,4
- 0,0,0,4
- 2
- 11,5,11,7
- 11,11,11,13
- 11,11,11,13
- 1
- 0,0,4,0
- 0,0,0,0
- 0,0,0,0
- 0,0,0,0
- 0,24,0,0
- 0,0,0,12
- 24,18,24,24
- 0,0,0,4
+ 32
+ 64
+ 456
+ 0
1
0
- 0
- 0,37,0,0
- 0,19,0,0
- 19,0,19,17.5
- 0
- 0,0,0,0
+
12,11,12,12
- 4
- 2.5
- 5,6,5,6
- 0,0,0,9
- 24,0,0,11
- 0
- 0,9.5,0,0
- 0,0,0,19
- 19,19,19,0
- 19,37,19,0
- 0,0,0,32.5
- 0
- 0
- 1
- 12,11,8,13
- 12,11,8,13
- 12,11,8,13
- 0,0,12,0
- 12,4,8,4
- 0,2,0,0
- 2
- 0
- 0,0,0,4
- 0,0,1,0
- 1,0,0,0
- 2
- 0,9.5,0,9.5
- 10,3,6,6
- 0,0,-2,0
- 12,5,10,5
- 0,0,0,4
- 0,0,20,0
- 20,0,0,0
- 2
- 1
- 4
- Normal
- SemiLight
- Normal
- Normal
- Normal
- Normal
- Normal
- Light
- Normal
- 48
- 48,0,48,27
+ 96
+ 40
+ 758
+
+
+ 0
+
+
+ 0,4,0,4
+
+
+ 12,0,12,0
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
deleted file mode 100644
index 1c65911593..0000000000
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
+++ /dev/null
@@ -1,455 +0,0 @@
-
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
deleted file mode 100644
index ad23955776..0000000000
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
+++ /dev/null
@@ -1,458 +0,0 @@
-
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
index ae1fe42031..a1f423c059 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
@@ -28,19 +28,8 @@
1
+
1
@@ -101,45 +81,18 @@
21
64
- 80
- 240
1
1
- 0,0,0,4
- 2
11,5,11,7
- 11,11,11,13
- 11,11,11,13
- Normal
- SemiLight
+ Normal
0
0,4,0,4
- 0
- 4
+ 0
1
@@ -268,8 +163,7 @@
1
-
-
- 0.6
- 4
- 0
- 12
-
+
1
- 0
4
2
0
- 0,0,0,4
Normal
0
1
12
@@ -615,16 +418,12 @@
8,5,8,7
+ 8,5,8,7
XamlAutoFontFamily
24
- 40
- -25
12,0,12,0
12,0,12,0
SemiLight
0
- 1
00:00:00.1
- 00:00:02
- 00:00:00.1
- 00:00:02.1
16
8
- 00:00:00.40
- 00:00:02.00
+
1
32
+
1
1
21
- 64
- 80
- 240
+ 64
1
- 1
- 0,0,0,4
- 2
- 11,5,11,7
- 11,11,11,13
- 11,11,11,13
+ 1
+ 11,5,11,7
Normal
- SemiLight
0
0,4,0,4
- 0
- 0.6
+
+
4
0
- 1
32
@@ -276,7 +163,6 @@
1
-
+
- 12
-
+
1
- 0
4
2
0
- 0,0,0,4
Normal
0
1
12
1
8,5,8,7
-
+
XamlAutoFontFamily
24
- 40
- -25
12,0,12,0
12,0,12,0
SemiLight
0
- 1
00:00:00.1
- 00:00:02
- 00:00:00.1
- 00:00:02.1
+ 16
8
- 00:00:00.40
- 00:00:02.00
+
1
32
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
- 0