/// Clear a sort criteria by assigning SortDescription.Empty to this property.
- /// One or more sort criteria in form of
+ /// One or more sort criteria in form of
/// can be used, each specifying a property and direction to sort by.
///
///
@@ -4312,4 +4312,4 @@ namespace Avalonia.Collections
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
index d213285aff..09c3d07a41 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
@@ -26,6 +26,7 @@ namespace Avalonia.Controls
/// Gets or sets the binding that associates the column with a property in the data source.
///
//TODO Binding
+ [AssignBinding]
public virtual IBinding Binding
{
get
diff --git a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
index d5ad4c75f8..f15442addf 100644
--- a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
@@ -8,7 +8,6 @@ using Avalonia.Metadata;
[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests")]
[assembly: InternalsVisibleTo("Avalonia.DesignerSupport")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Collections")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index a26b7d7405..419064b051 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -148,13 +148,20 @@ namespace Avalonia.Controls
public delegate void AppMainDelegate(Application app, string[] args);
+ public void Start()
+ {
+ Setup();
+ BeforeStartCallback(Self);
+ Instance.Run();
+ }
+
public void Start(AppMainDelegate main, string[] args)
{
Setup();
BeforeStartCallback(Self);
main(Instance, args);
}
-
+
///
/// Sets up the platform-specific services for the application, but does not run it.
///
@@ -220,13 +227,13 @@ namespace Avalonia.Controls
///
/// Sets the shutdown mode of the application.
///
- /// The shutdown mode.
+ /// The shutdown mode.
///
- public TAppBuilder SetExitMode(ExitMode exitMode)
+ public TAppBuilder SetShutdownMode(ShutdownMode shutdownMode)
{
- Instance.ExitMode = exitMode;
+ Instance.ShutdownMode = shutdownMode;
return Self;
- }
+ }
protected virtual bool CheckSetup => true;
diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 1d4e4cbeaa..bbea3693cc 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -43,8 +43,8 @@ namespace Avalonia
private readonly Styler _styler = new Styler();
private Styles _styles;
private IResourceDictionary _resources;
-
private CancellationTokenSource _mainLoopCancellationTokenSource;
+ private int _exitCode;
///
/// Initializes a new instance of the class.
@@ -52,10 +52,14 @@ namespace Avalonia
public Application()
{
Windows = new WindowCollection(this);
-
- OnExit += OnExiting;
}
+ ///
+ public event EventHandler Startup;
+
+ ///
+ public event EventHandler Exit;
+
///
public event EventHandler ResourcesChanged;
@@ -164,14 +168,14 @@ namespace Avalonia
IResourceNode IResourceNode.ResourceParent => null;
///
- /// Gets or sets the . This property indicates whether the application exits explicitly or implicitly.
- /// If is set to OnExplicitExit the application is only closes if Exit is called.
+ /// Gets or sets the . This property indicates whether the application is shutdown explicitly or implicitly.
+ /// If is set to OnExplicitShutdown the application is only closes if Shutdown is called.
/// The default is OnLastWindowClose
///
///
/// The shutdown mode.
///
- public ExitMode ExitMode { get; set; }
+ public ShutdownMode ShutdownMode { get; set; }
///
/// Gets or sets the main window of the application.
@@ -190,108 +194,171 @@ namespace Avalonia
public WindowCollection Windows { get; }
///
- /// Gets or sets a value indicating whether this instance is existing.
+ /// Gets or sets a value indicating whether this instance is shutting down.
///
///
- /// true if this instance is existing; otherwise, false.
+ /// true if this instance is shutting down; otherwise, false.
///
- internal bool IsExiting { get; set; }
+ internal bool IsShuttingDown { get; private set; }
///
/// Initializes the application by loading XAML etc.
///
- public virtual void Initialize()
+ public virtual void Initialize() { }
+
+ ///
+ /// Runs the application's main loop.
+ ///
+ ///
+ /// This will return when the condition is met
+ /// or was called.
+ ///
+ /// The application's exit code that is returned to the operating system on termination.
+ public int Run()
{
+ return Run(new CancellationTokenSource());
}
///
- /// Runs the application's main loop until the is closed.
+ /// Runs the application's main loop.
///
- /// The closable to track
- public void Run(ICloseable closable)
+ ///
+ /// This will return when the condition is met
+ /// or was called.
+ /// This also returns when is closed.
+ ///
+ /// The closable to track.
+ /// The application's exit code that is returned to the operating system on termination.
+ public int Run(ICloseable closable)
{
- if (_mainLoopCancellationTokenSource != null)
+ closable.Closed += (s, e) => _mainLoopCancellationTokenSource?.Cancel();
+
+ return Run(new CancellationTokenSource());
+ }
+
+ ///
+ /// Runs the application's main loop.
+ ///
+ ///
+ /// This will return when the condition is met
+ /// or was called.
+ ///
+ /// The window that is used as
+ /// when the isn't already set.
+ /// The application's exit code that is returned to the operating system on termination.
+ public int Run(Window mainWindow)
+ {
+ if (mainWindow == null)
{
- throw new Exception("Run should only called once");
+ throw new ArgumentNullException(nameof(mainWindow));
}
- closable.Closed += (s, e) => Exit();
-
- _mainLoopCancellationTokenSource = new CancellationTokenSource();
+ if (MainWindow == null)
+ {
+ Dispatcher.UIThread.Post(() =>
+ {
+ if (!mainWindow.IsVisible)
+ {
+ mainWindow.Show();
+ }
- Dispatcher.UIThread.MainLoop(_mainLoopCancellationTokenSource.Token);
+ MainWindow = mainWindow;
+ });
+ }
- // Make sure we call OnExit in case an error happened and Exit() wasn't called explicitly
- if (!IsExiting)
- {
- OnExit?.Invoke(this, EventArgs.Empty);
- }
+ return Run(new CancellationTokenSource());
}
-
///
- /// Runs the application's main loop until some condition occurs that is specified by ExitMode.
+ /// Runs the application's main loop.
///
- /// The main window
- public void Run(Window mainWindow)
+ ///
+ /// This will return when the condition is met
+ /// or was called.
+ /// This also returns when the is canceled.
+ ///
+ /// The application's exit code that is returned to the operating system on termination.
+ /// The token to track.
+ public int Run(CancellationToken token)
{
- if (_mainLoopCancellationTokenSource != null)
+ return Run(CancellationTokenSource.CreateLinkedTokenSource(token));
+ }
+
+ private int Run(CancellationTokenSource tokenSource)
+ {
+ if (IsShuttingDown)
{
- throw new Exception("Run should only called once");
+ throw new InvalidOperationException("Application is shutting down.");
}
- _mainLoopCancellationTokenSource = new CancellationTokenSource();
-
- if (MainWindow == null)
+ if (_mainLoopCancellationTokenSource != null)
{
- if (mainWindow == null)
- {
- throw new ArgumentNullException(nameof(mainWindow));
- }
+ throw new InvalidOperationException("Application is already running.");
+ }
- if (!mainWindow.IsVisible)
- {
- mainWindow.Show();
- }
+ _mainLoopCancellationTokenSource = tokenSource;
- MainWindow = mainWindow;
- }
+ Dispatcher.UIThread.Post(() => OnStartup(new StartupEventArgs()), DispatcherPriority.Send);
Dispatcher.UIThread.MainLoop(_mainLoopCancellationTokenSource.Token);
- // Make sure we call OnExit in case an error happened and Exit() wasn't called explicitly
- if (!IsExiting)
+ if (!IsShuttingDown)
{
- OnExit?.Invoke(this, EventArgs.Empty);
+ Shutdown(_exitCode);
}
+
+ return _exitCode;
}
///
- /// Runs the application's main loop until the is canceled.
+ /// Raises the event.
///
- /// The token to track
- public void Run(CancellationToken token)
+ /// A that contains the event data.
+ protected virtual void OnStartup(StartupEventArgs e)
{
- Dispatcher.UIThread.MainLoop(token);
-
- // Make sure we call OnExit in case an error happened and Exit() wasn't called explicitly
- if (!IsExiting)
- {
- OnExit?.Invoke(this, EventArgs.Empty);
- }
+ Startup?.Invoke(this, e);
}
///
- /// Exits the application
+ /// Raises the event.
///
- public void Exit()
+ /// A that contains the event data.
+ protected virtual void OnExit(ExitEventArgs e)
{
- IsExiting = true;
+ Exit?.Invoke(this, e);
+ }
+
+ ///
+ public void Shutdown(int exitCode = 0)
+ {
+ if (IsShuttingDown)
+ {
+ throw new InvalidOperationException("Application is already shutting down.");
+ }
+
+ _exitCode = exitCode;
+
+ IsShuttingDown = true;
Windows.Clear();
- OnExit?.Invoke(this, EventArgs.Empty);
+ try
+ {
+ var e = new ExitEventArgs { ApplicationExitCode = _exitCode };
+
+ OnExit(e);
+
+ _exitCode = e.ApplicationExitCode;
+ }
+ finally
+ {
+ _mainLoopCancellationTokenSource?.Cancel();
+
+ _mainLoopCancellationTokenSource = null;
+
+ IsShuttingDown = false;
- _mainLoopCancellationTokenSource?.Cancel();
+ Environment.ExitCode = _exitCode;
+ }
}
///
@@ -302,20 +369,6 @@ namespace Avalonia
Styles.TryGetResource(key, out value);
}
- ///
- /// Sent when the application is exiting.
- ///
- public event EventHandler OnExit;
-
- ///
- /// Called when the application is exiting.
- ///
- ///
- ///
- protected virtual void OnExiting(object sender, EventArgs e)
- {
- }
-
///
/// Register's the services needed by Avalonia.
///
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index a7ee027e70..ca5edae4a9 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -1,6 +1,7 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using System;
using System.ComponentModel;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates;
@@ -20,7 +21,7 @@ namespace Avalonia.Controls
///
/// - A property to allow user-defined data to be attached to the control.
///
- public class Control : InputElement, IControl, INamed, ISupportInitialize, IVisualBrushInitialize, IRequiresTemplateInSetter
+ public class Control : InputElement, IControl, INamed, ISupportInitialize, IVisualBrushInitialize, ISetterValue
{
///
/// Defines the property.
@@ -90,6 +91,13 @@ namespace Avalonia.Controls
///
bool IDataTemplateHost.IsDataTemplatesInitialized => _dataTemplates != null;
+ ///
+ void ISetterValue.Initialize(ISetter setter)
+ {
+ throw new InvalidOperationException(
+ "Cannot use a control as a Setter value. Wrap the control in a .");
+ }
+
///
void IVisualBrushInitialize.EnsureInitialized()
{
diff --git a/src/Avalonia.Controls/ExitEventArgs.cs b/src/Avalonia.Controls/ExitEventArgs.cs
new file mode 100644
index 0000000000..c99f7fe047
--- /dev/null
+++ b/src/Avalonia.Controls/ExitEventArgs.cs
@@ -0,0 +1,18 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Avalonia.Controls
+{
+ ///
+ /// Contains the arguments for the event.
+ ///
+ public class ExitEventArgs : EventArgs
+ {
+ ///
+ /// Gets or sets the exit code that an application returns to the operating system when the application exits.
+ ///
+ public int ApplicationExitCode { get; set; }
+ }
+}
diff --git a/src/Avalonia.Controls/Expander.cs b/src/Avalonia.Controls/Expander.cs
index f0ba2b5578..1fa9798784 100644
--- a/src/Avalonia.Controls/Expander.cs
+++ b/src/Avalonia.Controls/Expander.cs
@@ -13,18 +13,11 @@ namespace Avalonia.Controls
public class Expander : HeaderedContentControl
{
- public static readonly DirectProperty ContentTransitionProperty =
- AvaloniaProperty.RegisterDirect(
- nameof(ContentTransition),
- o => o.ContentTransition,
- (o, v) => o.ContentTransition = v);
+ public static readonly StyledProperty ContentTransitionProperty =
+ AvaloniaProperty.Register(nameof(ContentTransition));
- public static readonly DirectProperty ExpandDirectionProperty =
- AvaloniaProperty.RegisterDirect(
- nameof(ExpandDirection),
- o => o.ExpandDirection,
- (o, v) => o.ExpandDirection = v,
- ExpandDirection.Down);
+ public static readonly StyledProperty ExpandDirectionProperty =
+ AvaloniaProperty.Register(nameof(ExpandDirection), ExpandDirection.Down);
public static readonly DirectProperty IsExpandedProperty =
AvaloniaProperty.RegisterDirect(
@@ -33,6 +26,8 @@ namespace Avalonia.Controls
(o, v) => o.IsExpanded = v,
defaultBindingMode: Data.BindingMode.TwoWay);
+ private bool _isExpanded;
+
static Expander()
{
PseudoClass(ExpandDirectionProperty, d => d == ExpandDirection.Down, ":down");
@@ -47,14 +42,14 @@ namespace Avalonia.Controls
public IPageTransition ContentTransition
{
- get { return _contentTransition; }
- set { SetAndRaise(ContentTransitionProperty, ref _contentTransition, value); }
+ get => GetValue(ContentTransitionProperty);
+ set => SetValue(ContentTransitionProperty, value);
}
public ExpandDirection ExpandDirection
{
- get { return _expandDirection; }
- set { SetAndRaise(ExpandDirectionProperty, ref _expandDirection, value); }
+ get => GetValue(ExpandDirectionProperty);
+ set => SetValue(ExpandDirectionProperty, value);
}
public bool IsExpanded
@@ -79,9 +74,5 @@ namespace Avalonia.Controls
}
}
}
-
- private IPageTransition _contentTransition;
- private ExpandDirection _expandDirection;
- private bool _isExpanded;
}
}
diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs
index b51583d8b3..90a27d0b31 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -177,6 +177,17 @@ namespace Avalonia.Controls
return element.GetValue(RowSpanProperty);
}
+
+ ///
+ /// Gets the value of the IsSharedSizeScope attached property for a control.
+ ///
+ /// The control.
+ /// The control's IsSharedSizeScope value.
+ public static bool GetIsSharedSizeScope(AvaloniaObject element)
+ {
+ return element.GetValue(IsSharedSizeScopeProperty);
+ }
+
///
/// Sets the value of the Column attached property for a control.
///
@@ -217,6 +228,16 @@ namespace Avalonia.Controls
element.SetValue(RowSpanProperty, value);
}
+ ///
+ /// Sets the value of IsSharedSizeScope property for a control.
+ ///
+ /// The control.
+ /// The IsSharedSizeScope value.
+ public static void SetIsSharedSizeScope(AvaloniaObject element, bool value)
+ {
+ element.SetValue(IsSharedSizeScopeProperty, value);
+ }
+
///
/// Gets the result of the last column measurement.
/// Use this result to reduce the arrange calculation.
diff --git a/src/Avalonia.Controls/IApplicationLifecycle.cs b/src/Avalonia.Controls/IApplicationLifecycle.cs
index 51f554c078..a3c6599b20 100644
--- a/src/Avalonia.Controls/IApplicationLifecycle.cs
+++ b/src/Avalonia.Controls/IApplicationLifecycle.cs
@@ -7,14 +7,20 @@ namespace Avalonia.Controls
///
public interface IApplicationLifecycle
{
+ ///
+ /// Sent when the application is starting up.
+ ///
+ event EventHandler Startup;
+
///
/// Sent when the application is exiting.
///
- event EventHandler OnExit;
+ event EventHandler Exit;
///
- /// Exits the application.
+ /// Shuts down the application and sets the exit code that is returned to the operating system when the application exits.
///
- void Exit();
+ /// An integer exit code for an application. The default exit code is 0.
+ void Shutdown(int exitCode = 0);
}
}
diff --git a/src/Avalonia.Controls/Image.cs b/src/Avalonia.Controls/Image.cs
index c696fe7975..fa6f5787be 100644
--- a/src/Avalonia.Controls/Image.cs
+++ b/src/Avalonia.Controls/Image.cs
@@ -81,23 +81,22 @@ namespace Avalonia.Controls
protected override Size MeasureOverride(Size availableSize)
{
var source = Source;
+ var result = new Size();
if (source != null)
{
Size sourceSize = new Size(source.PixelSize.Width, source.PixelSize.Height);
if (double.IsInfinity(availableSize.Width) || double.IsInfinity(availableSize.Height))
{
- return sourceSize;
+ result = sourceSize;
}
else
{
- return Stretch.CalculateSize(availableSize, sourceSize);
+ result = Stretch.CalculateSize(availableSize, sourceSize);
}
}
- else
- {
- return new Size();
- }
+
+ return result.Constrain(availableSize);
}
///
diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index 950d4f34da..07372eb714 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -20,6 +20,9 @@ namespace Avalonia.Controls
public static readonly AvaloniaProperty LayoutTransformProperty =
AvaloniaProperty.Register(nameof(LayoutTransform));
+ public static readonly AvaloniaProperty UseRenderTransformProperty =
+ AvaloniaProperty.Register(nameof(LayoutTransform));
+
static LayoutTransformControl()
{
ClipToBoundsProperty.OverrideDefaultValue(true);
@@ -29,6 +32,7 @@ namespace Avalonia.Controls
ChildProperty.Changed
.AddClassHandler(x => x.OnChildChanged);
+ UseRenderTransformProperty.Changed.AddClassHandler(x => x.OnUseRenderTransformPropertyChanged);
}
///
@@ -40,6 +44,15 @@ namespace Avalonia.Controls
set { SetValue(LayoutTransformProperty, value); }
}
+ ///
+ /// Utilize the for layout transforms.
+ ///
+ public bool UseRenderTransform
+ {
+ get { return GetValue(UseRenderTransformProperty); }
+ set { SetValue(UseRenderTransformProperty, value); }
+ }
+
public IControl TransformRoot => Child;
///
@@ -51,6 +64,7 @@ namespace Avalonia.Controls
{
if (TransformRoot == null || LayoutTransform == null)
{
+ LayoutTransform = RenderTransform;
return base.ArrangeOverride(finalSize);
}
@@ -133,6 +147,42 @@ namespace Avalonia.Controls
return transformedDesiredSize;
}
+ IDisposable _renderTransformChangedEvent;
+
+ private void OnUseRenderTransformPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+ {
+ // HACK: In theory, this method and the UseRenderTransform shouldn't exist but
+ // it's hard to animate this particular control with style animations without
+ // PropertyPaths.
+ //
+ // So until we get that implemented, we'll stick on this not-so-good
+ // workaround.
+
+ var target = e.Sender as LayoutTransformControl;
+ var shouldUseRenderTransform = (bool)e.NewValue;
+ if (target != null)
+ {
+ if (shouldUseRenderTransform)
+ {
+ _renderTransformChangedEvent = RenderTransformProperty.Changed
+ .Subscribe(
+ (x) =>
+ {
+ var target2 = x.Sender as LayoutTransformControl;
+ if (target2 != null)
+ {
+ target2.LayoutTransform = target2.RenderTransform;
+ }
+ });
+ }
+ else
+ {
+ _renderTransformChangedEvent?.Dispose();
+ LayoutTransform = null;
+ }
+ }
+ }
+
private void OnChildChanged(AvaloniaPropertyChangedEventArgs e)
{
if (null != TransformRoot)
diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs
index fce568e56d..041b81155a 100644
--- a/src/Avalonia.Controls/ListBox.cs
+++ b/src/Avalonia.Controls/ListBox.cs
@@ -30,13 +30,13 @@ namespace Avalonia.Controls
///
/// Defines the property.
///
- public static readonly new AvaloniaProperty SelectedItemsProperty =
+ public static readonly new DirectProperty SelectedItemsProperty =
SelectingItemsControl.SelectedItemsProperty;
///
/// Defines the property.
///
- public static readonly new AvaloniaProperty SelectionModeProperty =
+ public static readonly new StyledProperty SelectionModeProperty =
SelectingItemsControl.SelectionModeProperty;
///
diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
new file mode 100644
index 0000000000..03c2fe85b8
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -0,0 +1,23 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// Represents a notification manager that can show arbitrary content.
+ /// Managed notification managers can show any content.
+ ///
+ ///
+ /// Because notification managers of this type are implemented purely in managed code, they
+ /// can display arbitrary content, as opposed to notification managers which display notifications
+ /// using the host operating system's notification mechanism.
+ ///
+ public interface IManagedNotificationManager : INotificationManager
+ {
+ ///
+ /// Shows a notification.
+ ///
+ /// The content to be displayed.
+ void Show(object content);
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/INotification.cs b/src/Avalonia.Controls/Notifications/INotification.cs
new file mode 100644
index 0000000000..2c6cb90133
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/INotification.cs
@@ -0,0 +1,44 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// Represents a notification that can be shown in a window or by the host operating system.
+ ///
+ public interface INotification
+ {
+ ///
+ /// Gets the Title of the notification.
+ ///
+ string Title { get; }
+
+ ///
+ /// Gets the notification message.
+ ///
+ string Message { get; }
+
+ ///
+ /// Gets the of the notification.
+ ///
+ NotificationType Type { get; }
+
+ ///
+ /// Gets the expiration time of the notification after which it will automatically close.
+ /// If the value is then the notification will remain open until the user closes it.
+ ///
+ TimeSpan Expiration { get; }
+
+ ///
+ /// Gets an Action to be run when the notification is clicked.
+ ///
+ Action OnClick { get; }
+
+ ///
+ /// Gets an Action to be run when the notification is closed.
+ ///
+ Action OnClose { get; }
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
new file mode 100644
index 0000000000..21430c900d
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -0,0 +1,18 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// Represents a notification manager that can be used to show notifications in a window or using
+ /// the host operating system.
+ ///
+ public interface INotificationManager
+ {
+ ///
+ /// Show a notification.
+ ///
+ /// The notification to be displayed.
+ void Show(INotification notification);
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
new file mode 100644
index 0000000000..4204ad0aee
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -0,0 +1,60 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// A notification that can be shown in a window or by the host operating system.
+ ///
+ ///
+ /// This class represents a notification that can be displayed either in a window using
+ /// or by the host operating system (to be implemented).
+ ///
+ public class Notification : INotification
+ {
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The title of the notification.
+ /// The message to be displayed in the notification.
+ /// The of the notification.
+ /// The expiry time at which the notification will close.
+ /// Use for notifications that will remain open.
+ /// An Action to call when the notification is clicked.
+ /// An Action to call when the notification is closed.
+ public Notification(string title,
+ string message,
+ NotificationType type = NotificationType.Information,
+ TimeSpan? expiration = null,
+ Action onClick = null,
+ Action onClose = null)
+ {
+ Title = title;
+ Message = message;
+ Type = type;
+ Expiration = expiration.HasValue ? expiration.Value : TimeSpan.FromSeconds(5);
+ OnClick = onClick;
+ OnClose = onClose;
+ }
+
+ ///
+ public string Title { get; private set; }
+
+ ///
+ public string Message { get; private set; }
+
+ ///
+ public NotificationType Type { get; private set; }
+
+ ///
+ public TimeSpan Expiration { get; private set; }
+
+ ///
+ public Action OnClick { get; private set; }
+
+ ///
+ public Action OnClose { get; private set; }
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
new file mode 100644
index 0000000000..7f69afaeeb
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -0,0 +1,160 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// Control that represents and displays a notification.
+ ///
+ public class NotificationCard : ContentControl
+ {
+ private bool _isClosed;
+ private bool _isClosing;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public NotificationCard()
+ {
+ this.GetObservable(IsClosedProperty)
+ .Subscribe(x =>
+ {
+ if (!IsClosing && !IsClosed)
+ {
+ return;
+ }
+
+ RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
+ });
+
+ this.GetObservable(ContentProperty)
+ .OfType()
+ .Subscribe(x =>
+ {
+ switch (x.Type)
+ {
+ case NotificationType.Error:
+ PseudoClasses.Add(":error");
+ break;
+
+ case NotificationType.Information:
+ PseudoClasses.Add(":information");
+ break;
+
+ case NotificationType.Success:
+ PseudoClasses.Add(":success");
+ break;
+
+ case NotificationType.Warning:
+ PseudoClasses.Add(":warning");
+ break;
+ }
+ });
+ }
+
+ ///
+ /// Determines if the notification is already closing.
+ ///
+ public bool IsClosing
+ {
+ get { return _isClosing; }
+ private set { SetAndRaise(IsClosingProperty, ref _isClosing, value); }
+ }
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly DirectProperty IsClosingProperty =
+ AvaloniaProperty.RegisterDirect(nameof(IsClosing), o => o.IsClosing);
+
+ ///
+ /// Determines if the notification is closed.
+ ///
+ public bool IsClosed
+ {
+ get { return _isClosed; }
+ set { SetAndRaise(IsClosedProperty, ref _isClosed, value); }
+ }
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly DirectProperty IsClosedProperty =
+ AvaloniaProperty.RegisterDirect(nameof(IsClosed), o => o.IsClosed, (o, v) => o.IsClosed = v);
+
+ ///
+ /// Defines the event.
+ ///
+ public static readonly RoutedEvent NotificationClosedEvent =
+ RoutedEvent.Register(nameof(NotificationClosed), RoutingStrategies.Bubble);
+
+
+ ///
+ /// Raised when the has closed.
+ ///
+ public event EventHandler NotificationClosed
+ {
+ add { AddHandler(NotificationClosedEvent, value); }
+ remove { RemoveHandler(NotificationClosedEvent, value); }
+ }
+
+ public static bool GetCloseOnClick(Button obj)
+ {
+ return (bool)obj.GetValue(CloseOnClickProperty);
+ }
+
+ public static void SetCloseOnClick(Button obj, bool value)
+ {
+ obj.SetValue(CloseOnClickProperty, value);
+ }
+
+ ///
+ /// Defines the CloseOnClick property.
+ ///
+ public static readonly AvaloniaProperty CloseOnClickProperty =
+ AvaloniaProperty.RegisterAttached("CloseOnClick", typeof(NotificationCard), validate: CloseOnClickChanged);
+
+ private static bool CloseOnClickChanged(Button button, bool value)
+ {
+ if (value)
+ {
+ button.Click += Button_Click;
+ }
+ else
+ {
+ button.Click -= Button_Click;
+ }
+
+ return true;
+ }
+
+ ///
+ /// Called when a button inside the Notification is clicked.
+ ///
+ private static void Button_Click(object sender, RoutedEventArgs e)
+ {
+ var btn = sender as ILogical;
+ var notification = btn.GetLogicalAncestors().OfType().FirstOrDefault();
+ notification?.Close();
+ }
+
+ ///
+ /// Closes the .
+ ///
+ public void Close()
+ {
+ if (IsClosing)
+ {
+ return;
+ }
+
+ IsClosing = true;
+ }
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationPosition.cs b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
new file mode 100644
index 0000000000..ef1d5e53d6
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
@@ -0,0 +1,17 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// Describes the possible positions for s that are displayed by a
+ /// .
+ ///
+ public enum NotificationPosition
+ {
+ TopLeft,
+ TopRight,
+ BottomLeft,
+ BottomRight
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationType.cs b/src/Avalonia.Controls/Notifications/NotificationType.cs
new file mode 100644
index 0000000000..fdcf5eec0a
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationType.cs
@@ -0,0 +1,16 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// Enumeration of types for .
+ ///
+ public enum NotificationType
+ {
+ Information,
+ Success,
+ Warning,
+ Error
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
new file mode 100644
index 0000000000..768d87c63e
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
@@ -0,0 +1,64 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Linq;
+using Avalonia.Layout;
+
+namespace Avalonia.Controls
+{
+ ///
+ /// Implements a where the flow direction of its items can be reversed.
+ ///
+ public class ReversibleStackPanel : StackPanel
+ {
+ ///
+ /// Defines the property.
+ ///
+ public static readonly StyledProperty ReverseOrderProperty =
+ AvaloniaProperty.Register(nameof(ReverseOrder));
+
+ ///
+ /// Gets or sets if the child controls will be layed out in reverse order.
+ ///
+ public bool ReverseOrder
+ {
+ get => GetValue(ReverseOrderProperty);
+ set => SetValue(ReverseOrderProperty, value);
+ }
+
+ ///
+ protected override Size ArrangeOverride(Size finalSize)
+ {
+ var orientation = Orientation;
+ var spacing = Spacing;
+ var finalRect = new Rect(finalSize);
+ var pos = 0.0;
+
+ var children = ReverseOrder ? Children.Reverse() : Children;
+
+ foreach (Control child in children)
+ {
+ double childWidth = child.DesiredSize.Width;
+ double childHeight = child.DesiredSize.Height;
+
+ if (orientation == Orientation.Vertical)
+ {
+ var rect = new Rect(0, pos, childWidth, childHeight)
+ .Align(finalRect, child.HorizontalAlignment, VerticalAlignment.Top);
+ ArrangeChild(child, rect, finalSize, orientation);
+ pos += childHeight + spacing;
+ }
+ else
+ {
+ var rect = new Rect(pos, 0, childWidth, childHeight)
+ .Align(finalRect, HorizontalAlignment.Left, child.VerticalAlignment);
+ ArrangeChild(child, rect, finalSize, orientation);
+ pos += childWidth + spacing;
+ }
+ }
+
+ return finalSize;
+ }
+ }
+}
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
new file mode 100644
index 0000000000..93873cbf7d
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -0,0 +1,163 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls.Primitives;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Controls.Notifications
+{
+ ///
+ /// An that displays notifications in a .
+ ///
+ public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
+ {
+ private IList _items;
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly StyledProperty PositionProperty =
+ AvaloniaProperty.Register(nameof(Position), NotificationPosition.TopRight);
+
+ ///
+ /// Defines which corner of the screen notifications can be displayed in.
+ ///
+ ///
+ public NotificationPosition Position
+ {
+ get { return GetValue(PositionProperty); }
+ set { SetValue(PositionProperty, value); }
+ }
+
+ ///
+ /// Defines the property.
+ ///
+ public static readonly StyledProperty MaxItemsProperty =
+ AvaloniaProperty.Register(nameof(MaxItems), 5);
+
+ ///
+ /// Defines the maximum number of notifications visible at once.
+ ///
+ public int MaxItems
+ {
+ get { return GetValue(MaxItemsProperty); }
+ set { SetValue(MaxItemsProperty, value); }
+ }
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The window that will host the control.
+ public WindowNotificationManager(Window host)
+ {
+ if (VisualChildren.Count != 0)
+ {
+ Install(host);
+ }
+ else
+ {
+ Observable.FromEventPattern(host, nameof(host.TemplateApplied)).Take(1)
+ .Subscribe(_ =>
+ {
+ Install(host);
+ });
+ }
+ }
+
+ static WindowNotificationManager()
+ {
+ PseudoClass(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
+ PseudoClass(PositionProperty, x => x == NotificationPosition.TopRight, ":topright");
+ PseudoClass(PositionProperty, x => x == NotificationPosition.BottomLeft, ":bottomleft");
+ PseudoClass(PositionProperty, x => x == NotificationPosition.BottomRight, ":bottomright");
+
+ HorizontalAlignmentProperty.OverrideDefaultValue(Layout.HorizontalAlignment.Stretch);
+ VerticalAlignmentProperty.OverrideDefaultValue(Layout.VerticalAlignment.Stretch);
+ }
+
+ ///
+ protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+ {
+ base.OnTemplateApplied(e);
+
+ var itemsControl = e.NameScope.Find("PART_Items");
+ _items = itemsControl?.Children;
+ }
+
+ ///
+ public void Show(INotification content)
+ {
+ Show(content as object);
+ }
+
+ ///
+ public async void Show(object content)
+ {
+ var notification = content as INotification;
+
+ var notificationControl = new NotificationCard
+ {
+ Content = content
+ };
+
+ if (notification != null)
+ {
+ notificationControl.NotificationClosed += (sender, args) =>
+ {
+ notification.OnClose?.Invoke();
+
+ _items.Remove(sender);
+ };
+ }
+
+ notificationControl.PointerPressed += (sender, args) =>
+ {
+ if (notification != null && notification.OnClick != null)
+ {
+ notification.OnClick.Invoke();
+ }
+
+ (sender as NotificationCard)?.Close();
+ };
+
+ _items.Add(notificationControl);
+
+ if (_items.OfType().Count(i => !i.IsClosing) > MaxItems)
+ {
+ _items.OfType().First(i => !i.IsClosing).Close();
+ }
+
+ if (notification != null && notification.Expiration == TimeSpan.Zero)
+ {
+ return;
+ }
+
+ await Task.Delay(notification?.Expiration ?? TimeSpan.FromSeconds(5));
+
+ notificationControl.Close();
+ }
+
+ ///
+ /// Installs the within the
+ /// of the host .
+ ///
+ /// The that will be the host.
+ private void Install(Window host)
+ {
+ var adornerLayer = host.GetVisualDescendants()
+ .OfType()
+ .FirstOrDefault()
+ ?.AdornerLayer;
+
+ if (adornerLayer != null)
+ {
+ adornerLayer.Children.Add(this);
+ }
+ }
+ }
+}
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index 942104d61b..73854b9f60 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -336,7 +336,18 @@ namespace Avalonia.Controls.Platform
if (e.MouseButton == MouseButton.Left && item?.HasSubMenu == true)
{
- Open(item, false);
+ if (item.IsSubMenuOpen)
+ {
+ if (item.IsTopLevel)
+ {
+ CloseMenu(item);
+ }
+ }
+ else
+ {
+ Open(item, false);
+ }
+
e.Handled = true;
}
}
diff --git a/src/Avalonia.Controls/Platform/InProcessDragSource.cs b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
index f8ae9f4249..0918da1a90 100644
--- a/src/Avalonia.Controls/Platform/InProcessDragSource.cs
+++ b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
@@ -147,7 +147,10 @@ namespace Avalonia.Platform
e.Handled = true;
}
else if (e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl || e.Key == Key.LeftAlt || e.Key == Key.RightAlt)
- RaiseEventAndUpdateCursor(RawDragEventType.DragOver, _lastRoot, _lastPosition, e.Modifiers);
+ {
+ if (_lastRoot != null)
+ RaiseEventAndUpdateCursor(RawDragEventType.DragOver, _lastRoot, _lastPosition, e.Modifiers);
+ }
}
private void ProcessMouseEvents(RawMouseEventArgs e)
diff --git a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
index ba2c7c91d8..a3123cf8c6 100644
--- a/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/CarouselPresenter.cs
@@ -38,7 +38,6 @@ namespace Avalonia.Controls.Presenters
Carousel.PageTransitionProperty.AddOwner();
private int _selectedIndex = -1;
- // private Task _current;
private Task _currentTransition;
private int _queuedTransitionIndex = -1;
@@ -47,6 +46,7 @@ namespace Avalonia.Controls.Presenters
///
static CarouselPresenter()
{
+ IsVirtualizedProperty.Changed.AddClassHandler(x => x.IsVirtualizedChanged);
SelectedIndexProperty.Changed.AddClassHandler(x => x.SelectedIndexChanged);
}
@@ -94,58 +94,67 @@ namespace Avalonia.Controls.Presenters
set { SetValue(PageTransitionProperty, value); }
}
- ///
- protected override void PanelCreated(IPanel panel)
- {
-#pragma warning disable 4014
- MoveToPage(-1, SelectedIndex);
-#pragma warning restore 4014
- }
-
///
protected override void ItemsChanged(NotifyCollectionChangedEventArgs e)
{
- switch (e.Action)
+ if (!IsVirtualized)
{
- case NotifyCollectionChangedAction.Remove:
- if (!IsVirtualized)
- {
- var generator = ItemContainerGenerator;
- var containers = generator.RemoveRange(e.OldStartingIndex, e.OldItems.Count);
- Panel.Children.RemoveAll(containers.Select(x => x.ContainerControl));
+ base.ItemsChanged(e);
-#pragma warning disable 4014
- MoveToPage(-1, SelectedIndex);
-#pragma warning restore 4014
- }
- break;
-
- case NotifyCollectionChangedAction.Reset:
- {
- var generator = ItemContainerGenerator;
- var containers = generator.Containers.ToList();
- generator.Clear();
- Panel.Children.RemoveAll(containers.Select(x => x.ContainerControl));
-
-#pragma warning disable 4014
- var newIndex = SelectedIndex;
+ if (Items == null || SelectedIndex >= Items.Count())
+ {
+ SelectedIndex = Items.Count() - 1;
+ }
- if(SelectedIndex < 0)
+ foreach (var c in ItemContainerGenerator.Containers)
+ {
+ c.ContainerControl.IsVisible = c.Index == SelectedIndex;
+ }
+ }
+ else if (SelectedIndex != -1 && Panel != null)
+ {
+ switch (e.Action)
+ {
+ case NotifyCollectionChangedAction.Add:
+ if (e.NewStartingIndex > SelectedIndex)
{
- if(Items != null && Items.Count() > 0)
- {
- newIndex = 0;
- }
- else
- {
- newIndex = -1;
- }
+ return;
}
-
- MoveToPage(-1, newIndex);
-#pragma warning restore 4014
- }
- break;
+ break;
+ case NotifyCollectionChangedAction.Remove:
+ if (e.OldStartingIndex > SelectedIndex)
+ {
+ return;
+ }
+ break;
+ case NotifyCollectionChangedAction.Replace:
+ if (e.OldStartingIndex > SelectedIndex ||
+ e.OldStartingIndex + e.OldItems.Count - 1 < SelectedIndex)
+ {
+ return;
+ }
+ break;
+ case NotifyCollectionChangedAction.Move:
+ if (e.OldStartingIndex > SelectedIndex &&
+ e.NewStartingIndex > SelectedIndex)
+ {
+ return;
+ }
+ break;
+ }
+
+ if (Items == null || SelectedIndex >= Items.Count())
+ {
+ SelectedIndex = Items.Count() - 1;
+ }
+
+ Panel.Children.Clear();
+ ItemContainerGenerator.Clear();
+
+ if (SelectedIndex != -1)
+ {
+ GetOrCreateContainer(SelectedIndex);
+ }
}
}
@@ -201,7 +210,7 @@ namespace Avalonia.Controls.Presenters
{
var container = ItemContainerGenerator.ContainerFromIndex(index);
- if (container == null)
+ if (container == null && IsVirtualized)
{
var item = Items.Cast
/// A description of the change.
- protected abstract void ItemsChanged(NotifyCollectionChangedEventArgs e);
+ ///
+ /// The panel is guaranteed to be created when this method is called.
+ ///
+ protected virtual void ItemsChanged(NotifyCollectionChangedEventArgs e)
+ {
+ ItemContainerSync.ItemsChanged(this, Items, e);
+ }
///
/// Creates the when is called for the first
diff --git a/src/Avalonia.Controls/Primitives/AdornerDecorator.cs b/src/Avalonia.Controls/Primitives/AdornerDecorator.cs
index 87082fd02c..4608d64806 100644
--- a/src/Avalonia.Controls/Primitives/AdornerDecorator.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerDecorator.cs
@@ -1,6 +1,8 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using Avalonia.LogicalTree;
+
namespace Avalonia.Controls.Primitives
{
public class AdornerDecorator : Decorator
@@ -13,6 +15,13 @@ namespace Avalonia.Controls.Primitives
VisualChildren.Add(AdornerLayer);
}
+ protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+ {
+ base.OnAttachedToLogicalTree(e);
+
+ ((ILogical)AdornerLayer).NotifyAttachedToLogicalTree(e);
+ }
+
public AdornerLayer AdornerLayer
{
get;
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index ed590679cd..d198570909 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -4,14 +4,14 @@
using System;
using System.Collections.Specialized;
using System.Linq;
-using Avalonia.VisualTree;
using Avalonia.Media;
using Avalonia.Rendering;
+using Avalonia.VisualTree;
namespace Avalonia.Controls.Primitives
{
// TODO: Need to track position of adorned elements and move the adorner if they move.
- public class AdornerLayer : Panel, ICustomSimpleHitTest
+ public class AdornerLayer : Canvas, ICustomSimpleHitTest
{
public static readonly AttachedProperty AdornedElementProperty =
AvaloniaProperty.RegisterAttached("AdornedElement");
@@ -64,7 +64,7 @@ namespace Avalonia.Controls.Primitives
}
else
{
- child.Arrange(new Rect(child.DesiredSize));
+ child.Arrange(new Rect(finalSize));
}
}
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 288d751aa9..dcde8117f6 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -325,14 +325,19 @@ namespace Avalonia.Controls.Primitives
if (_updateCount == 0)
{
+ var newIndex = -1;
+
if (SelectedIndex != -1)
{
- SelectedIndex = IndexOf((IEnumerable)e.NewValue, SelectedItem);
+ newIndex = IndexOf((IEnumerable)e.NewValue, SelectedItem);
}
- else if (AlwaysSelected && Items != null && Items.Cast
/// The dialog result.
///
- /// When the window is shown with the method, the
+ /// When the window is shown with the
+ /// or method, the
/// resulting task will produce the value when the window
/// is closed.
///
@@ -370,8 +371,16 @@ namespace Avalonia.Controls
///
/// Shows the window.
///
+ ///
+ /// The window has already been closed.
+ ///
public override void Show()
{
+ if (PlatformImpl == null)
+ {
+ throw new InvalidOperationException("Cannot re-show a closed window.");
+ }
+
if (IsVisible)
{
return;
@@ -396,6 +405,9 @@ namespace Avalonia.Controls
/// Shows the window as a dialog.
///
/// The dialog's owner window.
+ ///
+ /// The window has already been closed.
+ ///
///
/// A task that can be used to track the lifetime of the dialog.
///
@@ -428,7 +440,7 @@ namespace Avalonia.Controls
///
public Task ShowDialog(IWindowImpl owner)
{
- if(owner == null)
+ if (owner == null)
throw new ArgumentNullException(nameof(owner));
if (IsVisible)
diff --git a/src/Avalonia.Controls/WindowCollection.cs b/src/Avalonia.Controls/WindowCollection.cs
index df79c3e3c8..328bb9f147 100644
--- a/src/Avalonia.Controls/WindowCollection.cs
+++ b/src/Avalonia.Controls/WindowCollection.cs
@@ -107,24 +107,24 @@ namespace Avalonia
return;
}
- if (_application.IsExiting)
+ if (_application.IsShuttingDown)
{
return;
}
- switch (_application.ExitMode)
+ switch (_application.ShutdownMode)
{
- case ExitMode.OnLastWindowClose:
+ case ShutdownMode.OnLastWindowClose:
if (Count == 0)
{
- _application.Exit();
+ _application.Shutdown();
}
break;
- case ExitMode.OnMainWindowClose:
+ case ShutdownMode.OnMainWindowClose:
if (window == _application.MainWindow)
{
- _application.Exit();
+ _application.Shutdown();
}
break;
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index 67a93f3c9c..801ed74ca0 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Net;
using System.Reflection;
+using System.Xml;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Remote.Protocol;
@@ -206,7 +207,8 @@ namespace Avalonia.DesignerSupport.Remote
catch (Exception e)
{
var xamlException = e as XamlException;
-
+ var xmlException = e as XmlException;
+
s_transport.Send(new UpdateXamlResultMessage
{
Error = e.ToString(),
@@ -214,8 +216,8 @@ namespace Avalonia.DesignerSupport.Remote
{
ExceptionType = e.GetType().FullName,
Message = e.Message.ToString(),
- LineNumber = xamlException?.LineNumber,
- LinePosition = xamlException?.LinePosition,
+ LineNumber = xamlException?.LineNumber ?? xmlException?.LineNumber,
+ LinePosition = xamlException?.LinePosition ?? xmlException?.LinePosition,
}
});
}
diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index 7f0ad5e0ca..7d0686a33f 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -17,4 +17,5 @@
+
diff --git a/src/Avalonia.Diagnostics/DevTools.xaml b/src/Avalonia.Diagnostics/DevTools.xaml
index a3b12f0ec5..0f55d42e33 100644
--- a/src/Avalonia.Diagnostics/DevTools.xaml
+++ b/src/Avalonia.Diagnostics/DevTools.xaml
@@ -1,4 +1,6 @@
-
+
diff --git a/src/Avalonia.Diagnostics/DevTools.xaml.cs b/src/Avalonia.Diagnostics/DevTools.xaml.cs
index d084ec3014..e0bacf326b 100644
--- a/src/Avalonia.Diagnostics/DevTools.xaml.cs
+++ b/src/Avalonia.Diagnostics/DevTools.xaml.cs
@@ -43,6 +43,12 @@ namespace Avalonia.Diagnostics
.Subscribe(RawKeyDown);
}
+ // HACK: needed for XAMLIL, will fix that later
+ public DevTools()
+ {
+
+ }
+
public IControl Root { get; }
public static IDisposable Attach(TopLevel control)
diff --git a/src/Avalonia.Diagnostics/Views/EventsView.xaml b/src/Avalonia.Diagnostics/Views/EventsView.xaml
index a5be86b613..8d4d37f7b3 100644
--- a/src/Avalonia.Diagnostics/Views/EventsView.xaml
+++ b/src/Avalonia.Diagnostics/Views/EventsView.xaml
@@ -1,6 +1,7 @@
+ xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
+ x:Class="Avalonia.Diagnostics.Views.EventsView">
diff --git a/src/Avalonia.Diagnostics/Views/TreePageView.xaml b/src/Avalonia.Diagnostics/Views/TreePageView.xaml
index 57398851ad..e927bcdf29 100644
--- a/src/Avalonia.Diagnostics/Views/TreePageView.xaml
+++ b/src/Avalonia.Diagnostics/Views/TreePageView.xaml
@@ -1,5 +1,7 @@
+ xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:Class="Avalonia.Diagnostics.Views.TreePageView">
diff --git a/src/Avalonia.Layout/LayoutExtensions.cs b/src/Avalonia.Layout/LayoutExtensions.cs
new file mode 100644
index 0000000000..737bbb083c
--- /dev/null
+++ b/src/Avalonia.Layout/LayoutExtensions.cs
@@ -0,0 +1,62 @@
+using System;
+
+namespace Avalonia.Layout
+{
+ ///
+ /// Extension methods for layout types.
+ ///
+ public static class LayoutExtensions
+ {
+ ///
+ /// Aligns a rect in a constraining rect according to horizontal and vertical alignment
+ /// settings.
+ ///
+ /// The rect to align.
+ /// The constraining rect.
+ /// The horizontal alignment.
+ /// The vertical alignment.
+ ///
+ public static Rect Align(
+ this Rect rect,
+ Rect constraint,
+ HorizontalAlignment horizontalAlignment,
+ VerticalAlignment verticalAlignment)
+ {
+ switch (horizontalAlignment)
+ {
+ case HorizontalAlignment.Center:
+ rect = rect.WithX((constraint.Width - rect.Width) / 2);
+ break;
+ case HorizontalAlignment.Right:
+ rect = rect.WithX(constraint.Width - rect.Width);
+ break;
+ case HorizontalAlignment.Stretch:
+ rect = new Rect(
+ 0,
+ rect.Y,
+ Math.Max(constraint.Width, rect.Width),
+ rect.Height);
+ break;
+ }
+
+ switch (verticalAlignment)
+ {
+ case VerticalAlignment.Center:
+ rect = rect.WithY((constraint.Height - rect.Height) / 2);
+ break;
+ case VerticalAlignment.Bottom:
+ rect = rect.WithY(constraint.Height - rect.Height);
+ break;
+ case VerticalAlignment.Stretch:
+ rect = new Rect(
+ rect.X,
+ 0,
+ rect.Width,
+ Math.Max(constraint.Height, rect.Height));
+ break;
+ }
+
+ return rect;
+ }
+ }
+}
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
index d5e3a1631e..662f48ec44 100644
--- a/src/Avalonia.Layout/Layoutable.cs
+++ b/src/Avalonia.Layout/Layoutable.cs
@@ -314,7 +314,7 @@ namespace Avalonia.Layout
try
{
_measuring = true;
- desiredSize = MeasureCore(availableSize).Constrain(availableSize);
+ desiredSize = MeasureCore(availableSize);
}
finally
{
diff --git a/src/Avalonia.Logging.Serilog/SerilogExtensions.cs b/src/Avalonia.Logging.Serilog/SerilogExtensions.cs
index 7382421dc6..2ce38769da 100644
--- a/src/Avalonia.Logging.Serilog/SerilogExtensions.cs
+++ b/src/Avalonia.Logging.Serilog/SerilogExtensions.cs
@@ -1,5 +1,8 @@
-using Avalonia.Controls;
+using System;
+using Avalonia.Controls;
using Serilog;
+using Serilog.Configuration;
+using Serilog.Filters;
using SerilogLevel = Serilog.Events.LogEventLevel;
namespace Avalonia.Logging.Serilog
@@ -9,21 +12,67 @@ namespace Avalonia.Logging.Serilog
///
public static class SerilogExtensions
{
+ private const string DefaultTemplate = "[{Area}] {Message} ({SourceType} #{SourceHash})";
+
+ ///
+ /// Logs Avalonia events to the sink.
+ ///
+ /// The application class type.
+ /// The app builder instance.
+ /// The minimum level to log.
+ /// The app builder instance.
+ public static T LogToDebug(
+ this T builder,
+ LogEventLevel level = LogEventLevel.Warning)
+ where T : AppBuilderBase, new()
+ {
+ SerilogLogger.Initialize(new LoggerConfiguration()
+ .MinimumLevel.Is((SerilogLevel)level)
+ .Enrich.FromLogContext()
+ .WriteTo.Debug(outputTemplate: DefaultTemplate)
+ .CreateLogger());
+ return builder;
+ }
+
///
/// Logs Avalonia events to the sink.
///
/// The application class type.
/// The app builder instance.
+ /// The area to log. Valid values are listed in .
/// The minimum level to log.
/// The app builder instance.
public static T LogToDebug(
+ this T builder,
+ string area,
+ LogEventLevel level = LogEventLevel.Warning)
+ where T : AppBuilderBase, new()
+ {
+ SerilogLogger.Initialize(new LoggerConfiguration()
+ .MinimumLevel.Is((SerilogLevel)level)
+ .Filter.ByIncludingOnly(Matching.WithProperty("Area", area))
+ .Enrich.FromLogContext()
+ .WriteTo.Debug(outputTemplate: DefaultTemplate)
+ .CreateLogger());
+ return builder;
+ }
+
+ ///
+ /// Logs Avalonia events to the sink.
+ ///
+ /// The application class type.
+ /// The app builder instance.
+ /// The minimum level to log.
+ /// The app builder instance.
+ public static T LogToTrace(
this T builder,
LogEventLevel level = LogEventLevel.Warning)
where T : AppBuilderBase, new()
{
SerilogLogger.Initialize(new LoggerConfiguration()
.MinimumLevel.Is((SerilogLevel)level)
- .WriteTo.Debug(outputTemplate: "{Area}: {Message}")
+ .Enrich.FromLogContext()
+ .WriteTo.Trace(outputTemplate: DefaultTemplate)
.CreateLogger());
return builder;
}
@@ -33,16 +82,20 @@ namespace Avalonia.Logging.Serilog
///
/// The application class type.
/// The app builder instance.
+ /// The area to log. Valid values are listed in .
/// The minimum level to log.
/// The app builder instance.
public static T LogToTrace(
this T builder,
+ string area,
LogEventLevel level = LogEventLevel.Warning)
where T : AppBuilderBase, new()
{
SerilogLogger.Initialize(new LoggerConfiguration()
.MinimumLevel.Is((SerilogLevel)level)
- .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
+ .Filter.ByIncludingOnly(Matching.WithProperty("Area", area))
+ .Enrich.FromLogContext()
+ .WriteTo.Trace(outputTemplate: DefaultTemplate)
.CreateLogger());
return builder;
}
diff --git a/src/Avalonia.Logging.Serilog/SerilogLogger.cs b/src/Avalonia.Logging.Serilog/SerilogLogger.cs
index 99145d49e4..0534fe3012 100644
--- a/src/Avalonia.Logging.Serilog/SerilogLogger.cs
+++ b/src/Avalonia.Logging.Serilog/SerilogLogger.cs
@@ -1,8 +1,9 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
-using System.Collections.Generic;
+using System;
using Serilog;
+using Serilog.Context;
using AvaloniaLogEventLevel = Avalonia.Logging.LogEventLevel;
using SerilogLogEventLevel = Serilog.Events.LogEventLevel;
@@ -14,7 +15,6 @@ namespace Avalonia.Logging.Serilog
public class SerilogLogger : ILogSink
{
private readonly ILogger _output;
- private readonly Dictionary _areas = new Dictionary();
///
/// Initializes a new instance of the class.
@@ -36,21 +36,21 @@ namespace Avalonia.Logging.Serilog
///
public void Log(
- AvaloniaLogEventLevel level,
- string area,
- object source,
- string messageTemplate,
+ AvaloniaLogEventLevel level,
+ string area,
+ object source,
+ string messageTemplate,
params object[] propertyValues)
{
- ILogger areaLogger;
+ Contract.Requires(area != null);
+ Contract.Requires(messageTemplate != null);
- if (!_areas.TryGetValue(area, out areaLogger))
+ using (LogContext.PushProperty("Area", area))
+ using (LogContext.PushProperty("SourceType", source?.GetType()))
+ using (LogContext.PushProperty("SourceHash", source?.GetHashCode()))
{
- areaLogger = _output.ForContext("Area", area);
- _areas.Add(area, areaLogger);
+ _output.Write((SerilogLogEventLevel)level, messageTemplate, propertyValues);
}
-
- areaLogger.Write((SerilogLogEventLevel)level, messageTemplate, propertyValues);
}
}
}
diff --git a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
index d763febdf3..f67cb7f40a 100644
--- a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
+++ b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
@@ -6,10 +6,15 @@ using Avalonia.Threading;
using ReactiveUI;
using Splat;
-namespace Avalonia
+namespace Avalonia.ReactiveUI
{
public static class AppBuilderExtensions
{
+ ///
+ /// Initializes ReactiveUI framework to use with Avalonia. Registers Avalonia
+ /// scheduler and Avalonia activation for view fetcher. Always remember to
+ /// call this method if you are using ReactiveUI in your application.
+ ///
public static TAppBuilder UseReactiveUI(this TAppBuilder builder)
where TAppBuilder : AppBuilderBase, new()
{
diff --git a/src/Avalonia.ReactiveUI/Attributes.cs b/src/Avalonia.ReactiveUI/Attributes.cs
new file mode 100644
index 0000000000..e908d1de80
--- /dev/null
+++ b/src/Avalonia.ReactiveUI/Attributes.cs
@@ -0,0 +1,8 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("http://reactiveui.net", "Avalonia.ReactiveUI")]
\ No newline at end of file
diff --git a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
index e1db604e95..cfa7a270be 100644
--- a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
+++ b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
@@ -9,15 +9,24 @@ using Avalonia.VisualTree;
using Avalonia.Controls;
using ReactiveUI;
-namespace Avalonia
+namespace Avalonia.ReactiveUI
{
+ ///
+ /// Determines when Avalonia IVisuals get activated.
+ ///
public class AvaloniaActivationForViewFetcher : IActivationForViewFetcher
{
+ ///
+ /// Returns affinity for view.
+ ///
public int GetAffinityForView(Type view)
{
return typeof(IVisual).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ? 10 : 0;
}
+ ///
+ /// Returns activation observable for activatable Avalonia view.
+ ///
public IObservable GetActivationForView(IActivatable view)
{
if (!(view is IVisual visual)) return Observable.Return(false);
@@ -25,6 +34,9 @@ namespace Avalonia
return GetActivationForVisual(visual);
}
+ ///
+ /// Listens to Opened and Closed events for Avalonia windows.
+ ///
private IObservable GetActivationForWindowBase(WindowBase window)
{
var windowLoaded = Observable
@@ -42,6 +54,10 @@ namespace Avalonia
.DistinctUntilChanged();
}
+ ///
+ /// Listens to AttachedToVisualTree and DetachedFromVisualTree
+ /// events for Avalonia IVisuals.
+ ///
private IObservable GetActivationForVisual(IVisual visual)
{
var visualLoaded = Observable
diff --git a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
index 43e2ef93b6..010acc3ae0 100644
--- a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
+++ b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs
@@ -6,7 +6,7 @@ using Avalonia.VisualTree;
using Avalonia.Controls;
using ReactiveUI;
-namespace Avalonia
+namespace Avalonia.ReactiveUI
{
///
/// A ReactiveUI UserControl that implements
diff --git a/src/Avalonia.ReactiveUI/ReactiveWindow.cs b/src/Avalonia.ReactiveUI/ReactiveWindow.cs
index bb50a37764..f0f115afbc 100644
--- a/src/Avalonia.ReactiveUI/ReactiveWindow.cs
+++ b/src/Avalonia.ReactiveUI/ReactiveWindow.cs
@@ -6,7 +6,7 @@ using Avalonia.VisualTree;
using Avalonia.Controls;
using ReactiveUI;
-namespace Avalonia
+namespace Avalonia.ReactiveUI
{
///
/// A ReactiveUI Window that implements
diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
index e364d5de0b..4bd86a67c0 100644
--- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs
+++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
@@ -1,13 +1,17 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
using System;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using Avalonia.Animation;
using Avalonia.Controls;
using Avalonia.Styling;
+using Avalonia;
using ReactiveUI;
using Splat;
-namespace Avalonia
+namespace Avalonia.ReactiveUI
{
///
/// This control hosts the View associated with ReactiveUI RoutingState,
@@ -157,7 +161,7 @@ namespace Avalonia
return;
}
- var viewLocator = ViewLocator ?? ReactiveUI.ViewLocator.Current;
+ var viewLocator = ViewLocator ?? global::ReactiveUI.ViewLocator.Current;
var view = viewLocator.ResolveView(viewModel);
if (view == null) throw new Exception($"Couldn't find view for '{viewModel}'. Is it registered?");
diff --git a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
index 491e4d71a7..991a97a614 100644
--- a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
+++ b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
@@ -71,10 +71,11 @@ namespace Avalonia.Controls
{
Contract.Requires(control != null);
- return control.GetSelfAndLogicalAncestors()
+ var scope = control.GetSelfAndLogicalAncestors()
.OfType()
.Select(x => (x as INameScope) ?? NameScope.GetNameScope(x))
.FirstOrDefault(x => x != null);
+ return scope;
}
}
}
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
index e52a1961ba..d314a8d44e 100644
--- a/src/Avalonia.Styling/StyledElement.cs
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
+using System.ComponentModel;
using System.Linq;
using System.Reactive.Linq;
using System.Reactive.Subjects;
diff --git a/src/Avalonia.Styling/Styling/IRequiresTemplateInSetter.cs b/src/Avalonia.Styling/Styling/IRequiresTemplateInSetter.cs
deleted file mode 100644
index 2d562b78d9..0000000000
--- a/src/Avalonia.Styling/Styling/IRequiresTemplateInSetter.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Avalonia.Styling
-{
- ///
- /// This is an interface for advanced scenarios to assist users in correct style development.
- /// You as a user will not need to use this interface directly.
- ///
- public interface IRequiresTemplateInSetter
- {
- }
-}
diff --git a/src/Avalonia.Styling/Styling/ISetterValue.cs b/src/Avalonia.Styling/Styling/ISetterValue.cs
new file mode 100644
index 0000000000..63c544cf7d
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/ISetterValue.cs
@@ -0,0 +1,13 @@
+namespace Avalonia.Styling
+{
+ ///
+ /// Customizes the behavior of a class when added as a value to an .
+ ///
+ public interface ISetterValue
+ {
+ ///
+ /// Notifies that the object has been added as a setter value.
+ ///
+ void Initialize(ISetter setter);
+ }
+}
diff --git a/src/Avalonia.Styling/Styling/Selectors.cs b/src/Avalonia.Styling/Styling/Selectors.cs
index 3e7a30d389..323f53b85b 100644
--- a/src/Avalonia.Styling/Styling/Selectors.cs
+++ b/src/Avalonia.Styling/Styling/Selectors.cs
@@ -114,6 +114,17 @@ namespace Avalonia.Styling
{
return new NotSelector(previous, argument(null));
}
+
+ ///
+ /// Returns a selector which inverts the results of selector argument.
+ ///
+ /// The previous selector.
+ /// The selector to be not-ed.
+ /// The selector.
+ public static Selector Not(this Selector previous, Selector argument)
+ {
+ return new NotSelector(previous, argument);
+ }
///
/// Returns a selector which matches a type.
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index cfe17a4291..3702259f35 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -65,13 +65,7 @@ namespace Avalonia.Styling
set
{
- if (value is IRequiresTemplateInSetter)
- {
- throw new ArgumentException(
- "Cannot assign a control to Setter.Value. Wrap the control in a .",
- nameof(value));
- }
-
+ (value as ISetterValue)?.Initialize(this);
_value = value;
}
}
diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index e9d710b3f0..f84e09510b 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/ScrollBar.xaml
index 2cb8ce2d24..ca308b33c3 100644
--- a/src/Avalonia.Themes.Default/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Default/ScrollBar.xaml
@@ -30,13 +30,7 @@
Classes="repeattrack"
Focusable="False"/>
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
diff --git a/src/Avalonia.Themes.Default/TabItem.xaml b/src/Avalonia.Themes.Default/TabItem.xaml
index fcdb76524e..92482a564c 100644
--- a/src/Avalonia.Themes.Default/TabItem.xaml
+++ b/src/Avalonia.Themes.Default/TabItem.xaml
@@ -24,19 +24,19 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Visuals/Media/BrushExtensions.cs b/src/Avalonia.Visuals/Media/BrushExtensions.cs
index cd351071dd..522953eb04 100644
--- a/src/Avalonia.Visuals/Media/BrushExtensions.cs
+++ b/src/Avalonia.Visuals/Media/BrushExtensions.cs
@@ -34,16 +34,14 @@ namespace Avalonia.Media
{
Contract.Requires(pen != null);
- var brush = pen?.Brush?.ToImmutable();
- return pen == null || ReferenceEquals(pen?.Brush, brush) ?
+ var brush = pen.Brush?.ToImmutable();
+ return ReferenceEquals(pen.Brush, brush) ?
pen :
new Pen(
brush,
thickness: pen.Thickness,
- dashStyle: pen.DashStyle,
- dashCap: pen.DashCap,
- startLineCap: pen.StartLineCap,
- endLineCap: pen.EndLineCap,
+ dashStyle: pen.DashStyle,
+ lineCap: pen.LineCap,
lineJoin: pen.LineJoin,
miterLimit: pen.MiterLimit);
}
diff --git a/src/Avalonia.Visuals/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs
index fd593db991..d3af71ffcb 100644
--- a/src/Avalonia.Visuals/Media/DrawingContext.cs
+++ b/src/Avalonia.Visuals/Media/DrawingContext.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
+using Avalonia.Rendering.SceneGraph;
using Avalonia.Threading;
using Avalonia.Visuals.Media.Imaging;
@@ -131,6 +132,12 @@ namespace Avalonia.Media
}
}
+ ///
+ /// Draws a custom drawing operation
+ ///
+ /// custom operation
+ public void Custom(ICustomDrawOperation custom) => PlatformImpl.Custom(custom);
+
///
/// Draws text.
///
diff --git a/src/Avalonia.Visuals/Media/EllipseGeometry.cs b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
index ca84d4cc7b..c2df9db635 100644
--- a/src/Avalonia.Visuals/Media/EllipseGeometry.cs
+++ b/src/Avalonia.Visuals/Media/EllipseGeometry.cs
@@ -1,7 +1,6 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
-using System;
using Avalonia.Platform;
namespace Avalonia.Media
@@ -57,36 +56,8 @@ namespace Avalonia.Media
protected override IGeometryImpl CreateDefiningGeometry()
{
var factory = AvaloniaLocator.Current.GetService();
- var geometry = factory.CreateStreamGeometry();
- using (var ctx = geometry.Open())
- {
- var rect = Rect;
- double controlPointRatio = (Math.Sqrt(2) - 1) * 4 / 3;
- var center = rect.Center;
- var radius = new Vector(rect.Width / 2, rect.Height / 2);
-
- var x0 = center.X - radius.X;
- var x1 = center.X - (radius.X * controlPointRatio);
- var x2 = center.X;
- var x3 = center.X + (radius.X * controlPointRatio);
- var x4 = center.X + radius.X;
-
- var y0 = center.Y - radius.Y;
- var y1 = center.Y - (radius.Y * controlPointRatio);
- var y2 = center.Y;
- var y3 = center.Y + (radius.Y * controlPointRatio);
- var y4 = center.Y + radius.Y;
-
- ctx.BeginFigure(new Point(x2, y0), true);
- ctx.CubicBezierTo(new Point(x3, y0), new Point(x4, y1), new Point(x4, y2));
- ctx.CubicBezierTo(new Point(x4, y3), new Point(x3, y4), new Point(x2, y4));
- ctx.CubicBezierTo(new Point(x1, y4), new Point(x0, y3), new Point(x0, y2));
- ctx.CubicBezierTo(new Point(x0, y1), new Point(x1, y0), new Point(x2, y0));
- ctx.EndFigure(true);
- }
-
- return geometry;
+ return factory.CreateEllipseGeometry(Rect);
}
}
}
diff --git a/src/Avalonia.Visuals/Media/FontFamily.cs b/src/Avalonia.Visuals/Media/FontFamily.cs
index 5c152cd8a0..a486723d86 100644
--- a/src/Avalonia.Visuals/Media/FontFamily.cs
+++ b/src/Avalonia.Visuals/Media/FontFamily.cs
@@ -11,46 +11,49 @@ namespace Avalonia.Media
{
public class FontFamily
{
+ ///
///
/// Initializes a new instance of the class.
///
- /// The name of the .
- /// name
- public FontFamily(string name)
+ /// The name of the .
+ public FontFamily(string name) : this(null, name)
{
- Contract.Requires(name != null);
-
- FamilyNames = new FamilyNameCollection(new[] { name });
}
///
/// Initializes a new instance of the class.
///
- /// The names of the .
- /// name
- public FontFamily(IEnumerable names)
+ /// Specifies the base uri that is used to resolve font family assets.
+ /// The name of the .
+ /// Base uri must be an absolute uri.
+ public FontFamily(Uri baseUri, string name)
{
- Contract.Requires(names != null);
+ if (string.IsNullOrEmpty(name))
+ {
+ FamilyNames = new FamilyNameCollection(string.Empty);
- FamilyNames = new FamilyNameCollection(names);
- }
+ return;
+ }
- ///
- ///
- /// Initializes a new instance of the class.
- ///
- /// The name of the .
- /// The source of font resources.
- ///
- public FontFamily(string name, Uri source, Uri baseUri = null) : this(name)
- {
- Key = new FontFamilyKey(source, baseUri);
+ var fontFamilySegment = GetFontFamilyIdentifier(name);
+
+ if (fontFamilySegment.Source != null)
+ {
+ if (baseUri != null && !baseUri.IsAbsoluteUri)
+ {
+ throw new ArgumentException("Base uri must be an absolute uri.", nameof(baseUri));
+ }
+
+ Key = new FontFamilyKey(fontFamilySegment.Source, baseUri);
+ }
+
+ FamilyNames = new FamilyNameCollection(fontFamilySegment.Name);
}
///
/// Represents the default font family
///
- public static FontFamily Default => new FontFamily(String.Empty);
+ public static FontFamily Default => new FontFamily(string.Empty);
///
/// Represents all font families in the system. This can be an expensive call depending on platform implementation.
@@ -88,46 +91,40 @@ namespace Avalonia.Media
///
public static implicit operator FontFamily(string s)
{
- return Parse(s);
+ return new FontFamily(s);
}
- ///
- /// Parses a string.
- ///
- /// The string.
- ///
- ///
- ///
- /// Specified family is not supported.
- ///
- public static FontFamily Parse(string s, Uri baseUri = null)
+ private struct FontFamilyIdentifier
{
- if (string.IsNullOrEmpty(s))
+ public FontFamilyIdentifier(string name, Uri source)
{
- throw new ArgumentException("Specified family is not supported.");
+ Name = name;
+ Source = source;
}
- var segments = s.Split('#');
+ public string Name { get; }
+
+ public Uri Source { get; }
+ }
+
+ private static FontFamilyIdentifier GetFontFamilyIdentifier(string name)
+ {
+ var segments = name.Split('#');
switch (segments.Length)
{
case 1:
{
- var names = segments[0].Split(',')
- .Select(x => x.Trim())
- .Where(x => !string.IsNullOrWhiteSpace(x));
- return new FontFamily(names);
+ return new FontFamilyIdentifier(segments[0], null);
}
case 2:
{
- var uri = segments[0].StartsWith("/")
- ? new Uri(segments[0], UriKind.Relative)
- : new Uri(segments[0], UriKind.RelativeOrAbsolute);
+ var source = segments[0].StartsWith("/")
+ ? new Uri(segments[0], UriKind.Relative)
+ : new Uri(segments[0], UriKind.RelativeOrAbsolute);
- return uri.IsAbsoluteUri
- ? new FontFamily(segments[1], uri)
- : new FontFamily(segments[1], uri, baseUri);
+ return new FontFamilyIdentifier(segments[1], source);
}
default:
@@ -137,6 +134,25 @@ namespace Avalonia.Media
}
}
+ ///
+ /// Parses a string.
+ ///
+ /// The string.
+ /// Specifies the base uri that is used to resolve font family assets.
+ ///
+ ///
+ /// Specified family is not supported.
+ ///
+ public static FontFamily Parse(string s, Uri baseUri = null)
+ {
+ if (string.IsNullOrEmpty(s))
+ {
+ throw new ArgumentException("Specified family is not supported.", nameof(s));
+ }
+
+ return new FontFamily(baseUri, s);
+ }
+
///
/// Returns a that represents this instance.
///
diff --git a/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs b/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
index 50511d2fb7..acf0bbdb11 100644
--- a/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
+++ b/src/Avalonia.Visuals/Media/Fonts/FamilyNameCollection.cs
@@ -4,31 +4,28 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.Linq;
+using System.Text;
namespace Avalonia.Media.Fonts
{
- using System.Text;
-
public class FamilyNameCollection : IEnumerable
- {
+ {
///
/// Initializes a new instance of the class.
///
/// The family names.
/// familyNames
- public FamilyNameCollection(IEnumerable familyNames)
+ public FamilyNameCollection(string familyNames)
{
- Contract.Requires(familyNames != null);
-
- var names = new List(familyNames);
-
- if (names.Count == 0) throw new ArgumentException($"{nameof(familyNames)} must not be empty.");
+ if (familyNames == null)
+ {
+ throw new ArgumentNullException(nameof(familyNames));
+ }
- Names = new ReadOnlyCollection(names);
+ Names = familyNames.Split(',').Select(x => x.Trim()).ToArray();
- PrimaryFamilyName = Names.First();
+ PrimaryFamilyName = Names[0];
HasFallbacks = Names.Count > 1;
}
@@ -55,7 +52,7 @@ namespace Avalonia.Media.Fonts
///
/// The names.
///
- internal ReadOnlyCollection Names { get; }
+ internal IReadOnlyList Names { get; }
///
///
@@ -95,7 +92,10 @@ namespace Avalonia.Media.Fonts
{
builder.Append(Names[index]);
- if (index == Names.Count - 1) break;
+ if (index == Names.Count - 1)
+ {
+ break;
+ }
builder.Append(", ");
}
@@ -123,9 +123,12 @@ namespace Avalonia.Media.Fonts
///
public override bool Equals(object obj)
{
- if (!(obj is FamilyNameCollection other)) return false;
+ if (!(obj is FamilyNameCollection other))
+ {
+ return false;
+ }
return other.ToString().Equals(ToString());
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs b/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
index 76ee2b7aad..7733dd7d2a 100644
--- a/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
+++ b/src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
@@ -95,7 +95,7 @@ namespace Avalonia.Media.Fonts
{
if (!Source.IsAbsoluteUri && BaseUri != null)
{
- return BaseUri.Authority + Source;
+ return BaseUri.AbsoluteUri + Source.OriginalString;
}
return Source.ToString();
diff --git a/src/Avalonia.Visuals/Media/LineGeometry.cs b/src/Avalonia.Visuals/Media/LineGeometry.cs
index f7ba4ccb0e..90577dabd8 100644
--- a/src/Avalonia.Visuals/Media/LineGeometry.cs
+++ b/src/Avalonia.Visuals/Media/LineGeometry.cs
@@ -73,16 +73,8 @@ namespace Avalonia.Media
protected override IGeometryImpl CreateDefiningGeometry()
{
var factory = AvaloniaLocator.Current.GetService();
- var geometry = factory.CreateStreamGeometry();
- using (var context = geometry.Open())
- {
- context.BeginFigure(StartPoint, false);
- context.LineTo(EndPoint);
- context.EndFigure(false);
- }
-
- return geometry;
+ return factory.CreateLineGeometry(StartPoint, EndPoint);
}
}
}
diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs
index ddd8091801..ee427c913b 100644
--- a/src/Avalonia.Visuals/Media/Pen.cs
+++ b/src/Avalonia.Visuals/Media/Pen.cs
@@ -11,63 +11,45 @@ namespace Avalonia.Media
///
/// Initializes a new instance of the class.
///
- /// The brush used to draw.
+ /// The stroke color.
/// The stroke thickness.
/// The dash style.
- /// The dash cap.
- /// The start line cap.
- /// The end line cap.
+ /// Specifies the type of graphic shape to use on both ends of a line.
/// The line join.
/// The miter limit.
public Pen(
- IBrush brush,
+ uint color,
double thickness = 1.0,
- DashStyle dashStyle = null,
- PenLineCap dashCap = PenLineCap.Flat,
- PenLineCap startLineCap = PenLineCap.Flat,
- PenLineCap endLineCap = PenLineCap.Flat,
- PenLineJoin lineJoin = PenLineJoin.Miter,
- double miterLimit = 10.0)
+ DashStyle dashStyle = null,
+ PenLineCap lineCap = PenLineCap.Flat,
+ PenLineJoin lineJoin = PenLineJoin.Miter,
+ double miterLimit = 10.0) : this(new SolidColorBrush(color), thickness, dashStyle, lineCap, lineJoin, miterLimit)
{
- Brush = brush;
- Thickness = thickness;
- DashCap = dashCap;
- StartLineCap = startLineCap;
- EndLineCap = endLineCap;
- LineJoin = lineJoin;
- MiterLimit = miterLimit;
- DashStyle = dashStyle;
}
///
/// Initializes a new instance of the class.
///
- /// The stroke color.
+ /// The brush used to draw.
/// The stroke thickness.
/// The dash style.
- /// The dash cap.
- /// The start line cap.
- /// The end line cap.
+ /// The line cap.
/// The line join.
/// The miter limit.
public Pen(
- uint color,
+ IBrush brush,
double thickness = 1.0,
- DashStyle dashStyle = null,
- PenLineCap dashCap = PenLineCap.Flat,
- PenLineCap startLineCap = PenLineCap.Flat,
- PenLineCap endLineCap = PenLineCap.Flat,
- PenLineJoin lineJoin = PenLineJoin.Miter,
+ DashStyle dashStyle = null,
+ PenLineCap lineCap = PenLineCap.Flat,
+ PenLineJoin lineJoin = PenLineJoin.Miter,
double miterLimit = 10.0)
{
- Brush = new SolidColorBrush(color);
+ Brush = brush;
Thickness = thickness;
- StartLineCap = startLineCap;
- EndLineCap = endLineCap;
+ LineCap = lineCap;
LineJoin = lineJoin;
MiterLimit = miterLimit;
DashStyle = dashStyle;
- DashCap = dashCap;
}
///
@@ -78,18 +60,26 @@ namespace Avalonia.Media
///
/// Gets the stroke thickness.
///
- public double Thickness { get; } = 1.0;
+ public double Thickness { get; }
+ ///
+ /// Specifies the style of dashed lines drawn with a object.
+ ///
public DashStyle DashStyle { get; }
- public PenLineCap DashCap { get; }
-
- public PenLineCap StartLineCap { get; } = PenLineCap.Flat;
-
- public PenLineCap EndLineCap { get; } = PenLineCap.Flat;
+ ///
+ /// Specifies the type of graphic shape to use on both ends of a line.
+ ///
+ public PenLineCap LineCap { get; }
- public PenLineJoin LineJoin { get; } = PenLineJoin.Miter;
+ ///
+ /// Specifies how to join consecutive line or curve segments in a (subpath) contained in a object.
+ ///
+ public PenLineJoin LineJoin { get; }
- public double MiterLimit { get; } = 10.0;
+ ///
+ /// The limit on the ratio of the miter length to half this pen's Thickness.
+ ///
+ public double MiterLimit { get; }
}
}
diff --git a/src/Avalonia.Visuals/Media/PenLineCap.cs b/src/Avalonia.Visuals/Media/PenLineCap.cs
index 56c5c040eb..83d8f11613 100644
--- a/src/Avalonia.Visuals/Media/PenLineCap.cs
+++ b/src/Avalonia.Visuals/Media/PenLineCap.cs
@@ -4,7 +4,6 @@ namespace Avalonia.Media
{
Flat,
Round,
- Square,
- Triangle
+ Square
}
}
diff --git a/src/Avalonia.Visuals/Media/RectangleGeometry.cs b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
index 3ccfd80f93..9250500644 100644
--- a/src/Avalonia.Visuals/Media/RectangleGeometry.cs
+++ b/src/Avalonia.Visuals/Media/RectangleGeometry.cs
@@ -16,12 +16,6 @@ namespace Avalonia.Media
public static readonly StyledProperty RectProperty =
AvaloniaProperty.Register(nameof(Rect));
- public Rect Rect
- {
- get => GetValue(RectProperty);
- set => SetValue(RectProperty, value);
- }
-
static RectangleGeometry()
{
AffectsGeometry(RectProperty);
@@ -43,25 +37,23 @@ namespace Avalonia.Media
Rect = rect;
}
+ ///
+ /// Gets or sets the bounds of the rectangle.
+ ///
+ public Rect Rect
+ {
+ get => GetValue(RectProperty);
+ set => SetValue(RectProperty, value);
+ }
+
///
public override Geometry Clone() => new RectangleGeometry(Rect);
protected override IGeometryImpl CreateDefiningGeometry()
{
var factory = AvaloniaLocator.Current.GetService();
- var geometry = factory.CreateStreamGeometry();
-
- using (var context = geometry.Open())
- {
- var rect = Rect;
- context.BeginFigure(rect.TopLeft, true);
- context.LineTo(rect.TopRight);
- context.LineTo(rect.BottomRight);
- context.LineTo(rect.BottomLeft);
- context.EndFigure(true);
- }
- return geometry;
+ return factory.CreateRectangleGeometry(Rect);
}
}
}
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index 57b974f900..e5be04ebf9 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -3,6 +3,7 @@
using System;
using Avalonia.Media;
+using Avalonia.Rendering.SceneGraph;
using Avalonia.Utilities;
using Avalonia.Visuals.Media.Imaging;
@@ -139,5 +140,11 @@ namespace Avalonia.Platform
/// Pops the latest pushed geometry clip.
///
void PopGeometryClip();
+
+ ///
+ /// Adds a custom draw operation
+ ///
+ /// Custom draw operation
+ void Custom(ICustomDrawOperation custom);
}
}
diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
index 3a1f79e32a..87db9251e1 100644
--- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
@@ -36,6 +36,28 @@ namespace Avalonia.Platform
Size constraint,
IReadOnlyList spans);
+ ///
+ /// Creates an ellipse geometry implementation.
+ ///
+ /// The bounds of the ellipse.
+ /// An ellipse geometry..
+ IGeometryImpl CreateEllipseGeometry(Rect rect);
+
+ ///
+ /// Creates a line geometry implementation.
+ ///
+ /// The start of the line.
+ /// The end of the line.
+ /// A line geometry.
+ IGeometryImpl CreateLineGeometry(Point p1, Point p2);
+
+ ///
+ /// Creates a rectangle geometry implementation.
+ ///
+ /// The bounds of the rectangle.
+ /// A rectangle.
+ IGeometryImpl CreateRectangleGeometry(Rect rect);
+
///
/// Creates a stream geometry implementation.
///
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 5293e1b978..5d1c66f872 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Threading;
using Avalonia.Media;
using Avalonia.Media.Immutable;
using Avalonia.Platform;
@@ -13,7 +12,6 @@ using Avalonia.Rendering.SceneGraph;
using Avalonia.Threading;
using Avalonia.Utilities;
using Avalonia.VisualTree;
-using System.Threading.Tasks;
namespace Avalonia.Rendering
{
@@ -33,7 +31,6 @@ namespace Avalonia.Rendering
private volatile IRef _scene;
private DirtyVisuals _dirty;
private IRef _overlay;
- private object _rendering = new object();
private int _lastSceneId = -1;
private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects();
private IRef _currentDraw;
@@ -267,7 +264,7 @@ namespace Avalonia.Rendering
RenderOverlay(scene.Item, GetContext());
if (updated || forceComposite || overlay)
RenderComposite(scene.Item, GetContext());
- }
+ }
}
}
finally
@@ -321,15 +318,15 @@ namespace Avalonia.Rendering
var (rs, _) = UpdateRenderLayersAndConsumeSceneIfNeeded(contextFactory, true);
return (rs, true);
}
-
+
// Indicate that we have updated the layers
return (sceneRef.Clone(), true);
}
-
+
// Just return scene, layers weren't updated
return (sceneRef.Clone(), false);
}
-
+
}
@@ -456,7 +453,7 @@ namespace Avalonia.Rendering
private void RenderComposite(Scene scene, IDrawingContextImpl context)
{
context.Clear(Colors.Transparent);
-
+
var clientRect = new Rect(scene.Size);
foreach (var layer in scene.Layers)
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
new file mode 100644
index 0000000000..68e2237430
--- /dev/null
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
@@ -0,0 +1,39 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.SceneGraph
+{
+ internal sealed class CustomDrawOperation : DrawOperation
+ {
+ public Matrix Transform { get; }
+ public ICustomDrawOperation Custom { get; }
+ public CustomDrawOperation(ICustomDrawOperation custom, Matrix transform)
+ : base(custom.Bounds, transform, null)
+ {
+ Transform = transform;
+ Custom = custom;
+ }
+
+ public override bool HitTest(Point p)
+ {
+ return Custom.HitTest(p * Transform);
+ }
+
+ public override void Render(IDrawingContextImpl context)
+ {
+ context.Transform = Transform;
+ Custom.Render(context);
+ }
+
+ public override void Dispose() => Custom.Dispose();
+
+ public bool Equals(Matrix transform, ICustomDrawOperation custom) =>
+ Transform == transform && Custom?.Equals(custom) == true;
+ }
+
+ public interface ICustomDrawOperation : IDrawOperation, IEquatable
+ {
+
+ }
+}
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index dfed0d911c..0b33851911 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -165,6 +165,15 @@ namespace Avalonia.Rendering.SceneGraph
++_drawOperationindex;
}
}
+
+ public void Custom(ICustomDrawOperation custom)
+ {
+ var next = NextDrawAs();
+ if (next == null || !next.Item.Equals(Transform, custom))
+ Add(new CustomDrawOperation(custom, Transform));
+ else
+ ++_drawOperationindex;
+ }
///
public void DrawText(IBrush foreground, Point origin, IFormattedTextImpl text)
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
index cc7da96ee8..d294f111ad 100644
--- a/src/Avalonia.Visuals/Visual.cs
+++ b/src/Avalonia.Visuals/Visual.cs
@@ -10,6 +10,7 @@ using Avalonia.Data;
using Avalonia.Logging;
using Avalonia.LogicalTree;
using Avalonia.Media;
+using Avalonia.Metadata;
using Avalonia.Rendering;
using Avalonia.Utilities;
using Avalonia.VisualTree;
@@ -25,6 +26,7 @@ namespace Avalonia
/// to render the control. To traverse the visual tree, use the
/// extension methods defined in .
///
+ [UsableDuringInitialization]
public class Visual : StyledElement, IVisual
{
///
diff --git a/src/Avalonia.X11/XIStructs.cs b/src/Avalonia.X11/XIStructs.cs
index 772bd1989c..ef49a72c43 100644
--- a/src/Avalonia.X11/XIStructs.cs
+++ b/src/Avalonia.X11/XIStructs.cs
@@ -197,7 +197,7 @@ namespace Avalonia.X11
unsafe struct XIDeviceChangedEvent
{
public int Type; /* GenericEvent */
- public ulong Serial; /* # of last request processed by server */
+ public UIntPtr Serial; /* # of last request processed by server */
public Bool SendEvent; /* true if this came from a SendEvent request */
public IntPtr Display; /* Display the event was read from */
public int Extension; /* XI extension offset */
@@ -214,7 +214,7 @@ namespace Avalonia.X11
struct XIDeviceEvent
{
public XEventName type; /* GenericEvent */
- public ulong serial; /* # of last request processed by server */
+ public UIntPtr serial; /* # of last request processed by server */
public Bool send_event; /* true if this came from a SendEvent request */
public IntPtr display; /* Display the event was read from */
public int extension; /* XI extension offset */
@@ -241,7 +241,7 @@ namespace Avalonia.X11
unsafe struct XIEvent
{
public int type; /* GenericEvent */
- public ulong serial; /* # of last request processed by server */
+ public UIntPtr serial; /* # of last request processed by server */
public Bool send_event; /* true if this came from a SendEvent request */
public IntPtr display; /* Display the event was read from */
public int extension; /* XI extension offset */
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 3c1ef84c54..8ce29e5b8e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -1,7 +1,9 @@
netstandard2.0
- PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER
+ PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER;XAMLIL_INTERNAL
+ false
+ $(DefineConstants);RUNTIME_XAML_CECILFalsefalseCS1591
@@ -16,6 +18,7 @@
+
@@ -51,8 +54,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -64,6 +92,8 @@
+
+
diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs
index be92b6a8d7..f967bdf0af 100644
--- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs
@@ -30,6 +30,7 @@ namespace Avalonia.Markup.Xaml
///
public static class AvaloniaTypeConverters
{
+ // When adding item to that list make sure to modify AvaloniaXamlIlLanguage
private static Dictionary _converters = new Dictionary()
{
{ typeof(AvaloniaList<>), typeof(AvaloniaListConverter<>) },
diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
index a1f8bf6cf6..45424e67bb 100644
--- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
@@ -10,6 +10,7 @@ using System.Reflection;
using System.Runtime.Serialization;
using System.Text;
using System.Xml.Linq;
+using Avalonia.Markup.Xaml.XamlIl;
using Avalonia.Controls;
using Avalonia.Markup.Data;
using Avalonia.Markup.Xaml.PortableXaml;
@@ -25,6 +26,8 @@ namespace Avalonia.Markup.Xaml
{
public bool IsDesignMode { get; set; }
+ public static bool UseLegacyXamlLoader { get; set; } = false;
+
///
/// Initializes a new instance of the class.
///
@@ -65,8 +68,8 @@ namespace Avalonia.Markup.Xaml
{
throw new InvalidOperationException(
"Could not create IAssetLoader : maybe Application.RegisterServices() wasn't called?");
- }
-
+ }
+
foreach (var uri in GetUrisFor(assetLocator, type))
{
if (assetLocator.Exists(uri))
@@ -113,21 +116,27 @@ namespace Avalonia.Markup.Xaml
"Could not create IAssetLoader : maybe Application.RegisterServices() wasn't called?");
}
+ var compiledLoader = assetLocator.GetAssembly(uri, baseUri)
+ ?.GetType("CompiledAvaloniaXaml.!XamlLoader")
+ ?.GetMethod("TryLoad", new[] {typeof(string)});
+ if (compiledLoader != null)
+ {
+ var uriString = (!uri.IsAbsoluteUri && baseUri != null ? new Uri(baseUri, uri) : uri)
+ .ToString();
+ var compiledResult = compiledLoader.Invoke(null, new object[] {uriString});
+ if (compiledResult != null)
+ return compiledResult;
+ }
+
+
var asset = assetLocator.OpenAndGetAssembly(uri, baseUri);
using (var stream = asset.stream)
{
var absoluteUri = uri.IsAbsoluteUri ? uri : new Uri(baseUri, uri);
- try
- {
- return Load(stream, asset.assembly, rootInstance, absoluteUri);
- }
- catch (Exception e)
- {
- throw new XamlLoadException("Error loading xaml at " + absoluteUri + ": " + e.Message, e);
- }
+ return Load(stream, asset.assembly, rootInstance, absoluteUri);
}
}
-
+
///
/// Loads XAML from a string.
///
@@ -159,10 +168,15 @@ namespace Avalonia.Markup.Xaml
/// The loaded object.
public object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null)
{
+ if (!UseLegacyXamlLoader)
+ return AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri, IsDesignMode);
+
+
var readerSettings = new XamlXmlReaderSettings()
{
BaseUri = uri,
- LocalAssembly = localAssembly
+ LocalAssembly = localAssembly,
+ ProvideLineInfo = true,
};
var context = IsDesignMode ? AvaloniaXamlSchemaContext.DesignInstance : AvaloniaXamlSchemaContext.Instance;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
index 8a0ba64582..18a7fe9ab6 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
@@ -28,8 +28,8 @@ namespace Avalonia.Markup.Xaml.Converters
var parser = new PropertyParser();
var (ns, owner, propertyName) = parser.Parse(new CharacterReader(((string)value).AsSpan()));
var ownerType = TryResolveOwnerByName(context, ns, owner);
- var targetType = context.GetFirstAmbientValue()?.TargetType ??
- context.GetFirstAmbientValue";
+ var xaml = "";
var loader = new AvaloniaXamlLoader();
var style = (Style)loader.Load(xaml);
var setter = (Setter)(style.Setters.First());
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 2e67541c1f..359d2521e0 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -1,6 +1,7 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
+using System;
using Avalonia.Collections;
using Avalonia.Controls;
using Avalonia.Controls.Presenters;
@@ -17,6 +18,7 @@ using Portable.Xaml;
using System.Collections;
using System.ComponentModel;
using System.Linq;
+using System.Xml;
using Xunit;
namespace Avalonia.Markup.Xaml.UnitTests.Xaml
@@ -48,6 +50,9 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
[Fact]
public void AvaloniaProperty_Without_Getter_And_Setter_Is_Set()
{
+ // It's not possible to know in compile time if a read-only property has a magic way of being not read-only
+ if (!AvaloniaXamlLoader.UseLegacyXamlLoader)
+ return;
var xaml =
@"";
- Assert.Throws(() => AvaloniaXamlLoader.Parse(xaml));
+ XamlTestHelpers.AssertThrowsXamlException(() => AvaloniaXamlLoader.Parse(xaml));
}
[Fact]
public void Non_Attached_Property_With_Attached_Property_Syntax_Throws()
{
+ // 1) It has been allowed in AvaloniaObject.SetValue for ages
+ // 2) There is no way to know if AddOwner was called in compile-time
+ if (!AvaloniaXamlLoader.UseLegacyXamlLoader)
+ return;
var xaml =
@"";
- Assert.Throws(() => AvaloniaXamlLoader.Parse(xaml));
+ XamlTestHelpers.AssertThrowsXamlException(() => AvaloniaXamlLoader.Parse(xaml));
}
[Fact]
@@ -518,7 +529,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
var xaml = @"
\ No newline at end of file
+
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/Style2.xaml b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/Style2.xaml
index fd93c4a468..04db8fd2dd 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/Style2.xaml
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/Style2.xaml
@@ -1,8 +1,9 @@
\ No newline at end of file
+
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlClassWithPrecompiledXaml.xaml b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlClassWithPrecompiledXaml.xaml
new file mode 100644
index 0000000000..ac2f75b893
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlClassWithPrecompiledXaml.xaml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
new file mode 100644
index 0000000000..a584027768
--- /dev/null
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using JetBrains.Annotations;
+using Xunit;
+
+namespace Avalonia.Markup.Xaml.UnitTests
+{
+ public class XamlIlTests
+ {
+ [Fact]
+ public void Binding_Button_IsPressed_ShouldWork()
+ {
+ var parsed = (Button)AvaloniaXamlLoader.Parse(@"
+");
+ var ctx = new XamlIlBugTestsDataContext();
+ parsed.DataContext = ctx;
+ parsed.SetValue(Button.IsPressedProperty, true);
+ Assert.True(ctx.IsPressed);
+ }
+
+ [Fact]
+ public void Transitions_Should_Be_Properly_Parsed()
+ {
+ var parsed = (Grid)AvaloniaXamlLoader.Parse(@"
+
+
+
+
+");
+ Assert.Equal(1, parsed.Transitions.Count);
+ Assert.Equal(Visual.OpacityProperty, parsed.Transitions[0].Property);
+ }
+
+ [Fact]
+ public void Parser_Should_Override_Precompiled_Xaml()
+ {
+ var precompiled = new XamlIlClassWithPrecompiledXaml();
+ Assert.Equal(Brushes.Red, precompiled.Background);
+ Assert.Equal(1, precompiled.Opacity);
+ var loaded = (XamlIlClassWithPrecompiledXaml)AvaloniaXamlLoader.Parse(@"
+
+
+");
+ Assert.Equal(loaded.Opacity, 0);
+ Assert.Null(loaded.Background);
+
+ }
+
+ [Fact]
+ public void RelativeSource_TemplatedParent_Works()
+ {
+ using (UnitTestApplication.Start(TestServices.StyledWindow))
+ {
+ new AvaloniaXamlLoader().Load(@"
+
+
+
+
+",
+ null, Application.Current);
+ var parsed = (Window)AvaloniaXamlLoader.Parse(@"
+
+
+
+
+
+");
+ var btn = ((Button)parsed.Content);
+ btn.ApplyTemplate();
+ var canvas = (Canvas)btn.GetVisualChildren().First()
+ .VisualChildren.First()
+ .VisualChildren.First()
+ .VisualChildren.First();
+ Assert.Equal(Brushes.Red.Color, ((ISolidColorBrush)canvas.Background).Color);
+ }
+ }
+ }
+
+ public class XamlIlBugTestsBrushToColorConverter : IMultiValueConverter
+ {
+ public object Convert(IList