Browse Source

Merge branch 'master' into colorpicker-updates-6

pull/10816/head
Max Katz 3 years ago
committed by GitHub
parent
commit
f08f13e5ce
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      samples/ControlCatalog/Pages/ClipboardPage.xaml.cs
  2. 6
      src/Android/Avalonia.Android/AndroidInputMethod.cs
  3. 1
      src/Android/Avalonia.Android/AndroidPlatform.cs
  4. 30
      src/Android/Avalonia.Android/Platform/ClipboardImpl.cs
  5. 19
      src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
  6. 14
      src/Avalonia.Base/CombinedGeometry.cs
  7. 5
      src/Avalonia.Base/Media/GeometryGroup.cs
  8. 4
      src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
  9. 12
      src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs
  10. 8
      src/Avalonia.Base/PropertyStore/ValueStore.cs
  11. 6
      src/Avalonia.Controls.DataGrid/DataGrid.cs
  12. 7
      src/Avalonia.Controls/Application.cs
  13. 12
      src/Avalonia.Controls/ItemsControl.cs
  14. 2
      src/Avalonia.Controls/MaskedTextBox.cs
  15. 16
      src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs
  16. 63
      src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs
  17. 7
      src/Avalonia.Controls/SelectableTextBlock.cs
  18. 23
      src/Avalonia.Controls/TextBox.cs
  19. 8
      src/Avalonia.Controls/TopLevel.cs
  20. 6
      src/Avalonia.Controls/TreeView.cs
  21. 1
      src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs
  22. 6
      src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs
  23. 3
      src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
  24. 8
      src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
  25. 5
      src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
  26. 12
      src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs
  27. 10
      src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
  28. 21
      src/Avalonia.FreeDesktop/DBusMenuExporter.cs
  29. 13
      src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
  30. 4
      src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
  31. 8
      src/Avalonia.Headless/HeadlessWindowImpl.cs
  32. 6
      src/Avalonia.Native/WindowImplBase.cs
  33. 1
      src/Avalonia.Themes.Fluent/Controls/Menu.xaml
  34. 2
      src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
  35. 3
      src/Avalonia.Themes.Simple/Controls/Menu.xaml
  36. 2
      src/Avalonia.Themes.Simple/Controls/MenuItem.xaml
  37. 6
      src/Avalonia.X11/X11Window.cs
  38. 9
      src/Browser/Avalonia.Browser/BrowserTopLevelImpl.cs
  39. 1
      src/Browser/Avalonia.Browser/WindowingPlatform.cs
  40. 7
      src/Skia/Avalonia.Skia/CombinedGeometryImpl.cs
  41. 7
      src/Skia/Avalonia.Skia/GeometryGroupImpl.cs
  42. 4
      src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
  43. 4
      src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
  44. 13
      src/Windows/Avalonia.Direct2D1/Media/CombinedGeometryImpl.cs
  45. 7
      src/Windows/Avalonia.Direct2D1/Media/GeometryGroupImpl.cs
  46. 2
      src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
  47. 6
      src/Windows/Avalonia.Win32/WindowImpl.cs
  48. 9
      src/iOS/Avalonia.iOS/AvaloniaView.cs
  49. 1
      src/iOS/Avalonia.iOS/Platform.cs
  50. 29
      src/tools/DevGenerators/CompositionGenerator/Generator.cs
  51. 30
      tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Inheritance.cs
  52. 19
      tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs
  53. 4
      tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs
  54. 4
      tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
  55. 78
      tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
  56. 45
      tests/Avalonia.Controls.UnitTests/MenuItemTests.cs
  57. 83
      tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
  58. 2
      tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
  59. 29
      tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
  60. 4
      tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs

16
samples/ControlCatalog/Pages/ClipboardPage.xaml.cs

