diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
index 025b85492c..d440b7cce3 100644
--- a/samples/ControlCatalog/Pages/ComboBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -1,12 +1,20 @@
+ xmlns:sys="using:System"
+ xmlns:col="using:System.Collections">
ComboBox
A drop-down list.
-
+
+
+
+
Inline Items
Inline Item 2
@@ -14,6 +22,24 @@
Inline Item 4
+
+
+
+
+ Hello
+ World
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,7 +72,7 @@
-
+
diff --git a/src/Avalonia.Base/Collections/AvaloniaList.cs b/src/Avalonia.Base/Collections/AvaloniaList.cs
index 2c7f34c5be..2f1cb2888e 100644
--- a/src/Avalonia.Base/Collections/AvaloniaList.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaList.cs
@@ -280,8 +280,8 @@ namespace Avalonia.Collections
///
/// Gets a range of items from the collection.
///
- /// The first index to remove.
- /// The number of items to remove.
+ /// The zero-based index at which the range starts.
+ /// The number of elements in the range.
public IEnumerable GetRange(int index, int count)
{
return _inner.GetRange(index, count);
@@ -455,7 +455,7 @@ namespace Avalonia.Collections
}
///
- /// Ensures that the capacity of the list is at least .
+ /// Ensures that the capacity of the list is at least .
///
/// The capacity.
public void EnsureCapacity(int capacity)
diff --git a/src/Avalonia.Base/Utilities/TypeUtilities.cs b/src/Avalonia.Base/Utilities/TypeUtilities.cs
index 9f2308a062..179ded3549 100644
--- a/src/Avalonia.Base/Utilities/TypeUtilities.cs
+++ b/src/Avalonia.Base/Utilities/TypeUtilities.cs
@@ -93,13 +93,25 @@ namespace Avalonia.Utilities
return !type.IsValueType || IsNullableType(type);
}
+ ///
+ /// Returns a value indicating whether value can be casted to the specified type.
+ /// If value is null, checks if instances of that type can be null.
+ ///
+ /// The type to cast to
+ /// The value to check if cast possible
+ /// True if the cast is possible, otherwise false.
+ public static bool CanCast(object value)
+ {
+ return value is T || (value is null && AcceptsNull(typeof(T)));
+ }
+
///
/// Try to convert a value to a type by any means possible.
///
- /// The type to cast to.
- /// The value to cast.
+ /// The type to convert to.
+ /// The value to convert.
/// The culture to use.
- /// If successful, contains the cast value.
+ /// If successful, contains the convert value.
/// True if the cast was successful, otherwise false.
public static bool TryConvert(Type to, object value, CultureInfo culture, out object result)
{
@@ -216,10 +228,10 @@ namespace Avalonia.Utilities
/// Try to convert a value to a type using the implicit conversions allowed by the C#
/// language.
///
- /// The type to cast to.
- /// The value to cast.
- /// If successful, contains the cast value.
- /// True if the cast was successful, otherwise false.
+ /// The type to convert to.
+ /// The value to convert.
+ /// If successful, contains the converted value.
+ /// True if the convert was successful, otherwise false.
public static bool TryConvertImplicit(Type to, object value, out object result)
{
if (value == null)
@@ -278,8 +290,8 @@ namespace Avalonia.Utilities
/// Convert a value to a type by any means possible, returning the default for that type
/// if the value could not be converted.
///
- /// The value to cast.
- /// The type to cast to..
+ /// The value to convert.
+ /// The type to convert to..
/// The culture to use.
/// A value of .
public static object ConvertOrDefault(object value, Type type, CultureInfo culture)
@@ -291,8 +303,8 @@ namespace Avalonia.Utilities
/// Convert a value to a type using the implicit conversions allowed by the C# language or
/// return the default for the type if the value could not be converted.
///
- /// The value to cast.
- /// The type to cast to..
+ /// The value to convert.
+ /// The type to convert to.
/// A value of .
public static object ConvertImplicitOrDefault(object value, Type type)
{
diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
index 9d8ebbfac1..587dd228a3 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
@@ -83,8 +83,9 @@ namespace Avalonia.Collections
if (key == null)
key = item;
- if (_valueConverter != null)
- key = _valueConverter.Convert(key, typeof(object), level, culture);
+ var valueConverter = ValueConverter;
+ if (valueConverter != null)
+ key = valueConverter.Convert(key, typeof(object), level, culture);
return key;
}
@@ -99,6 +100,8 @@ namespace Avalonia.Collections
}
public override string PropertyName => _propertyPath;
+ public IValueConverter ValueConverter { get => _valueConverter; set => _valueConverter = value; }
+
private Type GetPropertyType(object o)
{
return o.GetType().GetNestedPropertyType(_propertyPath);
diff --git a/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs b/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
index 6ac77fbb99..1d1a595ccf 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
@@ -1,10 +1,8 @@
using Avalonia.Data;
using Avalonia.Reactive;
using System;
-using System.ComponentModel.DataAnnotations;
using System.Collections.Generic;
using System.Reactive.Subjects;
-using System.Text;
namespace Avalonia.Controls.Utils
{
@@ -67,11 +65,14 @@ namespace Avalonia.Controls.Utils
private void SetSourceValue(object value)
{
- _settingSourceValue = true;
+ if (!_settingSourceValue)
+ {
+ _settingSourceValue = true;
- _sourceSubject.OnNext(value);
+ _sourceSubject.OnNext(value);
- _settingSourceValue = false;
+ _settingSourceValue = false;
+ }
}
private void SetControlValue(object value)
{
@@ -157,4 +158,4 @@ namespace Avalonia.Controls.Utils
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index 57c07916db..274696d501 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -1,6 +1,8 @@
using System;
using System.Linq;
+using System.Reactive.Disposables;
using Avalonia.Controls.Generators;
+using Avalonia.Controls.Mixins;
using Avalonia.Controls.Presenters;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Shapes;
@@ -80,7 +82,7 @@ namespace Avalonia.Controls
private bool _isDropDownOpen;
private Popup _popup;
private object _selectionBoxItem;
- private IDisposable _subscriptionsOnOpen;
+ private readonly CompositeDisposable _subscriptionsOnOpen = new CompositeDisposable();
///
/// Initializes static members of the class.
@@ -291,6 +293,7 @@ namespace Avalonia.Controls
_popup = e.NameScope.Get("PART_Popup");
_popup.Opened += PopupOpened;
+ _popup.Closed += PopupClosed;
}
internal void ItemFocused(ComboBoxItem dropDownItem)
@@ -303,8 +306,7 @@ namespace Avalonia.Controls
private void PopupClosed(object sender, EventArgs e)
{
- _subscriptionsOnOpen?.Dispose();
- _subscriptionsOnOpen = null;
+ _subscriptionsOnOpen.Clear();
if (CanFocus(this))
{
@@ -316,20 +318,34 @@ namespace Avalonia.Controls
{
TryFocusSelectedItem();
- _subscriptionsOnOpen?.Dispose();
- _subscriptionsOnOpen = null;
+ _subscriptionsOnOpen.Clear();
var toplevel = this.GetVisualRoot() as TopLevel;
if (toplevel != null)
{
- _subscriptionsOnOpen = toplevel.AddDisposableHandler(PointerWheelChangedEvent, (s, ev) =>
+ toplevel.AddDisposableHandler(PointerWheelChangedEvent, (s, ev) =>
{
//eat wheel scroll event outside dropdown popup while it's open
if (IsDropDownOpen && (ev.Source as IVisual).GetVisualRoot() == toplevel)
{
ev.Handled = true;
}
- }, Interactivity.RoutingStrategies.Tunnel);
+ }, Interactivity.RoutingStrategies.Tunnel).DisposeWith(_subscriptionsOnOpen);
+ }
+
+ this.GetObservable(IsVisibleProperty).Subscribe(IsVisibleChanged).DisposeWith(_subscriptionsOnOpen);
+
+ foreach (var parent in this.GetVisualAncestors().OfType())
+ {
+ parent.GetObservable(IsVisibleProperty).Subscribe(IsVisibleChanged).DisposeWith(_subscriptionsOnOpen);
+ }
+ }
+
+ private void IsVisibleChanged(bool isVisible)
+ {
+ if (!isVisible && IsDropDownOpen)
+ {
+ IsDropDownOpen = false;
}
}
diff --git a/src/Avalonia.Controls/Mixins/DisposableMixin.cs b/src/Avalonia.Controls/Mixins/DisposableMixin.cs
new file mode 100644
index 0000000000..9b30b4ba4c
--- /dev/null
+++ b/src/Avalonia.Controls/Mixins/DisposableMixin.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Reactive.Disposables;
+
+namespace Avalonia.Controls.Mixins
+{
+ ///
+ /// Extension methods associated with the IDisposable interface.
+ ///
+ public static class DisposableMixin
+ {
+ ///
+ /// Ensures the provided disposable is disposed with the specified .
+ ///
+ ///
+ /// The type of the disposable.
+ ///
+ ///
+ /// The disposable we are going to want to be disposed by the CompositeDisposable.
+ ///
+ ///
+ /// The to which will be added.
+ ///
+ ///
+ /// The disposable.
+ ///
+ public static T DisposeWith(this T item, CompositeDisposable compositeDisposable)
+ where T : IDisposable
+ {
+ if (compositeDisposable is null)
+ {
+ throw new ArgumentNullException(nameof(compositeDisposable));
+ }
+
+ compositeDisposable.Add(item);
+ return item;
+ }
+ }
+}
diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
index 984faa4d60..209feb351c 100644
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -115,7 +115,7 @@ namespace Avalonia.Controls.Platform
protected IMenu? Menu { get; private set; }
- protected static TimeSpan MenuShowDelay { get; } = TimeSpan.FromMilliseconds(400);
+ public static TimeSpan MenuShowDelay { get; set; } = TimeSpan.FromMilliseconds(400);
protected internal virtual void GotFocus(object sender, GotFocusEventArgs e)
{
diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index 472727823a..1a46d84558 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -327,7 +327,11 @@ namespace Avalonia.Controls.Presenters
var oldChild = Child;
var newChild = content as IControl;
- if (content != null && newChild == null)
+ // We want to allow creating Child from the Template, if Content is null.
+ // But it's important to not use DataTemplates, otherwise we will break content presenters in many places,
+ // otherwise it will blow up every ContentPresenter without Content set.
+ if (newChild == null
+ && (content != null || ContentTemplate != null))
{
var dataTemplate = this.FindDataTemplate(content, ContentTemplate) ??
(
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index d5fb69a672..e804c4b4a9 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -2,6 +2,7 @@ using System;
using System.ComponentModel;
using System.Linq;
using System.Reactive.Disposables;
+using Avalonia.Controls.Mixins;
using Avalonia.Controls.Diagnostics;
using Avalonia.Controls.Presenters;
using Avalonia.Controls.Primitives.PopupPositioning;
@@ -393,18 +394,8 @@ namespace Avalonia.Controls.Primitives
var handlerCleanup = new CompositeDisposable(5);
- void DeferCleanup(IDisposable? disposable)
- {
- if (disposable is null)
- {
- return;
- }
-
- handlerCleanup.Add(disposable);
- }
-
- DeferCleanup(popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
- HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty));
+ popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty,
+ HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty).DisposeWith(handlerCleanup);
popupHost.SetChild(Child);
((ISetLogicalParent)popupHost).SetParent(this);
@@ -418,19 +409,19 @@ namespace Avalonia.Controls.Primitives
PlacementConstraintAdjustment,
PlacementRect);
- DeferCleanup(SubscribeToEventHandler>(popupHost, RootTemplateApplied,
+ SubscribeToEventHandler>(popupHost, RootTemplateApplied,
(x, handler) => x.TemplateApplied += handler,
- (x, handler) => x.TemplateApplied -= handler));
+ (x, handler) => x.TemplateApplied -= handler).DisposeWith(handlerCleanup);
if (topLevel is Window window)
{
- DeferCleanup(SubscribeToEventHandler(window, WindowDeactivated,
+ SubscribeToEventHandler(window, WindowDeactivated,
(x, handler) => x.Deactivated += handler,
- (x, handler) => x.Deactivated -= handler));
+ (x, handler) => x.Deactivated -= handler).DisposeWith(handlerCleanup);
- DeferCleanup(SubscribeToEventHandler(window.PlatformImpl, WindowLostFocus,
+ SubscribeToEventHandler(window.PlatformImpl, WindowLostFocus,
(x, handler) => x.LostFocus += handler,
- (x, handler) => x.LostFocus -= handler));
+ (x, handler) => x.LostFocus -= handler).DisposeWith(handlerCleanup);
}
else
{
@@ -438,13 +429,13 @@ namespace Avalonia.Controls.Primitives
if (parentPopupRoot?.Parent is Popup popup)
{
- DeferCleanup(SubscribeToEventHandler>(popup, ParentClosed,
+ SubscribeToEventHandler>(popup, ParentClosed,
(x, handler) => x.Closed += handler,
- (x, handler) => x.Closed -= handler));
+ (x, handler) => x.Closed -= handler).DisposeWith(handlerCleanup);
}
}
- DeferCleanup(InputManager.Instance?.Process.Subscribe(ListenForNonClientClick));
+ InputManager.Instance?.Process.Subscribe(ListenForNonClientClick).DisposeWith(handlerCleanup);
var cleanupPopup = Disposable.Create((popupHost, handlerCleanup), state =>
{
@@ -466,17 +457,17 @@ namespace Avalonia.Controls.Primitives
dismissLayer.IsVisible = true;
dismissLayer.InputPassThroughElement = _overlayInputPassThroughElement;
- DeferCleanup(Disposable.Create(() =>
+ Disposable.Create(() =>
{
dismissLayer.IsVisible = false;
dismissLayer.InputPassThroughElement = null;
- }));
+ }).DisposeWith(handlerCleanup);
- DeferCleanup(SubscribeToEventHandler>(
+ SubscribeToEventHandler>(
dismissLayer,
PointerPressedDismissOverlay,
(x, handler) => x.PointerPressed += handler,
- (x, handler) => x.PointerPressed -= handler));
+ (x, handler) => x.PointerPressed -= handler).DisposeWith(handlerCleanup);
}
}
diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs
index e74b950f23..d81926ecc7 100644
--- a/src/Avalonia.Controls/SystemDialog.cs
+++ b/src/Avalonia.Controls/SystemDialog.cs
@@ -4,30 +4,65 @@ using System.Linq;
using System.Threading.Tasks;
using Avalonia.Controls.Platform;
+#nullable enable
+
namespace Avalonia.Controls
{
+ ///
+ /// Base class for system file dialogs.
+ ///
public abstract class FileDialog : FileSystemDialog
{
+ ///
+ /// Gets or sets a collection of filters which determine the types of files displayed in an
+ /// or an .
+ ///
public List Filters { get; set; } = new List();
- public string InitialFileName { get; set; }
+
+ ///
+ /// Gets or sets initial file name that is displayed when the dialog is opened.
+ ///
+ public string? InitialFileName { get; set; }
}
+ ///
+ /// Base class for system file and directory dialogs.
+ ///
public abstract class FileSystemDialog : SystemDialog
{
[Obsolete("Use Directory")]
- public string InitialDirectory
+ public string? InitialDirectory
{
get => Directory;
set => Directory = value;
}
- public string Directory { get; set; }
+
+ ///
+ /// Gets or sets the initial directory that will be displayed when the file system dialog
+ /// is opened.
+ ///
+ public string? Directory { get; set; }
}
+ ///
+ /// Represents a system dialog that prompts the user to select a location for saving a file.
+ ///
public class SaveFileDialog : FileDialog
{
- public string DefaultExtension { get; set; }
+ ///
+ /// Gets or sets the default extension to be used to save the file (including the period ".").
+ ///
+ public string? DefaultExtension { get; set; }
- public async Task ShowAsync(Window parent)
+ ///
+ /// Shows the save file dialog.
+ ///
+ /// The parent window.
+ ///
+ /// A task that on completion contains the full path of the save location, or null if the
+ /// dialog was canceled.
+ ///
+ public async Task ShowAsync(Window parent)
{
if(parent == null)
throw new ArgumentNullException(nameof(parent));
@@ -37,11 +72,25 @@ namespace Avalonia.Controls
}
}
+ ///
+ /// Represents a system dialog that allows the user to select one or more files to open.
+ ///
public class OpenFileDialog : FileDialog
{
+ ///
+ /// Gets or sets a value indicating whether the user can select multiple files.
+ ///
public bool AllowMultiple { get; set; }
- public Task ShowAsync(Window parent)
+ ///
+ /// Shows the open file dialog.
+ ///
+ /// The parent window.
+ ///
+ /// A task that on completion returns an array containing the full path to the selected
+ /// files, or null if the dialog was canceled.
+ ///
+ public Task ShowAsync(Window parent)
{
if(parent == null)
throw new ArgumentNullException(nameof(parent));
@@ -49,15 +98,27 @@ namespace Avalonia.Controls
}
}
+ ///
+ /// Represents a system dialog that allows the user to select a directory.
+ ///
public class OpenFolderDialog : FileSystemDialog
{
[Obsolete("Use Directory")]
- public string DefaultDirectory
+ public string? DefaultDirectory
{
get => Directory;
set => Directory = value;
}
- public Task ShowAsync(Window parent)
+
+ ///
+ /// Shows the open folder dialog.
+ ///
+ /// The parent window.
+ ///
+ /// A task that on completion returns the full path of the selected directory, or null if the
+ /// dialog was canceled.
+ ///
+ public Task ShowAsync(Window parent)
{
if(parent == null)
throw new ArgumentNullException(nameof(parent));
@@ -65,14 +126,32 @@ namespace Avalonia.Controls
}
}
+
+ ///
+ /// Base class for system dialogs.
+ ///
public abstract class SystemDialog
{
- public string Title { get; set; }
+ ///
+ /// Gets or sets the dialog title.
+ ///
+ public string? Title { get; set; }
}
+ ///
+ /// Represents a filter in an or an .
+ ///
public class FileDialogFilter
{
- public string Name { get; set; }
+ ///
+ /// Gets or sets the name of the filter, e.g. ("Text files (.txt)").
+ ///
+ public string? Name { get; set; }
+
+ ///
+ /// Gets or sets a list of file extensions matched by the filter (e.g. "txt" or "*" for all
+ /// files).
+ ///
public List Extensions { get; set; } = new List();
}
}
diff --git a/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs b/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
index 4a6a1c6cfb..8e7b290247 100644
--- a/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
+++ b/src/Avalonia.Controls/Templates/FuncDataTemplate`1.cs
@@ -1,5 +1,7 @@
using System;
+using Avalonia.Utilities;
+
namespace Avalonia.Controls.Templates
{
///
@@ -16,7 +18,7 @@ namespace Avalonia.Controls.Templates
///
/// Whether the control can be recycled.
public FuncDataTemplate(Func build, bool supportsRecycling = false)
- : base(typeof(T), CastBuild(build), supportsRecycling)
+ : base(o => TypeUtilities.CanCast(o), CastBuild(build), supportsRecycling)
{
}
@@ -63,7 +65,7 @@ namespace Avalonia.Controls.Templates
/// The weakly typed function.
private static Func CastMatch(Func f)
{
- return o => (o is T) && f((T)o);
+ return o => TypeUtilities.CanCast(o) && f((T)o);
}
///
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 0eade8d6df..9eae928eeb 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -145,6 +145,18 @@ namespace Avalonia.Controls
(o, v) => o.UndoLimit = v,
unsetValue: -1);
+ public static readonly RoutedEvent CopyingToClipboardEvent =
+ RoutedEvent.Register(
+ "CopyingToClipboard", RoutingStrategies.Bubble);
+
+ public static readonly RoutedEvent CuttingToClipboardEvent =
+ RoutedEvent.Register(
+ "CuttingToClipboard", RoutingStrategies.Bubble);
+
+ public static readonly RoutedEvent PastingFromClipboardEvent =
+ RoutedEvent.Register(
+ "PastingFromClipboard", RoutingStrategies.Bubble);
+
readonly struct UndoRedoState : IEquatable
{
public string Text { get; }
@@ -500,6 +512,24 @@ namespace Avalonia.Controls
}
}
+ public event EventHandler CopyingToClipboard
+ {
+ add => AddHandler(CopyingToClipboardEvent, value);
+ remove => RemoveHandler(CopyingToClipboardEvent, value);
+ }
+
+ public event EventHandler CuttingToClipboard
+ {
+ add => AddHandler(CuttingToClipboardEvent, value);
+ remove => RemoveHandler(CuttingToClipboardEvent, value);
+ }
+
+ public event EventHandler PastingFromClipboard
+ {
+ add => AddHandler(PastingFromClipboardEvent, value);
+ remove => RemoveHandler(PastingFromClipboardEvent, value);
+ }
+
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
_presenter = e.NameScope.Get("PART_TextPresenter");
@@ -638,27 +668,54 @@ namespace Avalonia.Controls
public async void Cut()
{
var text = GetSelection();
- if (text is null) return;
+ if (string.IsNullOrEmpty(text))
+ {
+ return;
+ }
- SnapshotUndoRedo();
- Copy();
- DeleteSelection();
+ var eventArgs = new RoutedEventArgs(CuttingToClipboardEvent);
+ RaiseEvent(eventArgs);
+ if (!eventArgs.Handled)
+ {
+ SnapshotUndoRedo();
+ await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
+ .SetTextAsync(text);
+ DeleteSelection();
+ }
}
public async void Copy()
{
var text = GetSelection();
- if (text is null) return;
+ if (string.IsNullOrEmpty(text))
+ {
+ return;
+ }
- await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
- .SetTextAsync(text);
+ var eventArgs = new RoutedEventArgs(CopyingToClipboardEvent);
+ RaiseEvent(eventArgs);
+ if (!eventArgs.Handled)
+ {
+ await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)))
+ .SetTextAsync(text);
+ }
}
public async void Paste()
{
+ var eventArgs = new RoutedEventArgs(PastingFromClipboardEvent);
+ RaiseEvent(eventArgs);
+ if (eventArgs.Handled)
+ {
+ return;
+ }
+
var text = await ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard))).GetTextAsync();
- if (text is null) return;
+ if (string.IsNullOrEmpty(text))
+ {
+ return;
+ }
SnapshotUndoRedo();
HandleTextInput(text);
diff --git a/src/Avalonia.Input/AccessKeyHandler.cs b/src/Avalonia.Input/AccessKeyHandler.cs
index 5c4af68d79..5082265ea6 100644
--- a/src/Avalonia.Input/AccessKeyHandler.cs
+++ b/src/Avalonia.Input/AccessKeyHandler.cs
@@ -157,10 +157,9 @@ namespace Avalonia.Input
_restoreFocusElement?.Focus();
_restoreFocusElement = null;
+
+ e.Handled = true;
}
-
- // We always handle the Alt key.
- e.Handled = true;
}
else if (_altIsDown)
{
diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
index ed7df67bf2..c8290cb3b7 100644
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ b/src/Avalonia.Input/Navigation/TabNavigation.cs
@@ -234,7 +234,7 @@ namespace Avalonia.Input.Navigation
// Return the first visible element.
var uiElement = e as InputElement;
- if (uiElement is null || uiElement.IsVisible)
+ if (uiElement is null || IsVisibleAndEnabled(uiElement))
{
if (e is IVisual elementAsVisual)
{
@@ -245,7 +245,7 @@ namespace Avalonia.Input.Navigation
{
if (children[i] is InputElement ie)
{
- if (ie.IsVisible)
+ if (IsVisibleAndEnabled(ie))
return ie;
else
{
@@ -270,7 +270,7 @@ namespace Avalonia.Input.Navigation
// Return the last visible element.
var uiElement = e as InputElement;
- if (uiElement == null || uiElement.IsVisible)
+ if (uiElement == null || IsVisibleAndEnabled(uiElement))
{
var elementAsVisual = e as IVisual;
@@ -283,7 +283,7 @@ namespace Avalonia.Input.Navigation
{
if (children[i] is InputElement ie)
{
- if (ie.IsVisible)
+ if (IsVisibleAndEnabled(ie))
return ie;
else
{
@@ -600,7 +600,7 @@ namespace Avalonia.Input.Navigation
var vchild = children[i];
if (vchild == elementAsVisual)
break;
- if (vchild.IsVisible == true && vchild is IInputElement ie)
+ if (vchild is IInputElement ie && IsVisibleAndEnabled(ie))
prev = ie;
}
return prev;
@@ -668,5 +668,6 @@ namespace Avalonia.Input.Navigation
}
private static bool IsTabStopOrGroup(IInputElement e) => IsTabStop(e) || IsGroup(e);
+ private static bool IsVisibleAndEnabled(IInputElement e) => e.IsVisible && e.IsEnabled;
}
}
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
index 64befe2e5c..33d1b30e3c 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Media.TextFormatting
///
public override void Draw(DrawingContext drawingContext, Point origin)
{
- using (drawingContext.PushPostTransform(Matrix.CreateTranslation(origin)))
+ using (drawingContext.PushPreTransform(Matrix.CreateTranslation(origin)))
{
if (GlyphRun.GlyphIndices.Length == 0)
{
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
index 650534b347..b7db1a3fbb 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/DataTemplate.cs
@@ -9,7 +9,6 @@ namespace Avalonia.Markup.Xaml.Templates
{
public Type DataType { get; set; }
- //we need content to be object otherwise portable.xaml is crashing
[Content]
[TemplateContent]
public object Content { get; set; }
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index c9a5544672..1f186396ab 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -534,11 +534,7 @@ namespace Avalonia.Skia
public void PushOpacityMask(IBrush mask, Rect bounds)
{
// TODO: This should be disposed
- var paint = new SKPaint()
- {
- IsAntialias = true,
- Style = SKPaintStyle.StrokeAndFill
- };
+ var paint = new SKPaint();
Canvas.SaveLayer(paint);
_maskStack.Push(CreatePaint(paint, mask, bounds, true));
@@ -547,14 +543,7 @@ namespace Avalonia.Skia
///
public void PopOpacityMask()
{
- using (var paint = new SKPaint
- {
- IsAntialias = true,
- Style = SKPaintStyle.StrokeAndFill,
- BlendMode = SKBlendMode.DstIn,
- Color = new SKColor(0, 0, 0, 255),
- ColorFilter = SKColorFilter.CreateLumaColor()
- })
+ using (var paint = new SKPaint { BlendMode = SKBlendMode.DstIn })
{
Canvas.SaveLayer(paint);
using (var paintWrapper = _maskStack.Pop())
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index cda95d2ebb..8533e1e176 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -12,6 +12,7 @@
+
diff --git a/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
index 589f85f208..0597e88ed6 100644
--- a/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
+++ b/src/Windows/Avalonia.Direct2D1/HwndRenderTarget.cs
@@ -1,4 +1,5 @@
using Avalonia.Platform;
+using Avalonia.Win32;
using Avalonia.Win32.Interop;
using SharpDX;
using SharpDX.DXGI;
@@ -21,7 +22,7 @@ namespace Avalonia.Direct2D1
protected override Size2F GetWindowDpi()
{
- if (UnmanagedMethods.ShCoreAvailable)
+ if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
{
uint dpix, dpiy;
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
index 5b04c5d7ff..bc0a399d7f 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
@@ -150,6 +150,7 @@ namespace Avalonia.Win32.Interop.Wpf
if (_image == null || _oldDpi.X != dpi.X || _oldDpi.Y != dpi.Y)
{
_image = new D3DImage(dpi.X, dpi.Y);
+ _oldDpi = dpi;
}
_impl.ImageSource = _image;
diff --git a/src/Windows/Avalonia.Win32/FramebufferManager.cs b/src/Windows/Avalonia.Win32/FramebufferManager.cs
index 699dc7c25d..0240ac9701 100644
--- a/src/Windows/Avalonia.Win32/FramebufferManager.cs
+++ b/src/Windows/Avalonia.Win32/FramebufferManager.cs
@@ -87,7 +87,7 @@ namespace Avalonia.Win32
private Vector GetCurrentDpi()
{
- if (UnmanagedMethods.ShCoreAvailable)
+ if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
{
var monitor =
UnmanagedMethods.MonitorFromWindow(_hwnd, UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST);
diff --git a/src/Windows/Avalonia.Win32/PlatformConstants.cs b/src/Windows/Avalonia.Win32/PlatformConstants.cs
index af1eca29be..9dd4780637 100644
--- a/src/Windows/Avalonia.Win32/PlatformConstants.cs
+++ b/src/Windows/Avalonia.Win32/PlatformConstants.cs
@@ -1,8 +1,13 @@
+using System;
+
namespace Avalonia.Win32
{
- static class PlatformConstants
+ public static class PlatformConstants
{
public const string WindowHandleType = "HWND";
public const string CursorHandleType = "HCURSOR";
+
+ public static readonly Version Windows8 = new Version(6, 2);
+ public static readonly Version Windows7 = new Version(6, 1);
}
}
diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
index ad81cc1778..f595a58c91 100644
--- a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
+++ b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Win32
var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
return Task.Factory.StartNew(() =>
{
- var result = Array.Empty();
+ string[] result = default;
Guid clsid = dialog is OpenFileDialog ? UnmanagedMethods.ShellIds.OpenFileDialog : UnmanagedMethods.ShellIds.SaveFileDialog;
Guid iid = UnmanagedMethods.ShellIds.IFileDialog;
@@ -100,7 +100,7 @@ namespace Avalonia.Win32
{
return Task.Factory.StartNew(() =>
{
- string result = string.Empty;
+ string result = default;
var hWnd = parent?.PlatformImpl?.Handle?.Handle ?? IntPtr.Zero;
Guid clsid = UnmanagedMethods.ShellIds.OpenFileDialog;
@@ -164,7 +164,7 @@ namespace Avalonia.Win32
}
}
}
- return "";
+ return default;
}
}
}
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index e159ba3b78..e70ea52106 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -1,4 +1,3 @@
-using System;
using Avalonia.OpenGL;
using Avalonia.OpenGL.Angle;
using Avalonia.OpenGL.Egl;
@@ -9,7 +8,6 @@ namespace Avalonia.Win32
{
static class Win32GlManager
{
- private static readonly Version Windows7 = new Version(6, 1);
public static void Initialize()
{
@@ -22,7 +20,7 @@ namespace Avalonia.Win32
return wgl;
}
- if (opts?.AllowEglInitialization ?? Win32Platform.WindowsVersion > Windows7)
+ if (opts?.AllowEglInitialization ?? Win32Platform.WindowsVersion > PlatformConstants.Windows7)
{
var egl = EglPlatformOpenGlInterface.TryCreate(() => new AngleWin32EglDisplay());
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index a881c45cd0..c011a458c3 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -94,7 +94,7 @@ namespace Avalonia
namespace Avalonia.Win32
{
- class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
+ public class Win32Platform : IPlatformThreadingInterface, IPlatformSettings, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
{
private static readonly Win32Platform s_instance = new Win32Platform();
private static Thread _uiThread;
diff --git a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
index 1c3c959acf..bc8f5a606c 100644
--- a/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
+++ b/src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs
@@ -144,6 +144,7 @@ namespace Avalonia.Win32.WinRT.Composition
try
{
TryCreateAndRegisterCore(angle);
+ return;
}
catch (Exception e)
{
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 0b7bd13082..3b7d3efa2f 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -764,8 +764,8 @@ namespace Avalonia.Win32
RegisterTouchWindow(_hwnd, 0);
}
- if (ShCoreAvailable)
- {
+ if (ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8)
+ {
var monitor = MonitorFromWindow(
_hwnd,
MONITOR.MONITOR_DEFAULTTONEAREST);
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index c7aa583b6f..6b744ed79c 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@@ -264,5 +264,91 @@ namespace Avalonia.Controls.UnitTests.Presenters
// InheritanceParent is exposed via StylingParent.
Assert.Same(logicalParent, ((IStyledElement)child).StylingParent);
}
+
+ [Fact]
+ public void Should_Create_Child_Even_With_Null_Content_When_ContentTemplate_Is_Set()
+ {
+ var target = new ContentPresenter
+ {
+ ContentTemplate = new FuncDataTemplate