@ -32,13 +32,13 @@ namespace ControlCatalog.Pages
private async void CopyText(object? sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard && ClipboardContent is { } clipboardContent)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard && ClipboardContent is { } clipboardContent)
await clipboard.SetTextAsync(clipboardContent.Text ?? String.Empty);
}
private async void PasteText(object? sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
{
ClipboardContent.Text = await clipboard.GetTextAsync();
}
@ -46,7 +46,7 @@ namespace ControlCatalog.Pages
private async void CopyTextDataObject(object? sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
{
var dataObject = new DataObject();
dataObject.Set(DataFormats.Text, ClipboardContent.Text ?? string.Empty);
@ -56,7 +56,7 @@ namespace ControlCatalog.Pages
private async void PasteTextDataObject(object? sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
{
ClipboardContent.Text = await clipboard.GetDataAsync(DataFormats.Text) as string ?? string.Empty;
}
@ -64,7 +64,7 @@ namespace ControlCatalog.Pages
private async void CopyFilesDataObject(object? sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
{
var storageProvider = TopLevel.GetTopLevel(this)!.StorageProvider;
var filesPath = (ClipboardContent.Text ?? string.Empty)
@ -110,7 +110,7 @@ namespace ControlCatalog.Pages
private async void PasteFilesDataObject(object? sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
{
var files = await clipboard.GetDataAsync(DataFormats.Files) as IEnumerable<Avalonia.Platform.Storage.IStorageItem>;
@ -120,7 +120,7 @@ namespace ControlCatalog.Pages
private async void GetFormats(object sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
{
var formats = await clipboard.GetFormatsAsync();
ClipboardContent.Text = string.Join(Environment.NewLine, formats);
@ -129,7 +129,7 @@ namespace ControlCatalog.Pages
private async void Clear(object sender, RoutedEventArgs args)
{
if (Application.Current!.Clipboard is { } clipboard)
if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
{
await clipboard.ClearAsync();
}

6
src/Android/Avalonia.Android/AndroidInputMethod.cs

@ -1,14 +1,11 @@
using System;
using Android.Content;
using Android.Runtime;
using Android.Text;
using Android.Views;
using Android.Views.InputMethods;
using Avalonia.Android.Platform.SkiaPlatform;
using Avalonia.Controls.Presenters;
using Avalonia.Input;
using Avalonia.Input.TextInput;
using Avalonia.Reactive;
namespace Avalonia.Android
{
@ -99,6 +96,9 @@ namespace Avalonia.Android
{
_host.InitEditorInfo((topLevel, outAttrs) =>
{
if (_client == null)
return null;
_inputConnection = new AvaloniaInputConnection(topLevel, this);
outAttrs.InputType = options.ContentType switch

1
src/Android/Avalonia.Android/AndroidPlatform.cs

@ -38,7 +38,6 @@ namespace Avalonia.Android
Options = AvaloniaLocator.Current.GetService<AndroidPlatformOptions>() ?? new AndroidPlatformOptions();
AvaloniaLocator.CurrentMutable
.Bind<IClipboard>().ToTransient<ClipboardImpl>()
.Bind<ICursorFactory>().ToTransient<CursorFactory>()
.Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformStub())
.Bind<IKeyboardDevice>().ToSingleton<AndroidKeyboardDevice>()

30
src/Android/Avalonia.Android/Platform/ClipboardImpl.cs

@ -2,32 +2,26 @@ using System;
using System.Threading.Tasks;
using Android.Content;
using Android.Runtime;
using Android.Views;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Platform;
namespace Avalonia.Android.Platform
{
internal class ClipboardImpl : IClipboard
{
private Context context = (AvaloniaLocator.Current.GetService<IWindowImpl>() as View).Context;
private ClipboardManager? _clipboardManager;
private ClipboardManager ClipboardManager
internal ClipboardImpl(ClipboardManager? value)
{
get
{
return this.context.GetSystemService(Context.ClipboardService).JavaCast<ClipboardManager>();
}
_clipboardManager = value;
}
public Task<string> GetTextAsync()
{
if (ClipboardManager.HasPrimaryClip)
if (_clipboardManager?.HasPrimaryClip == true)
{
return Task.FromResult<string>(ClipboardManager.PrimaryClip.GetItemAt(0).Text);
return Task.FromResult<string>(_clipboardManager.PrimaryClip.GetItemAt(0).Text);
}
return Task.FromResult<string>(null);
@ -35,15 +29,25 @@ namespace Avalonia.Android.Platform
public Task SetTextAsync(string text)
{
if(_clipboardManager == null)
{
return Task.CompletedTask;
}
ClipData clip = ClipData.NewPlainText("text", text);
ClipboardManager.PrimaryClip = clip;
_clipboardManager.PrimaryClip = clip;
return Task.FromResult<object>(null);
}
public Task ClearAsync()
{
ClipboardManager.PrimaryClip = null;
if (_clipboardManager == null)
{
return Task.CompletedTask;
}
_clipboardManager.PrimaryClip = null;
return Task.FromResult<object>(null);
}

19
src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs

@ -3,7 +3,10 @@ using System.Collections.Generic;
using Android.App;
using Android.Content;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.OS;
using Android.Runtime;
using Android.Text;
using Android.Views;
using Android.Views.InputMethods;
using Avalonia.Android.Platform.Specific;
@ -13,6 +16,7 @@ using Avalonia.Controls;
using Avalonia.Controls.Platform;
using Avalonia.Controls.Platform.Surfaces;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Input.Raw;
using Avalonia.Input.TextInput;
using Avalonia.OpenGL.Egl;
@ -22,13 +26,7 @@ using Avalonia.Platform.Storage;
using Avalonia.Rendering;
using Avalonia.Rendering.Composition;
using Java.Lang;
using Java.Util;
using Math = System.Math;
using AndroidRect = Android.Graphics.Rect;
using Window = Android.Views.Window;
using Android.Graphics.Drawables;
using Android.OS;
using Android.Text;
using ClipboardManager = Android.Content.ClipboardManager;
namespace Avalonia.Android.Platform.SkiaPlatform
{
@ -44,6 +42,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
private readonly IStorageProvider _storageProvider;
private readonly ISystemNavigationManagerImpl _systemNavigationManager;
private readonly AndroidInsetsManager _insetsManager;
private readonly ClipboardImpl _clipboard;
private ViewImpl _view;
public TopLevelImpl(AvaloniaView avaloniaView, bool placeOnTop = false)
@ -54,6 +53,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
_pointerHelper = new AndroidMotionEventsHelper(this);
_gl = new EglGlPlatformSurface(this);
_framebuffer = new FramebufferManager(this);
_clipboard = new ClipboardImpl(avaloniaView.Context?.GetSystemService(Context.ClipboardService).JavaCast<ClipboardManager>());
RenderScaling = _view.Scaling;
@ -408,6 +408,11 @@ namespace Avalonia.Android.Platform.SkiaPlatform
return _insetsManager;
}
if(featureType == typeof(IClipboard))
{
return _clipboard;
}
return null;
}
}

14
src/Avalonia.Base/CombinedGeometry.cs

@ -152,19 +152,15 @@ namespace Avalonia.Media
var g1 = Geometry1;
var g2 = Geometry2;
if (g1 is object && g2 is object)
if (g1?.PlatformImpl != null && g2?.PlatformImpl != null)
{
var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
return factory.CreateCombinedGeometry(GeometryCombineMode, g1, g2);
return factory.CreateCombinedGeometry(GeometryCombineMode, g1.PlatformImpl, g2.PlatformImpl);
}
else if (GeometryCombineMode == GeometryCombineMode.Intersect)
return null;
else if (g1 is object)
return g1.PlatformImpl;
else if (g2 is object)
return g2.PlatformImpl;
else
if (GeometryCombineMode == GeometryCombineMode.Intersect)
return null;
return g1?.PlatformImpl ?? g2?.PlatformImpl;
}
}
}

5
src/Avalonia.Base/Media/GeometryGroup.cs

@ -78,7 +78,10 @@ namespace Avalonia.Media
{
var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
return factory.CreateGeometryGroup(FillRule, _children);
var children = new IGeometryImpl?[_children.Count];
for (var c = 0; c < _children.Count; c++)
children[c] = _children[c].PlatformImpl;
return factory.CreateGeometryGroup(FillRule, children!);
}
return null;

4
src/Avalonia.Base/Platform/IPlatformRenderInterface.cs

@ -48,7 +48,7 @@ namespace Avalonia.Platform
/// <param name="fillRule">The fill rule.</param>
/// <param name="children">The geometries to group.</param>
/// <returns>A combined geometry.</returns>
IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children);
IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children);
/// <summary>
/// Creates a geometry group implementation.
@ -57,7 +57,7 @@ namespace Avalonia.Platform
/// <param name="g1">The first geometry.</param>
/// <param name="g2">The second geometry.</param>
/// <returns>A combined geometry.</returns>
IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2);
IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2);
/// <summary>
/// Created a geometry implementation for the glyph run.

12
src/Avalonia.Base/PropertyStore/EffectiveValue`1.cs

@ -140,24 +140,24 @@ namespace Avalonia.PropertyStore
var p = (StyledProperty<T>)property;
BindingPriority priority;
T oldValue;
T newValue;
if (property.Inherits && owner.TryGetInheritedValue(property, out var i))
{
oldValue = ((EffectiveValue<T>)i).Value;
newValue = ((EffectiveValue<T>)i).Value;
priority = BindingPriority.Inherited;
}
else
{
oldValue = _metadata.DefaultValue;
newValue = _metadata.DefaultValue;
priority = BindingPriority.Unset;
}
if (!EqualityComparer<T>.Default.Equals(oldValue, Value))
if (!EqualityComparer<T>.Default.Equals(newValue, Value))
{
owner.Owner.RaisePropertyChanged(p, Value, oldValue, priority, true);
owner.Owner.RaisePropertyChanged(p, Value, newValue, priority, true);
if (property.Inherits)
owner.OnInheritedEffectiveValueDisposed(p, Value);
owner.OnInheritedEffectiveValueDisposed(p, Value, newValue);
}
if (ValueEntry?.GetDataValidationState(out _, out _) ??

8
src/Avalonia.Base/PropertyStore/ValueStore.cs

@ -419,7 +419,9 @@ namespace Avalonia.PropertyStore
ReevaluateEffectiveValue(property, current);
}
else
{
ReevaluateEffectiveValues();
}
}
/// <summary>
@ -481,7 +483,8 @@ namespace Avalonia.PropertyStore
/// </summary>
/// <param name="property">The property whose value changed.</param>
/// <param name="oldValue">The old value of the property.</param>
public void OnInheritedEffectiveValueDisposed<T>(StyledProperty<T> property, T oldValue)
/// <param name="newValue">The new value of the property.</param>
public void OnInheritedEffectiveValueDisposed<T>(StyledProperty<T> property, T oldValue, T newValue)
{
Debug.Assert(property.Inherits);
@ -489,12 +492,11 @@ namespace Avalonia.PropertyStore
if (children is not null)
{
var defaultValue = property.GetDefaultValue(Owner.GetType());
var count = children.Count;
for (var i = 0; i < count; ++i)
{
children[i].GetValueStore().OnAncestorInheritedValueChanged(property, oldValue, defaultValue);
children[i].GetValueStore().OnAncestorInheritedValueChanged(property, oldValue, newValue);
}
}
}

6
src/Avalonia.Controls.DataGrid/DataGrid.cs

@ -6133,8 +6133,10 @@ namespace Avalonia.Controls
private async void CopyToClipboard(string text)
{
var clipboard = ((IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)));
await clipboard.SetTextAsync(text);
var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if (clipboard != null)
await clipboard.SetTextAsync(text);
}
/// <summary>

7
src/Avalonia.Controls/Application.cs

@ -36,8 +36,6 @@ namespace Avalonia
/// </summary>
private DataTemplates? _dataTemplates;
private readonly Lazy<IClipboard?> _clipboard =
new Lazy<IClipboard?>(() => (IClipboard?)AvaloniaLocator.Current.GetService(typeof(IClipboard)));
private Styles? _styles;
private IResourceDictionary? _resources;
private bool _notifyingResourcesChanged;
@ -141,11 +139,6 @@ namespace Avalonia
private set;
}
/// <summary>
/// Gets the application clipboard.
/// </summary>
public IClipboard? Clipboard => _clipboard.Value;
/// <summary>
/// Gets the application's global resource dictionary.
/// </summary>

12
src/Avalonia.Controls/ItemsControl.cs

@ -460,13 +460,19 @@ namespace Avalonia.Controls
ic.ItemContainerTheme = ict;
}
// This condition is separate because HeaderedItemsControl needs to also run the
// ItemsControl preparation.
// These conditions are separate because HeaderedItemsControl and
// HeaderedSelectingItemsControl also need to run the ItemsControl preparation.
if (container is HeaderedItemsControl hic)
{
hic.Header = item;
hic.HeaderTemplate = itemTemplate;
hic.PrepareItemContainer();
hic.PrepareItemContainer(this);
}
else if (container is HeaderedSelectingItemsControl hsic)
{
hsic.Header = item;
hsic.HeaderTemplate = itemTemplate;
hsic.PrepareItemContainer(this);
}
}

2
src/Avalonia.Controls/MaskedTextBox.cs

@ -210,7 +210,7 @@ namespace Avalonia.Controls
if (keymap is not null && Match(keymap.Paste))
{
var clipboard = (IClipboard?)AvaloniaLocator.Current.GetService(typeof(IClipboard));
var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if (clipboard is null)
return;

16
src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs

@ -13,7 +13,7 @@ namespace Avalonia.Controls.Primitives
public class HeaderedItemsControl : ItemsControl, IContentPresenterHost
{
private IDisposable? _itemsBinding;
private bool _prepareItemContainerOnAttach;
private ItemsControl? _prepareItemContainerOnAttach;
/// <summary>
/// Defines the <see cref="Header"/> property.
@ -69,10 +69,10 @@ namespace Avalonia.Controls.Primitives
{
base.OnAttachedToLogicalTree(e);
if (_prepareItemContainerOnAttach)
if (_prepareItemContainerOnAttach is not null)
{
PrepareItemContainer();
_prepareItemContainerOnAttach = false;
PrepareItemContainer(_prepareItemContainerOnAttach);
_prepareItemContainerOnAttach = null;
}
}
@ -97,7 +97,7 @@ namespace Avalonia.Controls.Primitives
return false;
}
internal void PrepareItemContainer()
internal void PrepareItemContainer(ItemsControl parent)
{
_itemsBinding?.Dispose();
_itemsBinding = null;
@ -106,18 +106,18 @@ namespace Avalonia.Controls.Primitives
if (item is null)
{
_prepareItemContainerOnAttach = false;
_prepareItemContainerOnAttach = null;
return;
}
var headerTemplate = HeaderTemplate;
var headerTemplate = HeaderTemplate ?? parent.ItemTemplate;
if (headerTemplate is null)
{
if (((ILogical)this).IsAttachedToLogicalTree)
headerTemplate = this.FindDataTemplate(item);
else
_prepareItemContainerOnAttach = true;
_prepareItemContainerOnAttach = parent;
}
if (headerTemplate is ITreeDataTemplate treeTemplate &&

63
src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs

@ -1,5 +1,8 @@
using System;
using Avalonia.Collections;
using Avalonia.Controls.Presenters;
using Avalonia.Controls.Templates;
using Avalonia.Data;
using Avalonia.LogicalTree;
namespace Avalonia.Controls.Primitives
@ -9,12 +12,21 @@ namespace Avalonia.Controls.Primitives
/// </summary>
public class HeaderedSelectingItemsControl : SelectingItemsControl, IContentPresenterHost
{
private IDisposable? _itemsBinding;
private ItemsControl? _prepareItemContainerOnAttach;
/// <summary>
/// Defines the <see cref="Header"/> property.
/// </summary>
public static readonly StyledProperty<object?> HeaderProperty =
HeaderedContentControl.HeaderProperty.AddOwner<HeaderedSelectingItemsControl>();
/// <summary>
/// Defines the <see cref="HeaderTemplate"/> property.
/// </summary>
public static readonly StyledProperty<IDataTemplate?> HeaderTemplateProperty =
HeaderedItemsControl.HeaderTemplateProperty.AddOwner<HeaderedSelectingItemsControl>();
/// <summary>
/// Initializes static members of the <see cref="ContentControl"/> class.
/// </summary>
@ -32,6 +44,15 @@ namespace Avalonia.Controls.Primitives
set { SetValue(HeaderProperty, value); }
}
/// <summary>
/// Gets or sets the data template used to display the header content of the control.
/// </summary>
public IDataTemplate? HeaderTemplate
{
get => GetValue(HeaderTemplateProperty);
set => SetValue(HeaderTemplateProperty, value);
}
/// <summary>
/// Gets the header presenter from the control's template.
/// </summary>
@ -50,6 +71,17 @@ namespace Avalonia.Controls.Primitives
return RegisterContentPresenter(presenter);
}
protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
{
base.OnAttachedToLogicalTree(e);
if (_prepareItemContainerOnAttach is not null)
{
PrepareItemContainer(_prepareItemContainerOnAttach);
_prepareItemContainerOnAttach = null;
}
}
/// <summary>
/// Called when an <see cref="IContentPresenter"/> is registered with the control.
/// </summary>
@ -65,6 +97,37 @@ namespace Avalonia.Controls.Primitives
return false;
}
internal void PrepareItemContainer(ItemsControl parent)
{
_itemsBinding?.Dispose();
_itemsBinding = null;
var item = Header;
if (item is null)
{
_prepareItemContainerOnAttach = null;
return;
}
var headerTemplate = HeaderTemplate ?? parent.ItemTemplate;
if (headerTemplate is null)
{
if (((ILogical)this).IsAttachedToLogicalTree)
headerTemplate = this.FindDataTemplate(item);
else
_prepareItemContainerOnAttach = parent;
}
if (headerTemplate is ITreeDataTemplate treeTemplate &&
treeTemplate.Match(item) &&
treeTemplate.ItemsSelector(item) is { } itemsBinding)
{
_itemsBinding = BindingOperations.Apply(this, ItemsSourceProperty, itemsBinding, null);
}
}
private void HeaderChanged(AvaloniaPropertyChangedEventArgs e)
{
if (e.OldValue is ILogical oldChild)

7
src/Avalonia.Controls/SelectableTextBlock.cs

@ -8,6 +8,7 @@ using Avalonia.Input.Platform;
using Avalonia.Interactivity;
using Avalonia.Media;
using Avalonia.Media.TextFormatting;
using Avalonia.Platform;
using Avalonia.Utilities;
namespace Avalonia.Controls
@ -120,8 +121,10 @@ namespace Avalonia.Controls
if (!eventArgs.Handled)
{
await ((IClipboard)AvaloniaLocator.Current.GetRequiredService(typeof(IClipboard)))
.SetTextAsync(text);
var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if (clipboard != null)
await clipboard.SetTextAsync(text);
}
}

23
src/Avalonia.Controls/TextBox.cs

@ -18,6 +18,7 @@ using Avalonia.Media.TextFormatting;
using Avalonia.Media.TextFormatting.Unicode;
using Avalonia.Automation.Peers;
using Avalonia.Threading;
using Avalonia.Platform;
namespace Avalonia.Controls
{
@ -1044,8 +1045,13 @@ namespace Avalonia.Controls
if (!eventArgs.Handled)
{
SnapshotUndoRedo();
await ((IClipboard)AvaloniaLocator.Current.GetRequiredService(typeof(IClipboard)))
.SetTextAsync(text);
var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if (clipboard == null)
return;
await clipboard.SetTextAsync(text);
DeleteSelection();
}
}
@ -1066,8 +1072,10 @@ namespace Avalonia.Controls
RaiseEvent(eventArgs);
if (!eventArgs.Handled)
{
await ((IClipboard)AvaloniaLocator.Current.GetRequiredService(typeof(IClipboard)))
.SetTextAsync(text);
var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if (clipboard != null)
await clipboard.SetTextAsync(text);
}
}
@ -1083,7 +1091,12 @@ namespace Avalonia.Controls
return;
}
var text = await ((IClipboard)AvaloniaLocator.Current.GetRequiredService(typeof(IClipboard))).GetTextAsync();
string? text = null;
var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if (clipboard != null)
text = await clipboard.GetTextAsync();
if (string.IsNullOrEmpty(text))
{

8
src/Avalonia.Controls/TopLevel.cs

@ -394,6 +394,11 @@ namespace Avalonia.Controls
public IInsetsManager? InsetsManager => PlatformImpl?.TryGetFeature<IInsetsManager>();
/// <summary>
/// Gets the platform's clipboard implementation
/// </summary>
public IClipboard? Clipboard => PlatformImpl?.TryGetFeature<IClipboard>();
/// <inheritdoc/>
Point IRenderRoot.PointToClient(PixelPoint p)
{
@ -454,7 +459,8 @@ namespace Avalonia.Controls
}
else if (change.Property == ActualThemeVariantProperty)
{
PlatformImpl?.SetFrameThemeVariant((PlatformThemeVariant?)change.GetNewValue<ThemeVariant>() ?? PlatformThemeVariant.Light);
var newThemeVariant = change.GetNewValue<ThemeVariant?>() ?? ThemeVariant.Default;
PlatformImpl?.SetFrameThemeVariant((PlatformThemeVariant?)newThemeVariant ?? PlatformThemeVariant.Light);
}
}

6
src/Avalonia.Controls/TreeView.cs

@ -307,12 +307,14 @@ namespace Avalonia.Controls
private void SelectSingleItem(object item)
{
var oldValue = _selectedItem;
_syncingSelectedItems = true;
SelectedItems.Clear();
SelectedItems.Clear();
_selectedItem = item;
SelectedItems.Add(item);
_syncingSelectedItems = false;
SetAndRaise(SelectedItemProperty, ref _selectedItem, item);
RaisePropertyChanged(SelectedItemProperty, oldValue, _selectedItem);
}
/// <summary>

1
src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs

@ -48,7 +48,6 @@ namespace Avalonia.DesignerSupport.Remote
s_transport = transport;
var instance = new PreviewerWindowingPlatform();
AvaloniaLocator.CurrentMutable
.Bind<IClipboard>().ToSingleton<ClipboardStub>()
.Bind<ICursorFactory>().ToSingleton<CursorFactoryStub>()
.Bind<IKeyboardDevice>().ToConstant(Keyboard)
.Bind<IPlatformSettings>().ToSingleton<DefaultPlatformSettings>()

6
src/Avalonia.Diagnostics/Diagnostics/Controls/Application.cs

@ -76,12 +76,6 @@ namespace Avalonia.Diagnostics.Controls
public Input.InputManager? InputManager =>
_application.InputManager;
/// <summary>
/// Gets the application clipboard.
/// </summary>
public Input.Platform.IClipboard? Clipboard =>
_application.Clipboard;
/// <summary>
/// Gets the application's global resource dictionary.
/// </summary>

3
src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs

@ -1,5 +1,6 @@
using System;
using Avalonia.Data;
using Avalonia.Input.Platform;
using Avalonia.Markup.Xaml.MarkupExtensions;
using Avalonia.Media;
@ -7,7 +8,7 @@ namespace Avalonia.Diagnostics.ViewModels
{
internal class BindingSetterViewModel : SetterViewModel
{
public BindingSetterViewModel(AvaloniaProperty property, object? value) : base(property, value)
public BindingSetterViewModel(AvaloniaProperty property, object? value, IClipboard? clipboard) : base(property, value, clipboard)
{
switch (value)
{

8
src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs

@ -59,6 +59,8 @@ namespace Avalonia.Diagnostics.ViewModels
var styleDiagnostics = styledElement.GetStyleDiagnostics();
var clipboard = TopLevel.GetTopLevel(_avaloniaObject as Visual)?.Clipboard;
// We need to place styles without activator first, such styles will be overwritten by ones with activators.
foreach (var appliedStyle in styleDiagnostics.AppliedStyles.OrderBy(s => s.HasActivator))
{
@ -91,7 +93,7 @@ namespace Avalonia.Diagnostics.ViewModels
var resourceKey = resourceInfo.Value.resourceKey;
var resourceValue = styledElement.FindResource(resourceKey);
setterVm = new ResourceSetterViewModel(regularSetter.Property, resourceKey, resourceValue, resourceInfo.Value.isDynamic);
setterVm = new ResourceSetterViewModel(regularSetter.Property, resourceKey, resourceValue, resourceInfo.Value.isDynamic, clipboard);
}
else
{
@ -99,11 +101,11 @@ namespace Avalonia.Diagnostics.ViewModels
if (isBinding)
{
setterVm = new BindingSetterViewModel(regularSetter.Property, setterValue);
setterVm = new BindingSetterViewModel(regularSetter.Property, setterValue, clipboard);
}
else
{
setterVm = new SetterViewModel(regularSetter.Property, setterValue);
setterVm = new SetterViewModel(regularSetter.Property, setterValue, clipboard);
}
}

5
src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs

@ -1,4 +1,5 @@
using Avalonia.Media;
using Avalonia.Input.Platform;
using Avalonia.Media;
namespace Avalonia.Diagnostics.ViewModels
{
@ -10,7 +11,7 @@ namespace Avalonia.Diagnostics.ViewModels
public string ValueTypeTooltip { get; }
public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object? resourceValue, bool isDynamic) : base(property, resourceValue)
public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object? resourceValue, bool isDynamic, IClipboard? clipboard) : base(property, resourceValue, clipboard)
{
Key = resourceKey;
Tint = isDynamic ? Brushes.Orange : Brushes.Brown;

12
src/Avalonia.Diagnostics/Diagnostics/ViewModels/SetterViewModel.cs

@ -25,13 +25,17 @@ namespace Avalonia.Diagnostics.ViewModels
set => RaiseAndSetIfChanged(ref _isVisible, value);
}
public SetterViewModel(AvaloniaProperty property, object? value)
private IClipboard? _clipboard;
public SetterViewModel(AvaloniaProperty property, object? value, IClipboard? clipboard)
{
Property = property;
Name = property.Name;
Value = value;
IsActive = true;
IsVisible = true;
_clipboard = clipboard;
}
public virtual void CopyValue()
@ -51,11 +55,9 @@ namespace Avalonia.Diagnostics.ViewModels
CopyToClipboard(Property.Name);
}
protected static void CopyToClipboard(string value)
protected void CopyToClipboard(string value)
{
var clipboard = AvaloniaLocator.Current.GetService<IClipboard>();
clipboard?.SetTextAsync(value);
_clipboard?.SetTextAsync(value);
}
}
}

10
src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

@ -5,20 +5,20 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<Import Project="..\..\build\TrimmingEnable.props" />
<Import Project="../../build/TrimmingEnable.props" />
<ItemGroup>
<Compile Include="..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
<Compile Include="../Shared/IsExternalInit.cs" Link="IsExternalInit.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Tmds.DBus.Protocol" Version="0.14.0" />
<PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.4" />
<PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
<ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
<ProjectReference Include="../Avalonia.Controls/Avalonia.Controls.csproj" />
<ProjectReference Include="../Avalonia.Dialogs/Avalonia.Dialogs.csproj" />
</ItemGroup>
<ItemGroup Label="InternalsVisibleTo">

21
src/Avalonia.FreeDesktop/DBusMenuExporter.cs

@ -38,7 +38,7 @@ namespace Avalonia.FreeDesktop
private bool _resetQueued;
private int _nextId = 1;
public DBusMenuExporterImpl(Connection connection, IntPtr xid)
public DBusMenuExporterImpl(Connection connection, IntPtr xid) : this()
{
Connection = connection;
_xid = (uint)xid.ToInt32();
@ -47,7 +47,7 @@ namespace Avalonia.FreeDesktop
_ = InitializeAsync();
}
public DBusMenuExporterImpl(Connection connection, string path)
public DBusMenuExporterImpl(Connection connection, string path) : this()
{
Connection = connection;
_appMenu = false;
@ -56,6 +56,13 @@ namespace Avalonia.FreeDesktop
_ = InitializeAsync();
}
private DBusMenuExporterImpl()
{
BackingProperties.Status = string.Empty;
BackingProperties.TextDirection = string.Empty;
BackingProperties.IconThemePath = Array.Empty<string>();
}
protected override Connection Connection { get; }
public override string Path { get; }
@ -202,15 +209,9 @@ namespace Avalonia.FreeDesktop
return id;
}
private void OnMenuItemsChanged(object? sender, NotifyCollectionChangedEventArgs e)
{
QueueReset();
}
private void OnMenuItemsChanged(object? sender, NotifyCollectionChangedEventArgs e) => QueueReset();
private void OnItemPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
{
QueueReset();
}
private void OnItemPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e) => QueueReset();
private static readonly string[] s_allProperties = {
"type", "label", "enabled", "visible", "shortcut", "toggle-type", "children-display", "toggle-state", "icon-data"

13
src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs

@ -220,6 +220,16 @@ namespace Avalonia.FreeDesktop
{
Connection = connection;
BackingProperties.Menu = dbusMenuPath;
BackingProperties.Category = string.Empty;
BackingProperties.Status = string.Empty;
BackingProperties.Id = string.Empty;
BackingProperties.Title = string.Empty;
BackingProperties.IconPixmap = Array.Empty<(int, int, byte[])>();
BackingProperties.AttentionIconName = string.Empty;
BackingProperties.AttentionIconPixmap = Array.Empty<(int, int, byte[])>();
BackingProperties.AttentionMovieName = string.Empty;
BackingProperties.OverlayIconName = string.Empty;
BackingProperties.OverlayIconPixmap = Array.Empty<(int, int, byte[])>();
BackingProperties.ToolTip = (string.Empty, Array.Empty<(int, int, byte[])>(), string.Empty, string.Empty);
InvalidateAll();
}
@ -234,7 +244,7 @@ namespace Avalonia.FreeDesktop
protected override ValueTask OnActivateAsync(int x, int y)
{
Dispatcher.UIThread.Post(() => ActivationDelegate?.Invoke());
ActivationDelegate?.Invoke();
return new ValueTask();
}
@ -267,7 +277,6 @@ namespace Avalonia.FreeDesktop
BackingProperties.Category = "ApplicationStatus";
BackingProperties.Status = text;
BackingProperties.Title = text;
BackingProperties.ToolTip = (string.Empty, Array.Empty<(int, int, byte[])>(), text, string.Empty);
InvalidateAll();
}
}

4
src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs

@ -47,8 +47,8 @@ namespace Avalonia.Headless
}
public IStreamGeometryImpl CreateStreamGeometry() => new HeadlessStreamingGeometryStub();
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children) => throw new NotImplementedException();
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2) => throw new NotImplementedException();
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children) => throw new NotImplementedException();
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2) => throw new NotImplementedException();
public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces) => new HeadlessRenderTarget();
public bool IsLost => false;

8
src/Avalonia.Headless/HeadlessWindowImpl.cs

@ -1,12 +1,11 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Controls.Platform;
using Avalonia.Controls.Platform.Surfaces;
using Avalonia.Controls.Primitives.PopupPositioning;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Input.Raw;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
@ -254,6 +253,11 @@ namespace Avalonia.Headless
return new NoopStorageProvider();
}
if(featureType == typeof(IClipboard))
{
return AvaloniaLocator.Current.GetRequiredService<IClipboard>();
}
return null;
}

6
src/Avalonia.Native/WindowImplBase.cs

@ -7,6 +7,7 @@ using Avalonia.Controls;
using Avalonia.Controls.Platform;
using Avalonia.Controls.Platform.Surfaces;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Input.Raw;
using Avalonia.Native.Interop;
using Avalonia.OpenGL;
@ -528,6 +529,11 @@ namespace Avalonia.Native
return _platformBehaviorInhibition;
}
if (featureType == typeof(IClipboard))
{
return AvaloniaLocator.Current.GetRequiredService<IClipboard>();
}
return null;
}

1
src/Avalonia.Themes.Fluent/Controls/Menu.xaml

@ -28,6 +28,7 @@
<Panel>
<ContentPresenter Name="PART_HeaderPresenter"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
VerticalAlignment="Center"
HorizontalAlignment="Stretch"
RecognizesAccessKey="True"

2
src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml

@ -92,7 +92,7 @@
<ContentPresenter Name="PART_HeaderPresenter"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding ItemTemplate}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
VerticalAlignment="Center"
HorizontalAlignment="Stretch"
RecognizesAccessKey="True"

3
src/Avalonia.Themes.Simple/Controls/Menu.xaml

@ -17,7 +17,8 @@
<Panel>
<ContentPresenter Name="PART_HeaderPresenter"
Margin="{TemplateBinding Padding}"
Content="{TemplateBinding Header}">
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}">
<ContentPresenter.DataTemplates>
<DataTemplate DataType="sys:String">
<AccessText Text="{Binding}" />

2
src/Avalonia.Themes.Simple/Controls/MenuItem.xaml

@ -43,7 +43,7 @@
Margin="{TemplateBinding Padding}"
VerticalAlignment="Center"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding ItemTemplate}">
ContentTemplate="{TemplateBinding HeaderTemplate}">
<ContentPresenter.DataTemplates>
<DataTemplate DataType="sys:String">
<AccessText Text="{Binding}" />

6
src/Avalonia.X11/X11Window.cs

@ -23,6 +23,7 @@ using Avalonia.Threading;
using Avalonia.X11.Glx;
using Avalonia.X11.NativeDialogs;
using static Avalonia.X11.XLib;
using Avalonia.Input.Platform;
// ReSharper disable IdentifierTypo
// ReSharper disable StringLiteralTypo
@ -828,6 +829,11 @@ namespace Avalonia.X11
return _nativeControlHost;
}
if (featureType == typeof(IClipboard))
{
return AvaloniaLocator.Current.GetRequiredService<IClipboard>();
}
return null;
}

9
src/Browser/Avalonia.Browser/BrowserTopLevelImpl.cs

@ -8,6 +8,7 @@ using Avalonia.Browser.Storage;
using Avalonia.Controls;
using Avalonia.Controls.Platform;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Input.Raw;
using Avalonia.Input.TextInput;
using Avalonia.Platform;
@ -31,6 +32,7 @@ namespace Avalonia.Browser
private readonly INativeControlHostImpl _nativeControlHost;
private readonly IStorageProvider _storageProvider;
private readonly ISystemNavigationManagerImpl _systemNavigationManager;
private readonly ClipboardImpl _clipboard;
private readonly IInsetsManager? _insetsManager;
public BrowserTopLevelImpl(AvaloniaView avaloniaView)
@ -46,7 +48,7 @@ namespace Avalonia.Browser
_nativeControlHost = _avaloniaView.GetNativeControlHostImpl();
_storageProvider = new BrowserStorageProvider();
_systemNavigationManager = new BrowserSystemNavigationManagerImpl();
_clipboard = new ClipboardImpl();
}
public ulong Timestamp => (ulong)_sw.ElapsedMilliseconds;
@ -282,6 +284,11 @@ namespace Avalonia.Browser
return _insetsManager;
}
if (featureType == typeof(IClipboard))
{
return _clipboard;
}
return null;
}
}

1
src/Browser/Avalonia.Browser/WindowingPlatform.cs

@ -36,7 +36,6 @@ namespace Avalonia.Browser
s_keyboard = new KeyboardDevice();
AvaloniaLocator.CurrentMutable
.Bind<IRuntimePlatform>().ToSingleton<BrowserRuntimePlatform>()
.Bind<IClipboard>().ToSingleton<ClipboardImpl>()
.Bind<ICursorFactory>().ToSingleton<CssCursorFactory>()
.Bind<IKeyboardDevice>().ToConstant(s_keyboard)
.Bind<IPlatformSettings>().ToSingleton<BrowserPlatformSettings>()

7
src/Skia/Avalonia.Skia/CombinedGeometryImpl.cs

@ -1,4 +1,5 @@
using Avalonia.Media;
using Avalonia.Platform;
using SkiaSharp;
namespace Avalonia.Skia
@ -15,10 +16,10 @@ namespace Avalonia.Skia
Bounds = (stroke ?? fill)?.TightBounds.ToAvaloniaRect() ?? default;
}
public static CombinedGeometryImpl ForceCreate(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
public static CombinedGeometryImpl ForceCreate(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2)
{
if (g1.PlatformImpl is GeometryImpl i1
&& g2.PlatformImpl is GeometryImpl i2
if (g1 is GeometryImpl i1
&& g2 is GeometryImpl i2
&& TryCreate(combineMode, i1, i2) is { } result)
return result;

7
src/Skia/Avalonia.Skia/GeometryGroupImpl.cs

@ -1,5 +1,6 @@
using System.Collections.Generic;
using Avalonia.Media;
using Avalonia.Platform;
using SkiaSharp;
namespace Avalonia.Skia
@ -9,7 +10,7 @@ namespace Avalonia.Skia
/// </summary>
internal class GeometryGroupImpl : GeometryImpl
{
public GeometryGroupImpl(FillRule fillRule, IReadOnlyList<Geometry> children)
public GeometryGroupImpl(FillRule fillRule, IReadOnlyList<IGeometryImpl> children)
{
var fillType = fillRule == FillRule.NonZero ? SKPathFillType.Winding : SKPathFillType.EvenOdd;
var count = children.Count;
@ -22,7 +23,7 @@ namespace Avalonia.Skia
bool requiresFillPass = false;
for (var i = 0; i < count; ++i)
{
if (children[i].PlatformImpl is GeometryImpl geo)
if (children[i] is GeometryImpl geo)
{
if (geo.StrokePath != null)
stroke.AddPath(geo.StrokePath);
@ -42,7 +43,7 @@ namespace Avalonia.Skia
for (var i = 0; i < count; ++i)
{
if (children[i].PlatformImpl is GeometryImpl { FillPath: { } fillPath })
if (children[i] is GeometryImpl { FillPath: { } fillPath })
fill.AddPath(fillPath);
}

4
src/Skia/Avalonia.Skia/PlatformRenderInterface.cs

@ -58,12 +58,12 @@ namespace Avalonia.Skia
return new StreamGeometryImpl();
}
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children)
{
return new GeometryGroupImpl(fillRule, children);
}
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2)
{
return CombinedGeometryImpl.ForceCreate(combineMode, g1, g2);
}

4
src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs

@ -158,8 +158,8 @@ namespace Avalonia.Direct2D1
public IGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2);
public IGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect);
public IStreamGeometryImpl CreateStreamGeometry() => new StreamGeometryImpl();
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children) => new GeometryGroupImpl(fillRule, children);
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2) => new CombinedGeometryImpl(combineMode, g1, g2);
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children) => new GeometryGroupImpl(fillRule, children);
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2) => new CombinedGeometryImpl(combineMode, g1, g2);
public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize,
IReadOnlyList<GlyphInfo> glyphInfos, Point baselineOrigin)

13
src/Windows/Avalonia.Direct2D1/Media/CombinedGeometryImpl.cs

@ -1,3 +1,4 @@
using Avalonia.Platform;
using SharpDX.Direct2D1;
using AM = Avalonia.Media;
@ -13,19 +14,19 @@ namespace Avalonia.Direct2D1.Media
/// </summary>
public CombinedGeometryImpl(
AM.GeometryCombineMode combineMode,
AM.Geometry geometry1,
AM.Geometry geometry2)
IGeometryImpl geometry1,
IGeometryImpl geometry2)
: base(CreateGeometry(combineMode, geometry1, geometry2))
{
}
private static Geometry CreateGeometry(
AM.GeometryCombineMode combineMode,
AM.Geometry geometry1,
AM.Geometry geometry2)
IGeometryImpl geometry1,
IGeometryImpl geometry2)
{
var g1 = ((GeometryImpl)geometry1.PlatformImpl).Geometry;
var g2 = ((GeometryImpl)geometry2.PlatformImpl).Geometry;
var g1 = ((GeometryImpl)geometry1).Geometry;
var g2 = ((GeometryImpl)geometry2).Geometry;
var dest = new PathGeometry(Direct2D1Platform.Direct2D1Factory);
using var sink = dest.Open();
g1.Combine(g2, (CombineMode)combineMode, sink);

7
src/Windows/Avalonia.Direct2D1/Media/GeometryGroupImpl.cs

@ -1,4 +1,5 @@
using System.Collections.Generic;
using Avalonia.Platform;
using SharpDX.Direct2D1;
using AM = Avalonia.Media;
@ -12,19 +13,19 @@ namespace Avalonia.Direct2D1.Media
/// <summary>
/// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
/// </summary>
public GeometryGroupImpl(AM.FillRule fillRule, IReadOnlyList<AM.Geometry> geometry)
public GeometryGroupImpl(AM.FillRule fillRule, IReadOnlyList<IGeometryImpl> geometry)
: base(CreateGeometry(fillRule, geometry))
{
}
private static Geometry CreateGeometry(AM.FillRule fillRule, IReadOnlyList<AM.Geometry> children)
private static Geometry CreateGeometry(AM.FillRule fillRule, IReadOnlyList<IGeometryImpl> children)
{
var count = children.Count;
var c = new Geometry[count];
for (var i = 0; i < count; ++i)
{
c[i] = ((GeometryImpl)children[i].PlatformImpl).Geometry;
c[i] = ((GeometryImpl)children[i]).Geometry;
}
return new GeometryGroup(Direct2D1Platform.Direct2D1Factory, (FillMode)fillRule, c);

2
src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs

@ -729,7 +729,7 @@ namespace Avalonia.Win32
{
case GCS.GCS_RESULTSTR:
{
if(ToInt32(wParam) >= 32)
if(!string.IsNullOrEmpty(previousComposition) && ToInt32(wParam) >= 32)
{
Imm32InputMethod.Current.Composition = previousComposition;

6
src/Windows/Avalonia.Win32/WindowImpl.cs

@ -24,6 +24,7 @@ using Avalonia.Win32.OpenGl;
using Avalonia.Win32.WinRT.Composition;
using Avalonia.Win32.WinRT;
using static Avalonia.Win32.Interop.UnmanagedMethods;
using Avalonia.Input.Platform;
namespace Avalonia.Win32
{
@ -332,6 +333,11 @@ namespace Avalonia.Win32
return _storageProvider;
}
if (featureType == typeof(IClipboard))
{
return AvaloniaLocator.Current.GetRequiredService<IClipboard>();
}
return null;
}

9
src/iOS/Avalonia.iOS/AvaloniaView.cs

@ -4,6 +4,7 @@ using Avalonia.Controls;
using Avalonia.Controls.Embedding;
using Avalonia.Controls.Platform;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Input.Raw;
using Avalonia.Input.TextInput;
using Avalonia.iOS.Storage;
@ -87,6 +88,8 @@ namespace Avalonia.iOS
private readonly INativeControlHostImpl _nativeControlHost;
private readonly IStorageProvider _storageProvider;
internal readonly InsetsManager _insetsManager;
private readonly ClipboardImpl _clipboard;
public AvaloniaView View => _view;
public TopLevelImpl(AvaloniaView view)
@ -99,6 +102,7 @@ namespace Avalonia.iOS
{
view._topLevel.Padding = b ? default : _insetsManager.SafeAreaPadding;
};
_clipboard = new ClipboardImpl();
}
public void Dispose()
@ -196,6 +200,11 @@ namespace Avalonia.iOS
return _insetsManager;
}
if (featureType == typeof(IClipboard))
{
return _clipboard;
}
return null;
}
}

1
src/iOS/Avalonia.iOS/Platform.cs

@ -39,7 +39,6 @@ namespace Avalonia.iOS
.Bind<IPlatformGraphics>().ToConstant(GlFeature)
.Bind<ICursorFactory>().ToConstant(new CursorFactoryStub())
.Bind<IWindowingPlatform>().ToConstant(new WindowingPlatformStub())
.Bind<IClipboard>().ToConstant(new ClipboardImpl())
.Bind<IPlatformSettings>().ToSingleton<PlatformSettings>()
.Bind<IPlatformIconLoader>().ToConstant(new PlatformIconLoaderStub())
.Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>()

29
src/tools/DevGenerators/CompositionGenerator/Generator.cs

@ -170,21 +170,26 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
if (manual.ServerName != null)
serverPropertyType = manual.ServerName + (isNullable ? "?" : "");
}
if (animatedServer)
server = server.AddMembers(
DeclareField(serverPropertyType, fieldName),
PropertyDeclaration(ParseTypeName(serverPropertyType), prop.Name)
.AddModifiers(SyntaxKind.PublicKeyword)
.WithExpressionBody(ArrowExpressionClause(
InvocationExpression(IdentifierName("GetAnimatedValue"),
ArgumentList(SeparatedList(new[]{
Argument(IdentifierName(CompositionPropertyField(prop))),
Argument(null, Token(SyntaxKind.RefKeyword), IdentifierName(fieldName))
}
)))))
.WithSemicolonToken(Semicolon())
);
.AddAccessorListAccessors(
AccessorDeclaration(SyntaxKind.GetAccessorDeclaration).WithExpressionBody(
ArrowExpressionClause(
InvocationExpression(IdentifierName("GetAnimatedValue"),
ArgumentList(SeparatedList(new[]
{
Argument(IdentifierName(CompositionPropertyField(prop))),
Argument(null, Token(SyntaxKind.RefKeyword),
IdentifierName(fieldName))
}
))))).WithSemicolonToken(Semicolon()),
AccessorDeclaration(SyntaxKind.SetAccessorDeclaration)
.WithExpressionBody(ArrowExpressionClause(
ParseExpression($"SetAnimatedValue({CompositionPropertyField(prop)}, out {PropertyBackingFieldName(prop)}, value)")))
.WithSemicolonToken(Semicolon())));
else
{
server = server
@ -508,9 +513,7 @@ var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
code += $@"
if((changed & {changedFieldsType}.{prop.Name}) == {changedFieldsType}.{prop.Name})
";
if (prop.Animated)
code += $"SetAnimatedValue({CompositionPropertyField(prop)}, out {PropertyBackingFieldName(prop)}, {readValueCode});";
else code += $"{prop.Name} = {readValueCode};";
code += $"{prop.Name} = {readValueCode};";
return body.AddStatements(ParseStatement(code));
}

30
tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Inheritance.cs

@ -1,5 +1,10 @@
using System.Collections.Generic;
using Avalonia.Controls;
using Avalonia.Controls.Documents;
using Avalonia.Data;
using Avalonia.Media;
using Avalonia.Styling;
using Avalonia.UnitTests;
using Xunit;
namespace Avalonia.Base.UnitTests
@ -90,6 +95,31 @@ namespace Avalonia.Base.UnitTests
Assert.Equal(1, raised);
}
[Fact]
public void ClearValue_On_Parent_Raises_PropertyChanged_On_Child_With_Inherited_Grandparent_Value()
{
var grandparent = new Class1();
var parent = new Class2 { Parent = grandparent };
var child = new Class2 { Parent = parent };
var raised = 0;
grandparent.SetValue(Class1.BazProperty, "grandparent");
parent.SetValue(Class1.BazProperty, "parent");
child.PropertyChanged += (s, e) =>
{
Assert.Same(child, e.Sender);
Assert.Equal("parent", e.OldValue);
Assert.Equal("grandparent", e.NewValue);
Assert.Equal(BindingPriority.Inherited, e.Priority);
++raised;
};
parent.ClearValue(Class1.BazProperty);
Assert.Equal(1, raised);
}
[Fact]
public void Setting_InheritanceParent_Raises_PropertyChanged_When_Parent_Has_Value_Set()
{

19
tests/Avalonia.Base.UnitTests/Media/GlyphRunTests.cs

@ -1,22 +1,13 @@
using System;
using System.Linq;
using Avalonia.Media;
using Avalonia.Media.TextFormatting;
using Avalonia.Platform;
using Avalonia.UnitTests;
using Avalonia.Utilities;
using Xunit;
namespace Avalonia.Base.UnitTests.Media
{
public class GlyphRunTests : TestWithServicesBase
{
public GlyphRunTests()
{
AvaloniaLocator.CurrentMutable
.Bind<IPlatformRenderInterface>().ToSingleton<MockPlatformRenderInterface>();
}
[InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 0, 0)]
[InlineData(new double[] { 30, 0, 0 }, new int[] { 0, 0, 0 }, 0, 3, 30)]
[InlineData(new double[] { 10, 10, 10 }, new int[] { 0, 1, 2 }, 1, 0, 10)]
@ -25,7 +16,7 @@ namespace Avalonia.Base.UnitTests.Media
[Theory]
public void Should_Get_Distance_From_CharacterHit(double[] advances, int[] clusters, int start, int trailingLength, double expectedDistance)
{
using(UnitTestApplication.Start(TestServices.StyledWindow))
using (Start())
using (var glyphRun = CreateGlyphRun(advances, clusters))
{
var characterHit = new CharacterHit(start, trailingLength);
@ -44,7 +35,7 @@ namespace Avalonia.Base.UnitTests.Media
public void Should_Get_CharacterHit_FromDistance(double[] advances, int[] clusters, double distance, int start,
int trailingLengthExpected, bool isInsideExpected)
{
using(UnitTestApplication.Start(TestServices.StyledWindow))
using (Start())
using (var glyphRun = CreateGlyphRun(advances, clusters))
{
var textBounds = glyphRun.GetCharacterHitFromDistance(distance, out var isInside);
@ -190,5 +181,11 @@ namespace Avalonia.Base.UnitTests.Media
return new GlyphRun(new MockGlyphTypeface(), 10, new string('a', count).AsMemory(), glyphInfos, biDiLevel: bidiLevel);
}
private static IDisposable Start()
{
return UnitTestApplication.Start(TestServices.StyledWindow.With(
renderInterface: new MockPlatformRenderInterface()));
}
}
}

4
tests/Avalonia.Base.UnitTests/VisualTree/MockRenderInterface.cs

@ -30,12 +30,12 @@ namespace Avalonia.Base.UnitTests.VisualTree
return new MockStreamGeometry();
}
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children)
{
throw new NotImplementedException();
}
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2)
{
throw new NotImplementedException();
}

4
tests/Avalonia.Benchmarks/NullRenderingPlatform.cs

@ -32,12 +32,12 @@ namespace Avalonia.Benchmarks
return new MockStreamGeometryImpl();
}
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children)
{
throw new NotImplementedException();
}
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2)
{
throw new NotImplementedException();
}

78
tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs

@ -9,8 +9,10 @@ using Avalonia.Controls.Templates;
using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Layout;
using Avalonia.Media;
using Avalonia.Platform;
using Avalonia.Rendering;
using Avalonia.UnitTests;
using Moq;
using Xunit;
@ -107,7 +109,7 @@ namespace Avalonia.Controls.UnitTests
[Fact]
public void CaretIndex_Can_Moved_To_Position_After_The_End_Of_Text_With_Arrow_Key()
{
using (Start(TestServices.StyledWindow))
using (Start())
{
var target = new MaskedTextBox
{
@ -182,7 +184,7 @@ namespace Avalonia.Controls.UnitTests
[Fact]
public void Control_Backspace_Should_Remove_The_Word_Before_The_Caret_If_There_Is_No_Selection()
{
using (Start(TestServices.StyledWindow))
using (Start())
{
MaskedTextBox textBox = new MaskedTextBox
{
@ -224,7 +226,7 @@ namespace Avalonia.Controls.UnitTests
[Fact]
public void Control_Delete_Should_Remove_The_Word_After_The_Caret_If_There_Is_No_Selection()
{
using (Start(TestServices.StyledWindow))
using (Start())
{
var textBox = new MaskedTextBox
{
@ -810,7 +812,7 @@ namespace Avalonia.Controls.UnitTests
bool fromClipboard,
string expected)
{
using (Start(TestServices.StyledWindow))
using (Start())
{
var target = new MaskedTextBox
{
@ -820,18 +822,25 @@ namespace Avalonia.Controls.UnitTests
SelectionStart = selectionStart,
SelectionEnd = selectionEnd
};
var impl = CreateMockTopLevelImpl();
var topLevel = new TestTopLevel(impl.Object)
{
Template = CreateTopLevelTemplate()
};
topLevel.Content = target;
topLevel.ApplyTemplate();
topLevel.LayoutManager.ExecuteInitialLayoutPass();
target.ApplyTemplate();
if (fromClipboard)
{
AvaloniaLocator.CurrentMutable.Bind<IClipboard>().ToSingleton<ClipboardStub>();
var clipboard = AvaloniaLocator.CurrentMutable.GetRequiredService<IClipboard>();
clipboard.SetTextAsync(textInput).GetAwaiter().GetResult();
topLevel.Clipboard?.SetTextAsync(textInput).GetAwaiter().GetResult();
RaiseKeyEvent(target, Key.V, KeyModifiers.Control);
clipboard.ClearAsync().GetAwaiter().GetResult();
topLevel.Clipboard?.ClearAsync().GetAwaiter().GetResult();
}
else
{
@ -859,10 +868,18 @@ namespace Avalonia.Controls.UnitTests
AcceptsReturn = true,
AcceptsTab = true
};
var impl = CreateMockTopLevelImpl();
var topLevel = new TestTopLevel(impl.Object)
{
Template = CreateTopLevelTemplate()
};
topLevel.Content = target;
topLevel.ApplyTemplate();
topLevel.LayoutManager.ExecuteInitialLayoutPass();
target.SelectionStart = 1;
target.SelectionEnd = 3;
AvaloniaLocator.CurrentMutable
.Bind<Input.Platform.IClipboard>().ToSingleton<ClipboardStub>();
RaiseKeyEvent(target, key, modifiers);
RaiseKeyEvent(target, Key.Z, KeyModifiers.Control); // undo
@ -881,6 +898,7 @@ namespace Avalonia.Controls.UnitTests
standardCursorFactory: Mock.Of<ICursorFactory>());
private static TestServices Services => TestServices.MockThreadingInterface.With(
renderInterface: new MockPlatformRenderInterface(),
standardCursorFactory: Mock.Of<ICursorFactory>(),
textShaperImpl: new MockTextShaperImpl(),
fontManagerImpl: new MockFontManagerImpl());
@ -951,7 +969,7 @@ namespace Avalonia.Controls.UnitTests
}
}
private class ClipboardStub : IClipboard // in order to get tests working that use the clipboard
internal class ClipboardStub : IClipboard // in order to get tests working that use the clipboard
{
private string _text;
@ -976,6 +994,40 @@ namespace Avalonia.Controls.UnitTests
public Task<object> GetDataAsync(string format) => Task.FromResult((object)null);
}
private class TestTopLevel : TopLevel
{
private readonly ILayoutManager _layoutManager;
public TestTopLevel(ITopLevelImpl impl, ILayoutManager layoutManager = null)
: base(impl)
{
_layoutManager = layoutManager ?? new LayoutManager(this);
}
protected override ILayoutManager CreateLayoutManager() => _layoutManager;
}
private static Mock<ITopLevelImpl> CreateMockTopLevelImpl()
{
var clipboard = new Mock<ITopLevelImpl>();
clipboard.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>()))
.Returns(RendererMocks.CreateRenderer().Object);
clipboard.Setup(r => r.TryGetFeature(typeof(IClipboard)))
.Returns(new ClipboardStub());
clipboard.SetupGet(x => x.RenderScaling).Returns(1);
return clipboard;
}
private static FuncControlTemplate<TestTopLevel> CreateTopLevelTemplate()
{
return new FuncControlTemplate<TestTopLevel>((x, scope) =>
new ContentPresenter
{
Name = "PART_ContentPresenter",
[!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
}.RegisterInNameScope(scope));
}
private class TestContextMenu : ContextMenu
{
public TestContextMenu()

45
tests/Avalonia.Controls.UnitTests/MenuItemTests.cs

@ -3,7 +3,9 @@ using System.Collections.Generic;
using System.Text;
using System.Windows.Input;
using Avalonia.Collections;
using Avalonia.Controls.Presenters;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates;
using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Platform;
@ -348,6 +350,47 @@ namespace Avalonia.Controls.UnitTests
}
}
[Fact]
public void Menu_ItemTemplate_Should_Be_Applied_To_TopLevel_MenuItem_Header()
{
using var app = Application();
var items = new[]
{
new MenuViewModel("Foo"),
new MenuViewModel("Bar"),
};
var itemTemplate = new FuncDataTemplate<MenuViewModel>((x, _) =>
new TextBlock { Text = x.Header });
var menu = new Menu
{
ItemTemplate = itemTemplate,
ItemsSource = items,
};
var window = new Window { Content = menu };
window.LayoutManager.ExecuteInitialLayoutPass();
var panel = Assert.IsType<StackPanel>(menu.Presenter.Panel);
Assert.Equal(2, panel.Children.Count);
for (var i = 0; i < panel.Children.Count; i++)
{
var menuItem = Assert.IsType<MenuItem>(panel.Children[i]);
Assert.Equal(items[i], menuItem.Header);
Assert.Same(itemTemplate, menuItem.HeaderTemplate);
var headerPresenter = Assert.IsType<ContentPresenter>(menuItem.HeaderPresenter);
Assert.Same(itemTemplate, headerPresenter.ContentTemplate);
var headerControl = Assert.IsType<TextBlock>(headerPresenter.Child);
Assert.Equal(items[i].Header, headerControl.Text);
}
}
private IDisposable Application()
{
var screen = new PixelRect(new PixelPoint(), new PixelSize(100, 100));
@ -401,5 +444,7 @@ namespace Avalonia.Controls.UnitTests
public void RaiseCanExecuteChanged() => _canExecuteChanged?.Invoke(this, EventArgs.Empty);
}
private record MenuViewModel(string Header);
}
}

83
tests/Avalonia.Controls.UnitTests/TextBoxTests.cs

@ -11,6 +11,7 @@ using Avalonia.Input.Platform;
using Avalonia.Layout;
using Avalonia.Media;
using Avalonia.Platform;
using Avalonia.Rendering;
using Avalonia.UnitTests;
using Moq;
using Xunit;
@ -760,18 +761,24 @@ namespace Avalonia.Controls.UnitTests
SelectionStart = selectionStart,
SelectionEnd = selectionEnd
};
var impl = CreateMockTopLevelImpl();
var topLevel = new TestTopLevel(impl.Object)
{
Template = CreateTopLevelTemplate()
};
topLevel.Content = target;
topLevel.ApplyTemplate();
topLevel.LayoutManager.ExecuteInitialLayoutPass();
target.Measure(Size.Infinity);
if (fromClipboard)
{
AvaloniaLocator.CurrentMutable.Bind<IClipboard>().ToSingleton<ClipboardStub>();
var clipboard = AvaloniaLocator.CurrentMutable.GetRequiredService<IClipboard>();
clipboard.SetTextAsync(textInput).GetAwaiter().GetResult();
topLevel.Clipboard?.SetTextAsync(textInput).GetAwaiter().GetResult();
RaiseKeyEvent(target, Key.V, KeyModifiers.Control);
clipboard.ClearAsync().GetAwaiter().GetResult();
topLevel.Clipboard?.ClearAsync().GetAwaiter().GetResult();
}
else
{
@ -799,11 +806,19 @@ namespace Avalonia.Controls.UnitTests
AcceptsReturn = true,
AcceptsTab = true
};
var impl = CreateMockTopLevelImpl();
var topLevel = new TestTopLevel(impl.Object)
{
Template = CreateTopLevelTemplate()
};
topLevel.Content = target;
topLevel.ApplyTemplate();
topLevel.LayoutManager.ExecuteInitialLayoutPass();
target.ApplyTemplate();
target.SelectionStart = 1;
target.SelectionEnd = 3;
AvaloniaLocator.CurrentMutable
.Bind<Input.Platform.IClipboard>().ToSingleton<ClipboardStub>();
RaiseKeyEvent(target, key, modifiers);
RaiseKeyEvent(target, Key.Z, KeyModifiers.Control); // undo
@ -872,15 +887,21 @@ namespace Avalonia.Controls.UnitTests
AcceptsReturn= true
};
target.Measure(Size.Infinity);
var impl = CreateMockTopLevelImpl();
var topLevel = new TestTopLevel(impl.Object)
{
Template = CreateTopLevelTemplate()
};
topLevel.Content = target;
topLevel.ApplyTemplate();
topLevel.LayoutManager.ExecuteInitialLayoutPass();
AvaloniaLocator.CurrentMutable.Bind<IClipboard>().ToSingleton<ClipboardStub>();
target.Measure(Size.Infinity);
var clipboard = AvaloniaLocator.CurrentMutable.GetRequiredService<IClipboard>();
clipboard.SetTextAsync(Environment.NewLine).GetAwaiter().GetResult();
topLevel.Clipboard?.SetTextAsync(Environment.NewLine).GetAwaiter().GetResult();
RaiseKeyEvent(target, Key.V, KeyModifiers.Control);
clipboard.ClearAsync().GetAwaiter().GetResult();
topLevel.Clipboard?.ClearAsync().GetAwaiter().GetResult();
RaiseTextEvent(target, Environment.NewLine);
@ -1176,7 +1197,41 @@ namespace Avalonia.Controls.UnitTests
public Task<object> GetDataAsync(string format) => Task.FromResult((object)null);
}
private class TestTopLevel : TopLevel
{
private readonly ILayoutManager _layoutManager;
public TestTopLevel(ITopLevelImpl impl, ILayoutManager layoutManager = null)
: base(impl)
{
_layoutManager = layoutManager ?? new LayoutManager(this);
}
protected override ILayoutManager CreateLayoutManager() => _layoutManager;
}
private static Mock<ITopLevelImpl> CreateMockTopLevelImpl()
{
var clipboard = new Mock<ITopLevelImpl>();
clipboard.Setup(r => r.CreateRenderer(It.IsAny<IRenderRoot>()))
.Returns(RendererMocks.CreateRenderer().Object);
clipboard.Setup(r => r.TryGetFeature(typeof(IClipboard)))
.Returns(new ClipboardStub());
clipboard.SetupGet(x => x.RenderScaling).Returns(1);
return clipboard;
}
private static FuncControlTemplate<TestTopLevel> CreateTopLevelTemplate()
{
return new FuncControlTemplate<TestTopLevel>((x, scope) =>
new ContentPresenter
{
Name = "PART_ContentPresenter",
[!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
}.RegisterInNameScope(scope));
}
private class TestContextMenu : ContextMenu
{
public TestContextMenu()

2
tests/Avalonia.Controls.UnitTests/TopLevelTests.cs

@ -2,6 +2,7 @@ using System;
using Avalonia.Controls.Presenters;
using Avalonia.Controls.Templates;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Input.Raw;
using Avalonia.Layout;
using Avalonia.LogicalTree;
@ -11,6 +12,7 @@ using Avalonia.Styling;
using Avalonia.UnitTests;
using Moq;
using Xunit;
using static Avalonia.Controls.UnitTests.MaskedTextBoxTests;
namespace Avalonia.Controls.UnitTests
{

29
tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

@ -722,6 +722,33 @@ namespace Avalonia.Controls.UnitTests
Assert.True(called);
}
[Fact]
public void SelectedItem_Should_Be_Valid_When_SelectedItemChanged_Event_Raised()
{
using var app = Start();
var data = CreateTestTreeData();
var target = CreateTarget(data: data);
var item = data[0].Children[1].Children[0];
var container = Assert.IsType<TreeViewItem>(target.TreeContainerFromItem(item));
Assert.NotNull(container);
var called = false;
target.SelectionChanged += (s, e) =>
{
Assert.Same(item, e.AddedItems[0]);
Assert.Same(item, target.SelectedItem);
called = true;
};
_mouse.Click(container);
Assert.Equal(item, target.SelectedItem);
Assert.True(container.IsSelected);
Assert.True(called);
}
[Fact]
public void Bound_SelectedItem_Should_Not_Be_Cleared_when_Changing_Selection()
{
@ -756,7 +783,7 @@ namespace Avalonia.Controls.UnitTests
using var app = Start();
var data = CreateTestTreeData();
var target = CreateTarget(data: data, expandAll: false);
target.SelectedItem = data[0].Children[1];
var rootItem = Assert.IsType<TreeViewItem>(target.ContainerFromIndex(0));

4
tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs

@ -72,12 +72,12 @@ namespace Avalonia.UnitTests
return new MockStreamGeometryImpl();
}
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children)
{
return Mock.Of<IGeometryImpl>();
}
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2)
{
return Mock.Of<IGeometryImpl>();
}

Loading…
Cancel
Save