/// When implemented in a derived class, unsubscribes from the previous source.
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/FuncTransformNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/FuncTransformNode.cs
index 7ad0b7ee97..1eb15d2469 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/FuncTransformNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/FuncTransformNode.cs
@@ -21,8 +21,11 @@ internal sealed class FuncTransformNode : ExpressionNode
// We don't have enough information to add anything here.
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
SetValue(_transform(source));
}
}
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalAncestorElementNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalAncestorElementNode.cs
index ccf6c76f90..b15f285867 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalAncestorElementNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalAncestorElementNode.cs
@@ -56,8 +56,11 @@ internal sealed class LogicalAncestorElementNode : SourceNode
return target is ILogical logical && logical.IsAttachedToLogicalTree;
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
if (source is ILogical logical)
{
var locator = ControlLocator.Track(logical, _ancestorLevel, _ancestorType);
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalNotNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalNotNode.cs
index bb65ac16dd..8b1102b463 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalNotNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/LogicalNotNode.cs
@@ -28,14 +28,12 @@ internal sealed class LogicalNotNode : ExpressionNode, ISettableNode
return false;
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
var v = BindingNotification.ExtractValue(source);
if (TryConvert(v, out var value))
- {
SetValue(BindingNotification.UpdateValue(source, !value), dataValidationError);
- }
else
SetError($"Unable to convert '{source}' to bool.");
}
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/MethodCommandNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/MethodCommandNode.cs
index 76ea564320..e0641f1461 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/MethodCommandNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/MethodCommandNode.cs
@@ -39,8 +39,11 @@ internal sealed class MethodCommandNode : ExpressionNode, IWeakEventSubscriber(source);
if (_plugin.Start(reference, PropertyName) is { } accessor)
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginPropertyAccessorNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginPropertyAccessorNode.cs
index d1ecc13208..533520d35c 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginPropertyAccessorNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginPropertyAccessorNode.cs
@@ -42,8 +42,11 @@ internal sealed class DynamicPluginPropertyAccessorNode : ExpressionNode, IPrope
return _accessor?.SetValue(value, BindingPriority.LocalValue) ?? false;
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
var reference = new WeakReference(source);
if (GetPlugin(source) is { } plugin &&
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs
index 70b0f710a2..f6c692e685 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/DynamicPluginStreamNode.cs
@@ -16,8 +16,11 @@ internal sealed class DynamicPluginStreamNode : ExpressionNode
builder.Append('^');
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
var reference = new WeakReference(source);
if (GetPlugin(reference) is { } plugin &&
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionIndexerNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionIndexerNode.cs
index 52526431dc..abc7d80744 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionIndexerNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionIndexerNode.cs
@@ -52,8 +52,11 @@ internal sealed class ReflectionIndexerNode : CollectionNodeBase, ISettableNode
return true;
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
_indexes = null;
if (GetIndexer(source.GetType(), out _getter, out _setter))
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionTypeCastNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionTypeCastNode.cs
index c973d9d236..8b356603a6 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionTypeCastNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/Reflection/ReflectionTypeCastNode.cs
@@ -19,8 +19,11 @@ internal sealed class ReflectionTypeCastNode : ExpressionNode
builder.Append(')');
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
if (_targetType.IsInstanceOfType(source))
SetValue(source);
else
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/StreamNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/StreamNode.cs
index 19e5a58828..32ccc9e214 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/StreamNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/StreamNode.cs
@@ -23,8 +23,11 @@ internal sealed class StreamNode : ExpressionNode, IObserver
void IObserver.OnError(Exception error) { }
void IObserver.OnNext(object? value) => SetValue(value);
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
if (_plugin.Start(new(source)) is { } accessor)
{
_subscription = accessor.Subscribe(this);
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/TemplatedParentNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/TemplatedParentNode.cs
index 6e81a01cee..3dca520fa7 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/TemplatedParentNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/TemplatedParentNode.cs
@@ -22,8 +22,11 @@ internal sealed class TemplatedParentNode : SourceNode
throw new InvalidOperationException("Cannot find a StyledElement to get a TemplatedParent.");
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
if (source is StyledElement newElement)
{
newElement.PropertyChanged += OnPropertyChanged;
diff --git a/src/Avalonia.Base/Data/Core/ExpressionNodes/VisualAncestorElementNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNodes/VisualAncestorElementNode.cs
index 4bca2c8cb4..4cf27d8968 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNodes/VisualAncestorElementNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodes/VisualAncestorElementNode.cs
@@ -56,8 +56,11 @@ internal sealed class VisualAncestorElementNode : SourceNode
return target is Visual visual && visual.IsAttachedToVisualTree;
}
- protected override void OnSourceChanged(object source, Exception? dataValidationError)
+ protected override void OnSourceChanged(object? source, Exception? dataValidationError)
{
+ if (!ValidateNonNullSource(source))
+ return;
+
if (source is Visual visual)
{
var locator = VisualLocator.Track(visual, _ancestorLevel, _ancestorType);
diff --git a/src/Avalonia.Base/Data/Core/IBinding2.cs b/src/Avalonia.Base/Data/Core/IBinding2.cs
index 5e57bedd09..1dcbc15b0c 100644
--- a/src/Avalonia.Base/Data/Core/IBinding2.cs
+++ b/src/Avalonia.Base/Data/Core/IBinding2.cs
@@ -15,6 +15,6 @@ internal interface IBinding2 : IBinding
{
BindingExpressionBase Instance(
AvaloniaObject target,
- AvaloniaProperty targetProperty,
+ AvaloniaProperty? targetProperty,
object? anchor);
}
diff --git a/src/Avalonia.Base/Data/Core/MultiBindingExpression.cs b/src/Avalonia.Base/Data/Core/MultiBindingExpression.cs
new file mode 100644
index 0000000000..cd012f9b21
--- /dev/null
+++ b/src/Avalonia.Base/Data/Core/MultiBindingExpression.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Data.Core;
+
+internal class MultiBindingExpression : UntypedBindingExpressionBase, IBindingExpressionSink
+{
+ private static readonly object s_uninitialized = new object();
+ private readonly IBinding[] _bindings;
+ private readonly IMultiValueConverter? _converter;
+ private readonly CultureInfo? _converterCulture;
+ private readonly object? _converterParameter;
+ private readonly UntypedBindingExpressionBase?[] _expressions;
+ private readonly object? _fallbackValue;
+ private readonly object? _targetNullValue;
+ private readonly object?[] _values;
+ private readonly ReadOnlyCollection _valuesView;
+
+ public MultiBindingExpression(
+ BindingPriority priority,
+ IList bindings,
+ IMultiValueConverter? converter,
+ CultureInfo? converterCulture,
+ object? converterParameter,
+ object? fallbackValue,
+ object? targetNullValue)
+ : base(priority)
+ {
+ _bindings = [.. bindings];
+ _converter = converter;
+ _converterCulture = converterCulture;
+ _converterParameter = converterParameter;
+ _expressions = new UntypedBindingExpressionBase[_bindings.Length];
+ _fallbackValue = fallbackValue;
+ _targetNullValue = targetNullValue;
+ _values = new object?[_bindings.Length];
+ _valuesView = new(_values);
+
+#if NETSTANDARD2_0
+ for (var i = 0; i < _bindings.Length; ++i)
+ _values[i] = s_uninitialized;
+#else
+ Array.Fill(_values, s_uninitialized);
+#endif
+ }
+
+ public override string Description => "MultiBinding";
+
+ protected override void StartCore()
+ {
+ if (!TryGetTarget(out var target))
+ throw new AvaloniaInternalException("MultiBindingExpression has no target.");
+
+ for (var i = 0; i < _bindings.Length; ++i)
+ {
+ var binding = _bindings[i];
+
+ if (binding is not IBinding2 b)
+ throw new NotSupportedException($"Unsupported IBinding implementation '{binding}'.");
+
+ var expression = b.Instance(target, null, null);
+
+ if (expression is not UntypedBindingExpressionBase e)
+ throw new NotSupportedException($"Unsupported BindingExpressionBase implementation '{expression}'.");
+
+ _expressions[i] = e;
+ e.AttachAndStart(this, target, null, Priority);
+ }
+ }
+
+ protected override void StopCore()
+ {
+ for (var i = 0; i < _expressions.Length; ++i)
+ {
+ _expressions[i]?.Dispose();
+ _expressions[i] = null;
+ _values[i] = s_uninitialized;
+ }
+ }
+
+ void IBindingExpressionSink.OnChanged(
+ UntypedBindingExpressionBase instance,
+ bool hasValueChanged,
+ bool hasErrorChanged,
+ object? value,
+ BindingError? error)
+ {
+ var i = Array.IndexOf(_expressions, instance);
+ Debug.Assert(i != -1);
+
+ _values[i] = BindingNotification.ExtractValue(value);
+ PublishValue();
+ }
+
+ void IBindingExpressionSink.OnCompleted(UntypedBindingExpressionBase instance)
+ {
+ // Nothing to do here.
+ }
+
+ private void PublishValue()
+ {
+ foreach (var v in _values)
+ {
+ if (v == s_uninitialized)
+ return;
+ }
+
+ if (_converter is not null)
+ {
+ var culture = _converterCulture ?? CultureInfo.CurrentCulture;
+ var converted = _converter.Convert(_valuesView, TargetType, _converterParameter, culture);
+
+ converted = BindingNotification.ExtractValue(converted);
+
+ if (converted != BindingOperations.DoNothing)
+ {
+ if (converted == null)
+ converted = _targetNullValue;
+ if (converted == AvaloniaProperty.UnsetValue)
+ converted = _fallbackValue;
+ PublishValue(converted);
+ }
+ }
+ else
+ {
+ PublishValue(_valuesView);
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs b/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
index 6164d8ec33..5c2d9aaddf 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/BindingPlugins.cs
@@ -12,7 +12,6 @@ namespace Avalonia.Data.Core.Plugins
internal static readonly List s_propertyAccessors = new()
{
new AvaloniaPropertyAccessorPlugin(),
- new ReflectionMethodAccessorPlugin(),
new InpcPropertyAccessorPlugin(),
};
@@ -29,6 +28,20 @@ namespace Avalonia.Data.Core.Plugins
new ObservableStreamPlugin(),
};
+ static BindingPlugins()
+ {
+ // When building with AOT, don't create ReflectionMethodAccessorPlugin instance.
+ // This branch can be eliminated in compile time with AOT.
+#if NET6_0_OR_GREATER
+ if (System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported)
+#else
+ if (true)
+#endif
+ {
+ s_propertyAccessors.Insert(1, new ReflectionMethodAccessorPlugin());
+ }
+ }
+
///
/// An ordered collection of property accessor plugins that can be used to customize
/// the reading and subscription of property values on a type.
diff --git a/src/Avalonia.Base/Data/Core/TargetTypeConverter.cs b/src/Avalonia.Base/Data/Core/TargetTypeConverter.cs
index 2efc5b42bd..7f934c4e41 100644
--- a/src/Avalonia.Base/Data/Core/TargetTypeConverter.cs
+++ b/src/Avalonia.Base/Data/Core/TargetTypeConverter.cs
@@ -23,6 +23,11 @@ internal abstract class TargetTypeConverter
private class DefaultConverter : TargetTypeConverter
{
+ // TypeDescriptor.GetConverter might require unreferenced code for some generic types.
+ // But it's normally not the case in Avalonia. Additionally, compiled bindings will preserve referenced types.
+ [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = TrimmingMessages.TypeConversionSupressWarningMessage)]
+ [UnconditionalSuppressMessage("Trimming", "IL2067", Justification = TrimmingMessages.TypeConversionSupressWarningMessage)]
+ [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = TrimmingMessages.TypeConversionSupressWarningMessage)]
public override bool TryConvert(object? value, Type type, CultureInfo culture, out object? result)
{
if (value?.GetType() == type)
@@ -66,9 +71,6 @@ internal abstract class TargetTypeConverter
return true;
}
-#pragma warning disable IL2026
-#pragma warning disable IL2067
-#pragma warning disable IL2072
// TODO: TypeConverters are not trimming friendly in some edge cases, we probably need
// to make compiled bindings emit conversion code at compile-time.
var toTypeConverter = TypeDescriptor.GetConverter(t);
@@ -76,16 +78,32 @@ internal abstract class TargetTypeConverter
if (toTypeConverter.CanConvertFrom(from))
{
- result = toTypeConverter.ConvertFrom(null, culture, value);
- return true;
+ try
+ {
+ result = toTypeConverter.ConvertFrom(null, culture, value);
+ return true;
+ }
+ catch
+ {
+ result = null;
+ return false;
+ }
}
var fromTypeConverter = TypeDescriptor.GetConverter(from);
if (fromTypeConverter.CanConvertTo(t))
{
- result = fromTypeConverter.ConvertTo(null, culture, value, t);
- return true;
+ try
+ {
+ result = fromTypeConverter.ConvertTo(null, culture, value, t);
+ return true;
+ }
+ catch
+ {
+ result = null;
+ return false;
+ }
}
// TODO: This requires reflection: we probably need to make compiled bindings emit
@@ -95,11 +113,17 @@ internal abstract class TargetTypeConverter
t,
OperatorType.Implicit | OperatorType.Explicit) is { } cast)
{
- result = cast.Invoke(null, new[] { value });
- return true;
+ try
+ {
+ result = cast.Invoke(null, new[] { value });
+ return true;
+ }
+ catch
+ {
+ result = null;
+ return false;
+ }
}
-#pragma warning restore IL2067
-#pragma warning restore IL2026
if (value is IConvertible convertible)
{
diff --git a/src/Avalonia.Base/Data/Core/UntypedBindingExpressionBase.cs b/src/Avalonia.Base/Data/Core/UntypedBindingExpressionBase.cs
index 9b6e260f95..6b52bbe259 100644
--- a/src/Avalonia.Base/Data/Core/UntypedBindingExpressionBase.cs
+++ b/src/Avalonia.Base/Data/Core/UntypedBindingExpressionBase.cs
@@ -39,12 +39,16 @@ public abstract class UntypedBindingExpressionBase : BindingExpressionBase,
///
/// The default binding priority for the expression.
///
+ /// The target property being bound to.
/// Whether data validation is enabled.
public UntypedBindingExpressionBase(
BindingPriority defaultPriority,
+ AvaloniaProperty? targetProperty = null,
bool isDataValidationEnabled = false)
{
Priority = defaultPriority;
+ TargetProperty = targetProperty;
+ TargetType = targetProperty?.PropertyType ?? typeof(object);
_isDataValidationEnabled = isDataValidationEnabled;
}
@@ -86,7 +90,7 @@ public abstract class UntypedBindingExpressionBase : BindingExpressionBase,
/// Gets the target type of the binding expression; that is, the type that values produced by
/// the expression should be converted to.
///
- public Type TargetType { get; private set; } = typeof(object);
+ public Type TargetType { get; private set; }
AvaloniaProperty IValueEntry.Property => TargetProperty ?? throw new Exception();
@@ -200,7 +204,7 @@ public abstract class UntypedBindingExpressionBase : BindingExpressionBase,
internal void AttachAndStart(
IBindingExpressionSink subscriber,
AvaloniaObject target,
- AvaloniaProperty targetProperty,
+ AvaloniaProperty? targetProperty,
BindingPriority priority)
{
AttachCore(subscriber, null, target, targetProperty, priority);
@@ -257,17 +261,19 @@ public abstract class UntypedBindingExpressionBase : BindingExpressionBase,
IBindingExpressionSink sink,
ImmediateValueFrame? frame,
AvaloniaObject target,
- AvaloniaProperty targetProperty,
+ AvaloniaProperty? targetProperty,
BindingPriority priority)
{
if (_sink is not null)
throw new InvalidOperationException("BindingExpression was already attached.");
+ if (TargetProperty is not null && TargetProperty != targetProperty)
+ throw new InvalidOperationException("BindingExpression was already attached to a different property.");
_sink = sink;
_frame = frame;
_target = new(target);
TargetProperty = targetProperty;
- TargetType = targetProperty.PropertyType;
+ TargetType = targetProperty?.PropertyType ?? typeof(object);
Priority = priority;
}
@@ -403,6 +409,9 @@ public abstract class UntypedBindingExpressionBase : BindingExpressionBase,
/// The new binding or data validation error.
private protected void PublishValue(object? value, BindingError? error = null)
{
+ Debug.Assert(value is not BindingNotification);
+ Debug.Assert(value != BindingOperations.DoNothing);
+
if (!IsRunning)
return;
diff --git a/src/Avalonia.Base/Data/Core/UntypedObservableBindingExpression.cs b/src/Avalonia.Base/Data/Core/UntypedObservableBindingExpression.cs
index 1e26caa051..df529d8675 100644
--- a/src/Avalonia.Base/Data/Core/UntypedObservableBindingExpression.cs
+++ b/src/Avalonia.Base/Data/Core/UntypedObservableBindingExpression.cs
@@ -30,5 +30,18 @@ internal class UntypedObservableBindingExpression : UntypedBindingExpressionBase
void IObserver.OnCompleted() { }
void IObserver.OnError(Exception error) { }
- void IObserver.OnNext(object? value) => PublishValue(value);
+
+ void IObserver.OnNext(object? value)
+ {
+ if (value is BindingNotification n)
+ {
+ var v = n.Value;
+ var e = n.Error is not null ? new BindingError(n.Error, n.ErrorType) : null;
+ PublishValue(v, e);
+ }
+ else
+ {
+ PublishValue(value);
+ }
+ }
}
diff --git a/src/Avalonia.Base/Data/IndexerBinding.cs b/src/Avalonia.Base/Data/IndexerBinding.cs
index 02bde6f774..d12beb114b 100644
--- a/src/Avalonia.Base/Data/IndexerBinding.cs
+++ b/src/Avalonia.Base/Data/IndexerBinding.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Data
return new InstancedBinding(expression, Mode, BindingPriority.LocalValue);
}
- BindingExpressionBase IBinding2.Instance(AvaloniaObject target, AvaloniaProperty targetProperty, object? anchor)
+ BindingExpressionBase IBinding2.Instance(AvaloniaObject target, AvaloniaProperty? targetProperty, object? anchor)
{
return new IndexerBindingExpression(Source, Property, target, targetProperty, Mode);
}
diff --git a/src/Avalonia.Base/Data/TemplateBinding.cs b/src/Avalonia.Base/Data/TemplateBinding.cs
index db878620b4..2b0e054c07 100644
--- a/src/Avalonia.Base/Data/TemplateBinding.cs
+++ b/src/Avalonia.Base/Data/TemplateBinding.cs
@@ -5,6 +5,7 @@ using System.Globalization;
using Avalonia.Data.Converters;
using Avalonia.Data.Core;
using Avalonia.Logging;
+using Avalonia.Metadata;
using Avalonia.Styling;
namespace Avalonia.Data
@@ -20,13 +21,14 @@ namespace Avalonia.Data
IDisposable
{
private bool _isSetterValue;
+ private bool _hasPublishedValue;
public TemplateBinding()
: base(BindingPriority.Template)
{
}
- public TemplateBinding(AvaloniaProperty property)
+ public TemplateBinding([InheritDataTypeFrom(InheritDataTypeFromScopeKind.ControlTemplate)] AvaloniaProperty property)
: base(BindingPriority.Template)
{
Property = property;
@@ -64,6 +66,7 @@ namespace Avalonia.Data
///
/// Gets or sets the name of the source property on the templated parent.
///
+ [InheritDataTypeFrom(InheritDataTypeFromScopeKind.ControlTemplate)]
public AvaloniaProperty? Property { get; set; }
///
@@ -80,7 +83,7 @@ namespace Avalonia.Data
return new(target, InstanceCore(), Mode, BindingPriority.Template);
}
- BindingExpressionBase IBinding2.Instance(AvaloniaObject target, AvaloniaProperty property, object? anchor)
+ BindingExpressionBase IBinding2.Instance(AvaloniaObject target, AvaloniaProperty? property, object? anchor)
{
return InstanceCore();
}
@@ -106,6 +109,7 @@ namespace Avalonia.Data
protected override void StartCore()
{
+ _hasPublishedValue = false;
OnTemplatedParentChanged();
if (TryGetTarget(out var target))
target.PropertyChanged += OnTargetPropertyChanged;
@@ -197,11 +201,12 @@ namespace Avalonia.Data
value = ConvertToTargetType(value);
PublishValue(value, error);
+ _hasPublishedValue = true;
if (Mode == BindingMode.OneTime)
Stop();
}
- else
+ else if (_hasPublishedValue)
{
PublishValue(AvaloniaProperty.UnsetValue);
}
diff --git a/src/Avalonia.Base/Diagnostics/AppliedStyle.cs b/src/Avalonia.Base/Diagnostics/AppliedStyle.cs
deleted file mode 100644
index 90390a85da..0000000000
--- a/src/Avalonia.Base/Diagnostics/AppliedStyle.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Avalonia.Styling;
-
-namespace Avalonia.Diagnostics
-{
- public sealed class AppliedStyle
- {
- private readonly IStyleInstance _instance;
-
- internal AppliedStyle(IStyleInstance instance)
- {
- _instance = instance;
- }
-
- public bool HasActivator => _instance.HasActivator;
- public bool IsActive => _instance.IsActive;
- public StyleBase Style => (StyleBase)_instance.Source;
- }
-}
diff --git a/src/Avalonia.Base/Diagnostics/IValueFrameDiagnostic.cs b/src/Avalonia.Base/Diagnostics/IValueFrameDiagnostic.cs
new file mode 100644
index 0000000000..df48efe04e
--- /dev/null
+++ b/src/Avalonia.Base/Diagnostics/IValueFrameDiagnostic.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using Avalonia.Data;
+using Avalonia.Metadata;
+
+namespace Avalonia.Diagnostics;
+
+public record ValueEntryDiagnostic(AvaloniaProperty Property, object? Value);
+
+[Unstable]
+[NotClientImplementable]
+public interface IValueFrameDiagnostic
+{
+ public enum FrameType
+ {
+ Unknown = 0,
+ Local,
+ Theme,
+ Style,
+ Template
+ }
+
+ string? Description { get; }
+ FrameType Type { get; }
+ bool IsActive { get; }
+ BindingPriority Priority { get; }
+ IEnumerable Values { get; }
+}
diff --git a/src/Avalonia.Base/Diagnostics/LocalValueFrameDiagnostic.cs b/src/Avalonia.Base/Diagnostics/LocalValueFrameDiagnostic.cs
new file mode 100644
index 0000000000..96d72c1480
--- /dev/null
+++ b/src/Avalonia.Base/Diagnostics/LocalValueFrameDiagnostic.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using Avalonia.Data;
+
+namespace Avalonia.Diagnostics;
+
+internal class LocalValueFrameDiagnostic : IValueFrameDiagnostic
+{
+ public LocalValueFrameDiagnostic(IEnumerable values)
+ {
+ Values = values;
+ }
+
+ public string? Description => null;
+ public IValueFrameDiagnostic.FrameType Type => IValueFrameDiagnostic.FrameType.Local;
+ public bool IsActive => true;
+ public BindingPriority Priority => BindingPriority.LocalValue;
+ public IEnumerable Values { get; }
+}
diff --git a/src/Avalonia.Base/Diagnostics/StyleDiagnostics.cs b/src/Avalonia.Base/Diagnostics/StyleDiagnostics.cs
deleted file mode 100644
index 90326891c6..0000000000
--- a/src/Avalonia.Base/Diagnostics/StyleDiagnostics.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Styling;
-
-namespace Avalonia.Diagnostics
-{
- ///
- /// Contains information about style related diagnostics of a control.
- ///
- public class StyleDiagnostics
- {
- ///
- /// Currently applied styles.
- ///
- public IReadOnlyList AppliedStyles { get; }
-
- public StyleDiagnostics(IReadOnlyList appliedStyles)
- {
- AppliedStyles = appliedStyles;
- }
- }
-}
diff --git a/src/Avalonia.Base/Diagnostics/StyleValueFrameDiagnostic.cs b/src/Avalonia.Base/Diagnostics/StyleValueFrameDiagnostic.cs
new file mode 100644
index 0000000000..03d901cee2
--- /dev/null
+++ b/src/Avalonia.Base/Diagnostics/StyleValueFrameDiagnostic.cs
@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using Avalonia.Data;
+using Avalonia.PropertyStore;
+using Avalonia.Styling;
+
+namespace Avalonia.Diagnostics;
+
+internal class StyleValueFrameDiagnostic : IValueFrameDiagnostic
+{
+ private readonly StyleInstance _styleInstance;
+
+ internal StyleValueFrameDiagnostic(StyleInstance styleInstance)
+ {
+ _styleInstance = styleInstance;
+ }
+
+ public string? Description => _styleInstance.Source switch
+ {
+ Style s => GetFullSelector(s),
+ ControlTheme t => t.TargetType?.Name,
+ _ => null
+ };
+
+ public IValueFrameDiagnostic.FrameType Type => _styleInstance.Source switch
+ {
+ Style => IValueFrameDiagnostic.FrameType.Style,
+ ControlTheme => IValueFrameDiagnostic.FrameType.Theme,
+ _ => IValueFrameDiagnostic.FrameType.Unknown
+ };
+
+ public bool IsActive => _styleInstance.IsActive();
+ public BindingPriority Priority => _styleInstance.FramePriority.ToBindingPriority();
+ public IEnumerable Values
+ {
+ get
+ {
+ foreach (var setter in ((StyleBase)_styleInstance.Source!).Setters)
+ {
+ if (setter is Setter { Property: not null } regularSetter)
+ {
+ yield return new ValueEntryDiagnostic(regularSetter.Property, regularSetter.Value);
+ }
+ }
+ }
+ }
+
+ private string GetFullSelector(Style? style)
+ {
+ var selectors = new Stack();
+
+ while (style is not null)
+ {
+ if (style.Selector is not null)
+ {
+ selectors.Push(style.Selector.ToString());
+ }
+
+ style = style.Parent as Style;
+ }
+
+ return string.Concat(selectors);
+ }
+}
diff --git a/src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs b/src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs
index d7bcc1aa47..32bbe78218 100644
--- a/src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs
+++ b/src/Avalonia.Base/Diagnostics/StyledElementExtensions.cs
@@ -1,17 +1,16 @@
-namespace Avalonia.Diagnostics
+namespace Avalonia.Diagnostics;
+
+///
+/// Defines diagnostic extensions on s.
+///
+public static class StyledElementExtensions
{
///
- /// Defines diagnostic extensions on s.
+ /// Gets a style diagnostics for a .
///
- public static class StyledElementExtensions
+ /// The element.
+ public static ValueStoreDiagnostic GetValueStoreDiagnostic(this StyledElement styledElement)
{
- ///
- /// Gets a style diagnostics for a .
- ///
- /// The element.
- public static StyleDiagnostics GetStyleDiagnostics(this StyledElement styledElement)
- {
- return styledElement.GetStyleDiagnosticsInternal();
- }
+ return styledElement.GetValueStore().GetStoreDiagnostic();
}
}
diff --git a/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs b/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs
index 37c2831a50..ce9c9e187b 100644
--- a/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs
+++ b/src/Avalonia.Base/Diagnostics/TrimmingMessages.cs
@@ -27,4 +27,5 @@ internal static class TrimmingMessages
public const string XamlTypeResolvedRequiresUnreferenceCodeMessage = "XamlTypeResolver might require unreferenced code.";
public const string IgnoreNativeAotSupressWarningMessage = "This method is not supported by NativeAOT.";
+ public const string DesignTimeSupressWarningMessage = "This method is design time only.";
}
diff --git a/src/Avalonia.Base/Diagnostics/ValueFrameDiagnostic.cs b/src/Avalonia.Base/Diagnostics/ValueFrameDiagnostic.cs
new file mode 100644
index 0000000000..9b28cf0cdb
--- /dev/null
+++ b/src/Avalonia.Base/Diagnostics/ValueFrameDiagnostic.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using Avalonia.Data;
+using Avalonia.PropertyStore;
+using Avalonia.Styling;
+
+namespace Avalonia.Diagnostics;
+
+internal sealed class ValueFrameDiagnostic : IValueFrameDiagnostic
+{
+ private readonly ValueFrame _valueFrame;
+
+ internal ValueFrameDiagnostic(ValueFrame valueFrame)
+ {
+ _valueFrame = valueFrame;
+ }
+
+ public string? Description => (_valueFrame.Owner?.Owner as StyledElement)?.StyleKey.Name;
+
+ public IValueFrameDiagnostic.FrameType Type => IValueFrameDiagnostic.FrameType.Template;
+
+ public bool IsActive => _valueFrame.IsActive();
+ public BindingPriority Priority => _valueFrame.FramePriority.ToBindingPriority();
+ public IEnumerable Values
+ {
+ get
+ {
+ for (var i = 0; i < _valueFrame.EntryCount; i++)
+ {
+ var entry = _valueFrame.GetEntry(i);
+ if (entry.HasValue())
+ {
+ yield return new ValueEntryDiagnostic(entry.Property, entry.GetValue());
+ }
+ }
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Diagnostics/ValueStoreDiagnostic.cs b/src/Avalonia.Base/Diagnostics/ValueStoreDiagnostic.cs
new file mode 100644
index 0000000000..e4880cdc76
--- /dev/null
+++ b/src/Avalonia.Base/Diagnostics/ValueStoreDiagnostic.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using Avalonia.Styling;
+
+namespace Avalonia.Diagnostics;
+
+public class ValueStoreDiagnostic
+{
+ ///
+ /// Currently applied frames.
+ ///
+ public IReadOnlyList AppliedFrames { get; }
+
+ internal ValueStoreDiagnostic(IReadOnlyList appliedFrames)
+ {
+ AppliedFrames = appliedFrames;
+ }
+}
diff --git a/src/Avalonia.Base/DirectProperty.cs b/src/Avalonia.Base/DirectProperty.cs
index 3efe003710..28e8a38827 100644
--- a/src/Avalonia.Base/DirectProperty.cs
+++ b/src/Avalonia.Base/DirectProperty.cs
@@ -32,7 +32,6 @@ namespace Avalonia
{
Getter = getter ?? throw new ArgumentNullException(nameof(getter));
Setter = setter;
- IsDirect = true;
IsReadOnly = setter is null;
}
@@ -52,7 +51,6 @@ namespace Avalonia
{
Getter = getter ?? throw new ArgumentNullException(nameof(getter));
Setter = setter;
- IsDirect = true;
IsReadOnly = setter is null;
}
diff --git a/src/Avalonia.Base/DirectPropertyBase.cs b/src/Avalonia.Base/DirectPropertyBase.cs
index b6b9967177..09f8cbdc7b 100644
--- a/src/Avalonia.Base/DirectPropertyBase.cs
+++ b/src/Avalonia.Base/DirectPropertyBase.cs
@@ -28,6 +28,7 @@ namespace Avalonia
AvaloniaPropertyMetadata metadata)
: base(name, ownerType, ownerType, metadata)
{
+ IsDirect = true;
Owner = ownerType;
}
@@ -43,6 +44,7 @@ namespace Avalonia
AvaloniaPropertyMetadata metadata)
: base(source, ownerType, metadata)
{
+ IsDirect = true;
Owner = ownerType;
}
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
index baaf63f112..469ad1e6e9 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/ScrollGestureRecognizer.cs
@@ -1,5 +1,6 @@
using System;
using System.Diagnostics;
+using Avalonia.Platform;
using Avalonia.Threading;
namespace Avalonia.Input.GestureRecognizers
@@ -13,7 +14,8 @@ namespace Avalonia.Input.GestureRecognizers
private bool _canHorizontallyScroll;
private bool _canVerticallyScroll;
private bool _isScrollInertiaEnabled;
- private int _scrollStartDistance = 30;
+ private readonly static int s_defaultScrollStartDistance = (int)((AvaloniaLocator.Current?.GetService()?.GetTapSize(PointerType.Touch).Height ?? 10) / 2);
+ private int _scrollStartDistance = s_defaultScrollStartDistance;
private bool _scrolling;
private Point _trackedRootPoint;
@@ -54,7 +56,7 @@ namespace Avalonia.Input.GestureRecognizers
public static readonly DirectProperty ScrollStartDistanceProperty =
AvaloniaProperty.RegisterDirect(nameof(ScrollStartDistance),
o => o.ScrollStartDistance, (o, v) => o.ScrollStartDistance = v,
- unsetValue: 30);
+ unsetValue: s_defaultScrollStartDistance);
///
/// Gets or sets a value indicating whether the content can be scrolled horizontally.
diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index 00e478bfdb..156178c061 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -64,23 +64,23 @@ namespace Avalonia.Input
public static readonly RoutedEvent PointerTouchPadGestureMagnifyEvent =
RoutedEvent.Register(
- "PointerMagnifyGesture", RoutingStrategies.Bubble, typeof(Gestures));
+ "PointerTouchPadGestureMagnify", RoutingStrategies.Bubble, typeof(Gestures));
public static readonly RoutedEvent PointerTouchPadGestureRotateEvent =
RoutedEvent.Register(
- "PointerRotateGesture", RoutingStrategies.Bubble, typeof(Gestures));
+ "PointerTouchPadGestureRotate", RoutingStrategies.Bubble, typeof(Gestures));
public static readonly RoutedEvent PointerTouchPadGestureSwipeEvent =
RoutedEvent.Register(
- "PointerSwipeGesture", RoutingStrategies.Bubble, typeof(Gestures));
+ "PointerTouchPadGestureSwipe", RoutingStrategies.Bubble, typeof(Gestures));
public static readonly RoutedEvent PinchEvent =
RoutedEvent.Register(
- "PinchEvent", RoutingStrategies.Bubble, typeof(Gestures));
+ "Pinch", RoutingStrategies.Bubble, typeof(Gestures));
public static readonly RoutedEvent PinchEndedEvent =
RoutedEvent.Register(
- "PinchEndedEvent", RoutingStrategies.Bubble, typeof(Gestures));
+ "PinchEnded", RoutingStrategies.Bubble, typeof(Gestures));
public static readonly RoutedEvent PullGestureEvent =
RoutedEvent.Register(
diff --git a/src/Avalonia.Base/Input/KeyGesture.cs b/src/Avalonia.Base/Input/KeyGesture.cs
index 9ee8ae9711..122176a127 100644
--- a/src/Avalonia.Base/Input/KeyGesture.cs
+++ b/src/Avalonia.Base/Input/KeyGesture.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.Text;
+using Avalonia.Input.Platform;
using Avalonia.Utilities;
namespace Avalonia.Input
@@ -9,7 +10,7 @@ namespace Avalonia.Input
///
/// Defines a keyboard input combination.
///
- public sealed class KeyGesture : IEquatable
+ public sealed class KeyGesture : IEquatable, IFormattable
{
private static readonly Dictionary s_keySynonyms = new Dictionary
{
@@ -95,8 +96,28 @@ namespace Avalonia.Input
return new KeyGesture(key, keyModifiers);
}
- public override string ToString()
+ public override string ToString() => ToString(null, null);
+
+ ///
+ /// Returns the current KeyGesture as a string formatted according to the format string and appropriate IFormatProvider
+ ///
+ /// The format to use.
+ ///
+ /// - null or "" or "g"The Invariant format, uses Enum.ToString() to format Keys.
+ /// - "p"Use platform specific formatting as registerd.
+ ///
+ /// The IFormatProvider to use. If null, uses the appropriate provider registered in the Avalonia Locator, or Invariant.
+ /// The formatted string.
+ /// Thrown if the format string is not null, "", "g", or "p"
+ public string ToString(string? format, IFormatProvider? formatProvider)
{
+ var formatInfo = format switch
+ {
+ null or "" or "g" => KeyGestureFormatInfo.Invariant,
+ "p" => KeyGestureFormatInfo.GetInstance(formatProvider),
+ _ => throw new FormatException("Unknown format specifier")
+ };
+
var s = StringBuilderCache.Acquire();
static void Plus(StringBuilder s)
@@ -109,29 +130,29 @@ namespace Avalonia.Input
if (KeyModifiers.HasAllFlags(KeyModifiers.Control))
{
- s.Append("Ctrl");
+ s.Append(formatInfo.Ctrl);
}
if (KeyModifiers.HasAllFlags(KeyModifiers.Shift))
{
Plus(s);
- s.Append("Shift");
+ s.Append(formatInfo.Shift);
}
if (KeyModifiers.HasAllFlags(KeyModifiers.Alt))
{
Plus(s);
- s.Append("Alt");
+ s.Append(formatInfo.Alt);
}
if (KeyModifiers.HasAllFlags(KeyModifiers.Meta))
{
Plus(s);
- s.Append("Cmd");
+ s.Append(formatInfo.Meta);
}
Plus(s);
- s.Append(Key);
+ s.Append(formatInfo.FormatKey(Key));
return StringBuilderCache.GetStringAndRelease(s);
}
diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
index b97036c7dd..fc60551606 100644
--- a/src/Avalonia.Base/Input/MouseDevice.cs
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -205,6 +205,7 @@ namespace Avalonia.Input
{
_pointer.Capture(null);
_pointer.CaptureGestureRecognizer(null);
+ _pointer.IsGestureRecognitionSkipped = false;
_lastMouseDownButton = default;
}
return e.Handled;
@@ -304,5 +305,10 @@ namespace Avalonia.Input
{
return _pointer;
}
+
+ internal void PlatformCaptureLost()
+ {
+ _pointer.Capture(null);
+ }
}
}
diff --git a/src/Avalonia.Base/Input/Navigation/XYFocus.Impl.cs b/src/Avalonia.Base/Input/Navigation/XYFocus.Impl.cs
index 867e80f176..b2a79aa3b9 100644
--- a/src/Avalonia.Base/Input/Navigation/XYFocus.Impl.cs
+++ b/src/Avalonia.Base/Input/Navigation/XYFocus.Impl.cs
@@ -92,6 +92,11 @@ public partial class XYFocus
return null;
}
+ if(!(XYFocusHelpers.FindXYSearchRoot(inputElement, keyDeviceType) is InputElement searchRoot))
+ {
+ return null;
+ }
+
_instance.SetManifoldsFromBounds(bounds);
return _instance.GetNextFocusableElement(direction, inputElement, engagedControl, true, new XYFocusOptions
@@ -99,7 +104,7 @@ public partial class XYFocus
KeyDeviceType = keyDeviceType,
FocusedElementBounds = bounds,
UpdateManifold = true,
- SearchRoot = owner as InputElement ?? inputElement.GetVisualRoot() as InputElement
+ SearchRoot = searchRoot
});
}
diff --git a/src/Avalonia.Base/Input/Navigation/XYFocusHelpers.cs b/src/Avalonia.Base/Input/Navigation/XYFocusHelpers.cs
index 1914f6f6c6..7bdcfc8fb9 100644
--- a/src/Avalonia.Base/Input/Navigation/XYFocusHelpers.cs
+++ b/src/Avalonia.Base/Input/Navigation/XYFocusHelpers.cs
@@ -1,4 +1,5 @@
using System;
+using Avalonia.VisualTree;
namespace Avalonia.Input;
@@ -13,11 +14,25 @@ internal static class XYFocusHelpers
{
return keyDeviceType switch
{
- null => true, // programmatic input, allow any subtree.
+ null => !modes.Equals(XYFocusNavigationModes.Disabled), // programmatic input, allow any subtree except Disabled.
KeyDeviceType.Keyboard => modes.HasFlag(XYFocusNavigationModes.Keyboard),
KeyDeviceType.Gamepad => modes.HasFlag(XYFocusNavigationModes.Gamepad),
KeyDeviceType.Remote => modes.HasFlag(XYFocusNavigationModes.Remote),
_ => throw new ArgumentOutOfRangeException(nameof(keyDeviceType), keyDeviceType, null)
};
}
+
+ internal static InputElement? FindXYSearchRoot(this InputElement visual, KeyDeviceType? keyDeviceType)
+ {
+ InputElement candidate = visual;
+ InputElement? candidateParent = visual.FindAncestorOfType();
+
+ while (candidateParent is not null && candidateParent.IsAllowedXYNavigationMode(keyDeviceType))
+ {
+ candidate = candidateParent;
+ candidateParent = candidate.FindAncestorOfType();
+ }
+
+ return candidate;
+ }
}
diff --git a/src/Avalonia.Base/Input/PenDevice.cs b/src/Avalonia.Base/Input/PenDevice.cs
index 128a49e13b..f8cb713e73 100644
--- a/src/Avalonia.Base/Input/PenDevice.cs
+++ b/src/Avalonia.Base/Input/PenDevice.cs
@@ -167,6 +167,7 @@ namespace Avalonia.Input
{
pointer.Capture(null);
pointer.CaptureGestureRecognizer(null);
+ pointer.IsGestureRecognitionSkipped = false;
_lastMouseDownButton = default;
}
diff --git a/src/Avalonia.Base/Input/Platform/KeyGestureFormatInfo.cs b/src/Avalonia.Base/Input/Platform/KeyGestureFormatInfo.cs
new file mode 100644
index 0000000000..9eb95bf3f8
--- /dev/null
+++ b/src/Avalonia.Base/Input/Platform/KeyGestureFormatInfo.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Input.Platform
+{
+
+ ///
+ /// Provides platform specific formatting information for the KeyGesture class
+ ///
+ /// A dictionary of Key to String overrides for specific characters, for example Key.Left to "Left Arrow" or "←" on Mac.
+ /// A null value is assumed to be the Invariant, so the included set of common overrides will be skipped if this is null. If only the common overrides are
+ /// desired, pass an empty Dictionary instead.
+ /// The string to use for the Meta modifier, defaults to "Cmd"
+ /// The string to use for the Ctrl modifier, defaults to "Ctrl"
+ /// The string to use for the Alt modifier, defaults to "Alt"
+ /// The string to use for the Shift modifier, defaults to "Shift"
+ public sealed class KeyGestureFormatInfo(IReadOnlyDictionary? platformKeyOverrides = null,
+ string meta = "Cmd",
+ string ctrl = "Ctrl",
+ string alt = "Alt",
+ string shift = "Shift") : IFormatProvider
+ {
+ ///
+ /// The Invariant format. Only uses strings straight from the appropriate Enums.
+ ///
+ public static KeyGestureFormatInfo Invariant { get; } = new();
+
+ ///
+ /// The string used to represent Meta on the appropriate platform. Defaults to "Cmd".
+ ///
+ public string Meta { get; } = meta;
+
+ ///
+ /// The string used to represent Ctrl on the appropriate platform. Defaults to "Ctrl".
+ ///
+ public string Ctrl { get; } = ctrl;
+
+ ///
+ /// The string used to represent Alt on the appropriate platform. Defaults to "Alt".
+ ///
+ public string Alt { get; } = alt;
+
+ ///
+ /// The string used to represent Shift on the appropriate platform. Defaults to "Shift".
+ ///
+ public string Shift { get; } = shift;
+
+ public object? GetFormat(Type? formatType) => formatType == typeof(KeyGestureFormatInfo) ? this : null;
+
+ ///
+ /// Gets the most appropriate KeyGestureFormatInfo for the IFormatProvider requested. This will be, in order:
+ /// 1. The provided IFormatProvider as a KeyGestureFormatInfo
+ /// 2. The currently registered platform specific KeyGestureFormatInfo, if present.
+ /// 3. The Invariant otherwise.
+ ///
+ /// The IFormatProvider to get a KeyGestureFormatInfo for.
+ ///
+ public static KeyGestureFormatInfo GetInstance(IFormatProvider? formatProvider)
+ => formatProvider?.GetFormat(typeof(KeyGestureFormatInfo)) as KeyGestureFormatInfo
+ ?? AvaloniaLocator.Current.GetService()
+ ?? Invariant;
+
+ ///
+ /// A dictionary of the common platform Key overrides. These are used as a fallback
+ /// if platformKeyOverrides doesn't contain the Key in question.
+ ///
+
+ private static readonly Dictionary s_commonKeyOverrides = new()
+ {
+ { Key.Add , "+" },
+ { Key.D0 , "0" },
+ { Key.D1 , "1" },
+ { Key.D2 , "2" },
+ { Key.D3 , "3" },
+ { Key.D4 , "4" },
+ { Key.D5 , "5" },
+ { Key.D6 , "6" },
+ { Key.D7 , "7" },
+ { Key.D8 , "8" },
+ { Key.D9 , "9" },
+ { Key.Decimal , "." },
+ { Key.Divide , "/" },
+ { Key.Multiply , "*" },
+ { Key.OemBackslash , "\\" },
+ { Key.OemCloseBrackets , "]" },
+ { Key.OemComma , "," },
+ { Key.OemMinus , "-" },
+ { Key.OemOpenBrackets , "[" },
+ { Key.OemPeriod , "." },
+ { Key.OemPipe , "|" },
+ { Key.OemPlus , "+" },
+ { Key.OemQuestion , "/" },
+ { Key.OemQuotes , "\"" },
+ { Key.OemSemicolon , ";" },
+ { Key.OemTilde , "`" },
+ { Key.Separator , "/" },
+ { Key.Subtract , "-" },
+ { Key.Back , "Backspace" },
+ { Key.Down , "Down Arrow" },
+ { Key.Left , "Left Arrow" },
+ { Key.Right , "Right Arrow" },
+ { Key.Up , "Up Arrow" }
+ };
+
+ ///
+ /// Checks the platformKeyOverrides and s_commonKeyOverrides Dictionaries, in order, for the appropriate
+ /// string to represent the given Key on this platform.
+ /// NOTE: If platformKeyOverrides is null, this is assumed to be the Invariant and the Dictionaries are not checked.
+ /// The plain Enum string is returned instead.
+ ///
+ /// The Key to format.
+ /// The appropriate platform specific or common override if present, key.ToString() if not or this is the Invariant.
+ public string FormatKey(Key key)
+ {
+ /*
+ * The absence of an Overrides dictionary indicates this is the invariant, and
+ * so should just return the default ToString() value.
+ */
+ if (platformKeyOverrides == null)
+ return key.ToString();
+
+ return platformKeyOverrides.TryGetValue(key, out string? result) ? result :
+ s_commonKeyOverrides.TryGetValue(key, out string? cresult) ? cresult :
+ key.ToString() ;
+
+ }
+
+
+ }
+}
diff --git a/src/Avalonia.Base/Input/TextInput/TextInputMethodClient.cs b/src/Avalonia.Base/Input/TextInput/TextInputMethodClient.cs
index 61a6d3e30a..ca91b861a8 100644
--- a/src/Avalonia.Base/Input/TextInput/TextInputMethodClient.cs
+++ b/src/Avalonia.Base/Input/TextInput/TextInputMethodClient.cs
@@ -64,6 +64,12 @@ namespace Avalonia.Input.TextInput
///
public virtual void SetPreeditText(string? preeditText) { }
+ ///
+ /// Execute specific context menu actions
+ ///
+ /// The to perform
+ public virtual void ExecuteContextMenuAction(ContextMenuAction action) { }
+
///
/// Sets the non-committed input string and cursor offset in that string
///
@@ -71,6 +77,8 @@ namespace Avalonia.Input.TextInput
{
SetPreeditText(preeditText);
}
+
+ public virtual void ShowInputPanel() { }
protected virtual void RaiseTextViewVisualChanged()
{
@@ -99,4 +107,12 @@ namespace Avalonia.Input.TextInput
}
public record struct TextSelection(int Start, int End);
+
+ public enum ContextMenuAction
+ {
+ Copy,
+ Cut,
+ Paste,
+ SelectAll
+ }
}
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
index ca0af28713..8e662ea1b9 100644
--- a/src/Avalonia.Base/Input/TouchDevice.cs
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -119,6 +119,8 @@ namespace Avalonia.Input
{
pointer?.Capture(null);
pointer?.CaptureGestureRecognizer(null);
+ if (pointer != null)
+ pointer.IsGestureRecognitionSkipped = false;
}
}
@@ -158,5 +160,11 @@ namespace Avalonia.Input
? pointer
: null;
}
+
+ internal void PlatformCaptureLost()
+ {
+ foreach (var pointer in _pointers.Values)
+ pointer.Capture(null);
+ }
}
}
diff --git a/src/Avalonia.Base/Media/ArcSegment.cs b/src/Avalonia.Base/Media/ArcSegment.cs
index ee353b0a89..f5807ab9d7 100644
--- a/src/Avalonia.Base/Media/ArcSegment.cs
+++ b/src/Avalonia.Base/Media/ArcSegment.cs
@@ -97,7 +97,7 @@ namespace Avalonia.Media
internal override void ApplyTo(StreamGeometryContext ctx)
{
- ctx.ArcTo(Point, Size, RotationAngle, IsLargeArc, SweepDirection);
+ ctx.ArcTo(Point, Size, RotationAngle, IsLargeArc, SweepDirection, IsStroked);
}
public override string ToString()
diff --git a/src/Avalonia.Base/Media/BezierSegment .cs b/src/Avalonia.Base/Media/BezierSegment .cs
index 31efe1ec23..1c09081e3b 100644
--- a/src/Avalonia.Base/Media/BezierSegment .cs
+++ b/src/Avalonia.Base/Media/BezierSegment .cs
@@ -58,7 +58,7 @@ namespace Avalonia.Media
internal override void ApplyTo(StreamGeometryContext ctx)
{
- ctx.CubicBezierTo(Point1, Point2, Point3);
+ ctx.CubicBezierTo(Point1, Point2, Point3, IsStroked);
}
public override string ToString()
diff --git a/src/Avalonia.Base/Media/Brush.cs b/src/Avalonia.Base/Media/Brush.cs
index 21be08b4af..8c3491ed33 100644
--- a/src/Avalonia.Base/Media/Brush.cs
+++ b/src/Avalonia.Base/Media/Brush.cs
@@ -101,6 +101,8 @@ namespace Avalonia.Media
private protected void RegisterForSerialization() =>
_resource.RegisterForInvalidationOnAllCompositors(this);
+ private protected bool IsOnCompositor(Compositor c) => _resource.TryGetForCompositor(c) != null;
+
private CompositorResourceHolder _resource;
IBrush ICompositionRenderResource.GetForCompositor(Compositor c) => _resource.GetForCompositor(c);
diff --git a/src/Avalonia.Base/Media/DrawingBrush.cs b/src/Avalonia.Base/Media/DrawingBrush.cs
index b710351b98..c4e5dc8d13 100644
--- a/src/Avalonia.Base/Media/DrawingBrush.cs
+++ b/src/Avalonia.Base/Media/DrawingBrush.cs
@@ -58,7 +58,7 @@ namespace Avalonia.Media
internal override Func Factory =>
static c => new ServerCompositionSimpleContentBrush(c.Server);
- private InlineDictionary _renderDataDictionary;
+ private InlineDictionary _renderDataDictionary;
private protected override void OnReferencedFromCompositor(Compositor c)
{
@@ -69,33 +69,27 @@ namespace Avalonia.Media
protected override void OnUnreferencedFromCompositor(Compositor c)
{
if (_renderDataDictionary.TryGetAndRemoveValue(c, out var content))
- content?.RenderData.Dispose();
+ content?.Dispose();
base.OnUnreferencedFromCompositor(c);
}
private protected override void SerializeChanges(Compositor c, BatchStreamWriter writer)
{
base.SerializeChanges(c, writer);
- if (_renderDataDictionary.TryGetValue(c, out var content))
- writer.WriteObject(content);
+ if (_renderDataDictionary.TryGetValue(c, out var content) && content != null)
+ writer.WriteObject(new CompositionRenderDataSceneBrushContent.Properties(content.Server, null, true));
else
writer.WriteObject(null);
}
- CompositionRenderDataSceneBrushContent? CreateServerContent(Compositor c)
+ CompositionRenderData? CreateServerContent(Compositor c)
{
if (Drawing == null)
return null;
using var recorder = new RenderDataDrawingContext(c);
Drawing?.Draw(recorder);
- var renderData = recorder.GetRenderResults();
- if (renderData == null)
- return null;
-
- return new CompositionRenderDataSceneBrushContent(
- (ServerCompositionSimpleContentBrush)((ICompositionRenderResource)this).GetForCompositor(c),
- renderData, null, true);
+ return recorder.GetRenderResults();
}
}
}
diff --git a/src/Avalonia.Base/Media/FontManager.cs b/src/Avalonia.Base/Media/FontManager.cs
index 65ade1a413..88e332f334 100644
--- a/src/Avalonia.Base/Media/FontManager.cs
+++ b/src/Avalonia.Base/Media/FontManager.cs
@@ -4,6 +4,8 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
+using System.Linq;
+using Avalonia.Logging;
using Avalonia.Media.Fonts;
using Avalonia.Platform;
using Avalonia.Utilities;
@@ -96,11 +98,11 @@ namespace Avalonia.Media
return TryGetGlyphTypeface(new Typeface(DefaultFontFamily, typeface.Style, typeface.Weight, typeface.Stretch), out glyphTypeface);
}
- if (fontFamily.Key is FontFamilyKey)
+ if (fontFamily.Key != null)
{
if (fontFamily.Key is CompositeFontFamilyKey compositeKey)
{
- for (int i = 0; i < compositeKey.Keys.Count; i++)
+ for (var i = 0; i < compositeKey.Keys.Count; i++)
{
var key = compositeKey.Keys[i];
@@ -115,7 +117,9 @@ namespace Avalonia.Media
}
else
{
- if (TryGetGlyphTypefaceByKeyAndName(typeface, fontFamily.Key, fontFamily.FamilyNames.PrimaryFamilyName, out glyphTypeface))
+ var familyName = fontFamily.FamilyNames.PrimaryFamilyName;
+
+ if (TryGetGlyphTypefaceByKeyAndName(typeface, fontFamily.Key, familyName, out glyphTypeface))
{
return true;
}
@@ -125,7 +129,9 @@ namespace Avalonia.Media
}
else
{
- if (SystemFonts.TryGetGlyphTypeface(fontFamily.FamilyNames.PrimaryFamilyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface))
+ var familyName = fontFamily.FamilyNames.PrimaryFamilyName;
+
+ if (SystemFonts.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface))
{
return true;
}
@@ -144,13 +150,20 @@ namespace Avalonia.Media
{
var source = key.Source.EnsureAbsolute(key.BaseUri);
- if (TryGetFontCollection(source, out var fontCollection) &&
- fontCollection.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface))
+ if (TryGetFontCollection(source, out var fontCollection))
{
- if (glyphTypeface.FamilyName.Contains(familyName))
+ if (fontCollection.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch,
+ out glyphTypeface))
{
return true;
}
+
+ var logger = Logger.TryGet(LogEventLevel.Debug, "FontManager");
+
+ logger?.Log(this,
+ $"Font family '{familyName}' could not be found. Present font families: [{string.Join(",", fontCollection)}]");
+
+ return false;
}
glyphTypeface = null;
diff --git a/src/Avalonia.Base/Media/FontWeight.cs b/src/Avalonia.Base/Media/FontWeight.cs
index 5a4a4963a5..5776e5e285 100644
--- a/src/Avalonia.Base/Media/FontWeight.cs
+++ b/src/Avalonia.Base/Media/FontWeight.cs
@@ -1,3 +1,4 @@
+#pragma warning disable CA1069
namespace Avalonia.Media
{
///
@@ -22,7 +23,7 @@ namespace Avalonia.Media
///
/// Specifies an "ultra light" font weight.
///
- UltraLight = 200,
+ UltraLight = ExtraLight,
///
/// Specifies a "light" font weight.
@@ -42,7 +43,7 @@ namespace Avalonia.Media
///
/// Specifies a "regular" font weight.
///
- Regular = 400,
+ Regular = Normal,
///
/// Specifies a "medium" font weight.
@@ -52,7 +53,7 @@ namespace Avalonia.Media
///
/// Specifies a "demi-bold" font weight.
///
- DemiBold = 600,
+ DemiBold = SemiBold,
///
/// Specifies a "semi-bold" font weight.
@@ -72,7 +73,7 @@ namespace Avalonia.Media
///
/// Specifies an "ultra bold" font weight.
///
- UltraBold = 800,
+ UltraBold = ExtraBold,
///
/// Specifies a "black" font weight.
@@ -82,7 +83,12 @@ namespace Avalonia.Media
///
/// Specifies a "heavy" font weight.
///
- Heavy = 900,
+ Heavy = Black,
+
+ ///
+ /// Specifies a "solid" font weight.
+ ///
+ Solid = Black,
///
/// Specifies an "extra black" font weight.
diff --git a/src/Avalonia.Base/Media/Fonts/EmbeddedFontCollection.cs b/src/Avalonia.Base/Media/Fonts/EmbeddedFontCollection.cs
index 49cead719c..d06bad8001 100644
--- a/src/Avalonia.Base/Media/Fonts/EmbeddedFontCollection.cs
+++ b/src/Avalonia.Base/Media/Fonts/EmbeddedFontCollection.cs
@@ -45,30 +45,22 @@ namespace Avalonia.Media.Fonts
if (fontManager.TryCreateGlyphTypeface(stream, FontSimulations.None, out var glyphTypeface))
{
- if (!_glyphTypefaceCache.TryGetValue(glyphTypeface.FamilyName, out var glyphTypefaces))
- {
- glyphTypefaces = new ConcurrentDictionary();
-
- if (_glyphTypefaceCache.TryAdd(glyphTypeface.FamilyName, glyphTypefaces))
- {
- _fontFamilies.Add(new FontFamily(_key, glyphTypeface.FamilyName));
- }
- }
-
- var key = new FontCollectionKey(
- glyphTypeface.Style,
- glyphTypeface.Weight,
- glyphTypeface.Stretch);
-
- glyphTypefaces.TryAdd(key, glyphTypeface);
+ AddGlyphTypeface(glyphTypeface);
}
}
}
-
public override bool TryGetGlyphTypeface(string familyName, FontStyle style, FontWeight weight,
FontStretch stretch, [NotNullWhen(true)] out IGlyphTypeface? glyphTypeface)
{
+ var typeface = GetImplicitTypeface(new Typeface(familyName, style, weight, stretch), out familyName);
+
+ style = typeface.Style;
+
+ weight = typeface.Weight;
+
+ stretch = typeface.Stretch;
+
var key = new FontCollectionKey(style, weight, stretch);
if (_glyphTypefaceCache.TryGetValue(familyName, out var glyphTypefaces))
@@ -89,7 +81,7 @@ namespace Avalonia.Media.Fonts
fontSimulations |= FontSimulations.Oblique;
}
- if ((int)weight >= 600 && glyphTypeface2.Weight != weight)
+ if ((int)weight >= 600 && glyphTypeface2.Weight < weight)
{
fontSimulations |= FontSimulations.Bold;
}
@@ -134,5 +126,39 @@ namespace Avalonia.Media.Fonts
}
public override IEnumerator GetEnumerator() => _fontFamilies.GetEnumerator();
+
+ private void AddGlyphTypeface(IGlyphTypeface glyphTypeface)
+ {
+ if (glyphTypeface is IGlyphTypeface2 glyphTypeface2)
+ {
+ foreach (var kvp in glyphTypeface2.FamilyNames)
+ {
+ var familyName = kvp.Value;
+
+ AddGlyphTypefaceByFamilyName(familyName, glyphTypeface);
+ }
+ }
+ else
+ {
+ AddGlyphTypefaceByFamilyName(glyphTypeface.FamilyName, glyphTypeface);
+ }
+
+ return;
+
+ void AddGlyphTypefaceByFamilyName(string familyName, IGlyphTypeface glyphTypeface)
+ {
+ var typefaces = _glyphTypefaceCache.GetOrAdd(familyName,
+ x =>
+ {
+ _fontFamilies.Add(new FontFamily(_key, glyphTypeface.FamilyName));
+
+ return new ConcurrentDictionary();
+ });
+
+ typefaces.TryAdd(
+ new FontCollectionKey(glyphTypeface.Style, glyphTypeface.Weight, glyphTypeface.Stretch),
+ glyphTypeface);
+ }
+ }
}
}
diff --git a/src/Avalonia.Base/Media/Fonts/FontCollectionBase.cs b/src/Avalonia.Base/Media/Fonts/FontCollectionBase.cs
index 3daa19c788..bbf10fdca8 100644
--- a/src/Avalonia.Base/Media/Fonts/FontCollectionBase.cs
+++ b/src/Avalonia.Base/Media/Fonts/FontCollectionBase.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using Avalonia.Platform;
+using Avalonia.Utilities;
namespace Avalonia.Media.Fonts
{
@@ -255,5 +256,124 @@ namespace Avalonia.Media.Fonts
return false;
}
+
+ internal static Typeface GetImplicitTypeface(Typeface typeface, out string normalizedFamilyName)
+ {
+ normalizedFamilyName = typeface.FontFamily.FamilyNames.PrimaryFamilyName;
+
+ //Return early if no separator is present.
+ if (!normalizedFamilyName.Contains(' '))
+ {
+ return typeface;
+ }
+
+ var style = typeface.Style;
+ var weight = typeface.Weight;
+ var stretch = typeface.Stretch;
+
+ if(TryGetStyle(ref normalizedFamilyName, out var foundStyle))
+ {
+ style = foundStyle;
+ }
+
+ if(TryGetWeight(ref normalizedFamilyName, out var foundWeight))
+ {
+ weight = foundWeight;
+ }
+
+ if(TryGetStretch(ref normalizedFamilyName, out var foundStretch))
+ {
+ stretch = foundStretch;
+ }
+
+ //Preserve old font source
+ return new Typeface(typeface.FontFamily, style, weight, stretch);
+
+ }
+
+ internal static bool TryGetWeight(ref string familyName, out FontWeight weight)
+ {
+ weight = FontWeight.Normal;
+
+ var tokenizer = new StringTokenizer(familyName, ' ');
+
+ tokenizer.ReadString();
+
+ while (tokenizer.TryReadString(out var weightString))
+ {
+ if (new StringTokenizer(weightString).TryReadInt32(out _))
+ {
+ continue;
+ }
+
+ if (!Enum.TryParse(weightString, true, out weight))
+ {
+ continue;
+ }
+
+ familyName = familyName.Replace(" " + weightString, "").TrimEnd();
+
+ return true;
+ }
+
+ return false;
+ }
+
+ internal static bool TryGetStyle(ref string familyName, out FontStyle style)
+ {
+ style = FontStyle.Normal;
+
+ var tokenizer = new StringTokenizer(familyName, ' ');
+
+ tokenizer.ReadString();
+
+ while (tokenizer.TryReadString(out var styleString))
+ {
+ //Do not try to parse an integer
+ if (new StringTokenizer(styleString).TryReadInt32(out _))
+ {
+ continue;
+ }
+
+ if (!Enum.TryParse(styleString, true, out style))
+ {
+ continue;
+ }
+
+ familyName = familyName.Replace(" " + styleString, "").TrimEnd();
+
+ return true;
+ }
+
+ return false;
+ }
+
+ internal static bool TryGetStretch(ref string familyName, out FontStretch stretch)
+ {
+ stretch = FontStretch.Normal;
+
+ var tokenizer = new StringTokenizer(familyName, ' ');
+
+ tokenizer.ReadString();
+
+ while (tokenizer.TryReadString(out var stretchString))
+ {
+ if (new StringTokenizer(stretchString).TryReadInt32(out _))
+ {
+ continue;
+ }
+
+ if (!Enum.TryParse(stretchString, true, out stretch))
+ {
+ continue;
+ }
+
+ familyName = familyName.Replace(" " + stretchString, "").TrimEnd();
+
+ return true;
+ }
+
+ return false;
+ }
}
}
diff --git a/src/Avalonia.Base/Media/Fonts/OpenTypeTag.cs b/src/Avalonia.Base/Media/Fonts/OpenTypeTag.cs
new file mode 100644
index 0000000000..b0c725ca92
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/OpenTypeTag.cs
@@ -0,0 +1,71 @@
+using System;
+
+namespace Avalonia.Media.Fonts
+{
+ internal readonly record struct OpenTypeTag
+ {
+ public static readonly OpenTypeTag None = new OpenTypeTag(0, 0, 0, 0);
+ public static readonly OpenTypeTag Max = new OpenTypeTag(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue);
+ public static readonly OpenTypeTag MaxSigned = new OpenTypeTag((byte)sbyte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue);
+
+ private readonly uint _value;
+
+ public OpenTypeTag(uint value)
+ {
+ _value = value;
+ }
+
+ public OpenTypeTag(char c1, char c2, char c3, char c4)
+ {
+ _value = (uint)(((byte)c1 << 24) | ((byte)c2 << 16) | ((byte)c3 << 8) | (byte)c4);
+ }
+
+ private OpenTypeTag(byte c1, byte c2, byte c3, byte c4)
+ {
+ _value = (uint)((c1 << 24) | (c2 << 16) | (c3 << 8) | c4);
+ }
+
+ public static OpenTypeTag Parse(string tag)
+ {
+ if (string.IsNullOrEmpty(tag))
+ return None;
+
+ var realTag = new char[4];
+
+ var len = Math.Min(4, tag.Length);
+ var i = 0;
+ for (; i < len; i++)
+ realTag[i] = tag[i];
+ for (; i < 4; i++)
+ realTag[i] = ' ';
+
+ return new OpenTypeTag(realTag[0], realTag[1], realTag[2], realTag[3]);
+ }
+
+ public override string ToString()
+ {
+ if (_value == None)
+ {
+ return nameof(None);
+ }
+ if (_value == Max)
+ {
+ return nameof(Max);
+ }
+ if (_value == MaxSigned)
+ {
+ return nameof(MaxSigned);
+ }
+
+ return string.Concat(
+ (char)(byte)(_value >> 24),
+ (char)(byte)(_value >> 16),
+ (char)(byte)(_value >> 8),
+ (char)(byte)_value);
+ }
+
+ public static implicit operator uint(OpenTypeTag tag) => tag._value;
+
+ public static implicit operator OpenTypeTag(uint tag) => new OpenTypeTag(tag);
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/SystemFontCollection.cs b/src/Avalonia.Base/Media/Fonts/SystemFontCollection.cs
index c919257eee..ce20ace90c 100644
--- a/src/Avalonia.Base/Media/Fonts/SystemFontCollection.cs
+++ b/src/Avalonia.Base/Media/Fonts/SystemFontCollection.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Media.Fonts
public SystemFontCollection(FontManager fontManager)
{
_fontManager = fontManager;
- _familyNames = fontManager.PlatformImpl.GetInstalledFontFamilyNames().ToList();
+ _familyNames = fontManager.PlatformImpl.GetInstalledFontFamilyNames().Where(x=> !string.IsNullOrEmpty(x)).ToList();
}
public override Uri Key => FontManager.SystemFontsKey;
@@ -45,49 +45,94 @@ namespace Avalonia.Media.Fonts
{
glyphTypeface = null;
+ var typeface = GetImplicitTypeface(new Typeface(familyName, style, weight, stretch), out familyName);
+
+ style = typeface.Style;
+
+ weight = typeface.Weight;
+
+ stretch = typeface.Stretch;
+
var key = new FontCollectionKey(style, weight, stretch);
- var glyphTypefaces = _glyphTypefaceCache.GetOrAdd(familyName,
+ if (_glyphTypefaceCache.TryGetValue(familyName, out var glyphTypefaces))
+ {
+ if (glyphTypefaces.TryGetValue(key, out glyphTypeface))
+ {
+ return glyphTypeface != null;
+ }
+ }
+
+ glyphTypefaces ??= _glyphTypefaceCache.GetOrAdd(familyName,
(_) => new ConcurrentDictionary());
- if (glyphTypefaces.TryGetValue(key, out glyphTypeface))
+ //Try to create the glyph typeface via system font manager
+ if (!_fontManager.PlatformImpl.TryCreateGlyphTypeface(familyName, style, weight, stretch,
+ out glyphTypeface))
{
- return glyphTypeface != null;
+ glyphTypefaces.TryAdd(key, null);
+
+ return false;
}
- if(!_fontManager.PlatformImpl.TryCreateGlyphTypeface(familyName, style, weight, stretch, out glyphTypeface) ||
- !glyphTypeface.FamilyName.Contains(familyName))
+ var createdKey =
+ new FontCollectionKey(glyphTypeface.Style, glyphTypeface.Weight, glyphTypeface.Stretch);
+
+ //No exact match
+ if (createdKey != key)
{
//Try to find nearest match if possible
- TryGetNearestMatch(glyphTypefaces, key, out glyphTypeface);
+ if (!TryGetNearestMatch(glyphTypefaces, key, out var nearestMatch))
+ {
+ glyphTypeface = nearestMatch;
+ }
+ else
+ {
+ //Try to create a synthetic glyph typeface
+ if (TryCreateSyntheticGlyphTypeface(glyphTypeface, style, weight, out var syntheticGlyphTypeface))
+ {
+ glyphTypeface = syntheticGlyphTypeface;
+ }
+ }
}
- if(glyphTypeface is IGlyphTypeface2 glyphTypeface2)
+ glyphTypefaces.TryAdd(key, glyphTypeface);
+
+ return glyphTypeface != null;
+ }
+
+ private bool TryCreateSyntheticGlyphTypeface(IGlyphTypeface glyphTypeface, FontStyle style, FontWeight weight,
+ [NotNullWhen(true)] out IGlyphTypeface? syntheticGlyphTypeface)
+ {
+ if (glyphTypeface is IGlyphTypeface2 glyphTypeface2)
{
var fontSimulations = FontSimulations.None;
- if(style != FontStyle.Normal && glyphTypeface2.Style != style)
+ if (style != FontStyle.Normal && glyphTypeface2.Style != style)
{
fontSimulations |= FontSimulations.Oblique;
}
- if((int)weight >= 600 && glyphTypeface2.Weight != weight)
+ if ((int)weight >= 600 && glyphTypeface2.Weight < weight)
{
fontSimulations |= FontSimulations.Bold;
}
- if(fontSimulations != FontSimulations.None && glyphTypeface2.TryGetStream(out var stream))
+ if (fontSimulations != FontSimulations.None && glyphTypeface2.TryGetStream(out var stream))
{
using (stream)
{
- _fontManager.PlatformImpl.TryCreateGlyphTypeface(stream, fontSimulations, out glyphTypeface);
+ _fontManager.PlatformImpl.TryCreateGlyphTypeface(stream, fontSimulations,
+ out syntheticGlyphTypeface);
+
+ return syntheticGlyphTypeface != null;
}
}
}
- glyphTypefaces.TryAdd(key, glyphTypeface);
+ syntheticGlyphTypeface = null;
- return glyphTypeface != null;
+ return false;
}
public override void Initialize(IFontManagerImpl fontManager)
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/BigEndianBinaryReader.cs b/src/Avalonia.Base/Media/Fonts/Tables/BigEndianBinaryReader.cs
new file mode 100644
index 0000000000..bca46b7e8c
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/BigEndianBinaryReader.cs
@@ -0,0 +1,422 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System;
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// BinaryReader using big-endian encoding.
+ ///
+ [DebuggerDisplay("Start: {StartOfStream}, Position: {BaseStream.Position}")]
+ internal class BigEndianBinaryReader : IDisposable
+ {
+ ///
+ /// Buffer used for temporary storage before conversion into primitives
+ ///
+ private readonly byte[] _buffer = new byte[16];
+
+ private readonly bool _leaveOpen;
+
+ ///
+ /// Initializes a new instance of the class.
+ /// Constructs a new binary reader with the given bit converter, reading
+ /// to the given stream, using the given encoding.
+ ///
+ /// Stream to read data from
+ /// if set to true [leave open].
+ public BigEndianBinaryReader(Stream stream, bool leaveOpen)
+ {
+ BaseStream = stream;
+ StartOfStream = stream.Position;
+ _leaveOpen = leaveOpen;
+ }
+
+ private long StartOfStream { get; }
+
+ ///
+ /// Gets the underlying stream of the EndianBinaryReader.
+ ///
+ public Stream BaseStream { get; }
+
+ ///
+ /// Seeks within the stream.
+ ///
+ /// Offset to seek to.
+ /// Origin of seek operation. If SeekOrigin.Begin, the offset will be set to the start of stream position.
+ public void Seek(long offset, SeekOrigin origin)
+ {
+ // If SeekOrigin.Begin, the offset will be set to the start of stream position.
+ if (origin == SeekOrigin.Begin)
+ {
+ offset += StartOfStream;
+ }
+
+ BaseStream.Seek(offset, origin);
+ }
+
+ ///
+ /// Reads a single byte from the stream.
+ ///
+ /// The byte read
+ public byte ReadByte()
+ {
+ ReadInternal(_buffer, 1);
+ return _buffer[0];
+ }
+
+ ///
+ /// Reads a single signed byte from the stream.
+ ///
+ /// The byte read
+ public sbyte ReadSByte()
+ {
+ ReadInternal(_buffer, 1);
+ return unchecked((sbyte)_buffer[0]);
+ }
+
+ public float ReadF2dot14()
+ {
+ const float f2Dot14ToFloat = 16384.0f;
+ return ReadInt16() / f2Dot14ToFloat;
+ }
+
+ ///
+ /// Reads a 16-bit signed integer from the stream, using the bit converter
+ /// for this reader. 2 bytes are read.
+ ///
+ /// The 16-bit integer read
+ public short ReadInt16()
+ {
+ ReadInternal(_buffer, 2);
+
+ return BinaryPrimitives.ReadInt16BigEndian(_buffer);
+ }
+
+ public TEnum ReadInt16()
+ where TEnum : struct, Enum
+ {
+ TryConvert(ReadUInt16(), out TEnum value);
+ return value;
+ }
+
+ public short ReadFWORD() => ReadInt16();
+
+ public short[] ReadFWORDArray(int length) => ReadInt16Array(length);
+
+ public ushort ReadUFWORD() => ReadUInt16();
+
+ ///
+ /// Reads a fixed 32-bit value from the stream.
+ /// 4 bytes are read.
+ ///
+ /// The 32-bit value read.
+ public float ReadFixed()
+ {
+ ReadInternal(_buffer, 4);
+ return BinaryPrimitives.ReadInt32BigEndian(_buffer) / 65536F;
+ }
+
+ ///
+ /// Reads a 32-bit signed integer from the stream, using the bit converter
+ /// for this reader. 4 bytes are read.
+ ///
+ /// The 32-bit integer read
+ public int ReadInt32()
+ {
+ ReadInternal(_buffer, 4);
+
+ return BinaryPrimitives.ReadInt32BigEndian(_buffer);
+ }
+
+ ///
+ /// Reads a 64-bit signed integer from the stream.
+ /// 8 bytes are read.
+ ///
+ /// The 64-bit integer read.
+ public long ReadInt64()
+ {
+ ReadInternal(_buffer, 8);
+
+ return BinaryPrimitives.ReadInt64BigEndian(_buffer);
+ }
+
+ ///
+ /// Reads a 16-bit unsigned integer from the stream.
+ /// 2 bytes are read.
+ ///
+ /// The 16-bit unsigned integer read.
+ public ushort ReadUInt16()
+ {
+ ReadInternal(_buffer, 2);
+
+ return BinaryPrimitives.ReadUInt16BigEndian(_buffer);
+ }
+
+ ///
+ /// Reads a 16-bit unsigned integer from the stream representing an offset position.
+ /// 2 bytes are read.
+ ///
+ /// The 16-bit unsigned integer read.
+ public ushort ReadOffset16() => ReadUInt16();
+
+ public TEnum ReadUInt16()
+ where TEnum : struct, Enum
+ {
+ TryConvert(ReadUInt16(), out TEnum value);
+ return value;
+ }
+
+ ///
+ /// Reads array of 16-bit unsigned integers from the stream.
+ ///
+ /// The length.
+ ///
+ /// The 16-bit unsigned integer read.
+ ///
+ public ushort[] ReadUInt16Array(int length)
+ {
+ ushort[] data = new ushort[length];
+ for (int i = 0; i < length; i++)
+ {
+ data[i] = ReadUInt16();
+ }
+
+ return data;
+ }
+
+ ///
+ /// Reads array of 16-bit unsigned integers from the stream to the buffer.
+ ///
+ /// The buffer to read to.
+ public void ReadUInt16Array(Span buffer)
+ {
+ for (int i = 0; i < buffer.Length; i++)
+ {
+ buffer[i] = ReadUInt16();
+ }
+ }
+
+ ///
+ /// Reads array or 32-bit unsigned integers from the stream.
+ ///
+ /// The length.
+ ///
+ /// The 32-bit unsigned integer read.
+ ///
+ public uint[] ReadUInt32Array(int length)
+ {
+ uint[] data = new uint[length];
+ for (int i = 0; i < length; i++)
+ {
+ data[i] = ReadUInt32();
+ }
+
+ return data;
+ }
+
+ public byte[] ReadUInt8Array(int length)
+ {
+ byte[] data = new byte[length];
+
+ ReadInternal(data, length);
+
+ return data;
+ }
+
+ ///
+ /// Reads array of 16-bit unsigned integers from the stream.
+ ///
+ /// The length.
+ ///
+ /// The 16-bit signed integer read.
+ ///
+ public short[] ReadInt16Array(int length)
+ {
+ short[] data = new short[length];
+ for (int i = 0; i < length; i++)
+ {
+ data[i] = ReadInt16();
+ }
+
+ return data;
+ }
+
+ ///
+ /// Reads an array of 16-bit signed integers from the stream to the buffer.
+ ///
+ /// The buffer to read to.
+ public void ReadInt16Array(Span buffer)
+ {
+ for (int i = 0; i < buffer.Length; i++)
+ {
+ buffer[i] = ReadInt16();
+ }
+ }
+
+ ///
+ /// Reads a 8-bit unsigned integer from the stream, using the bit converter
+ /// for this reader. 1 bytes are read.
+ ///
+ /// The 8-bit unsigned integer read.
+ public byte ReadUInt8()
+ {
+ ReadInternal(_buffer, 1);
+ return _buffer[0];
+ }
+
+ ///
+ /// Reads a 24-bit unsigned integer from the stream, using the bit converter
+ /// for this reader. 3 bytes are read.
+ ///
+ /// The 24-bit unsigned integer read.
+ public int ReadUInt24()
+ {
+ byte highByte = ReadByte();
+ return (highByte << 16) | ReadUInt16();
+ }
+
+ ///
+ /// Reads a 32-bit unsigned integer from the stream, using the bit converter
+ /// for this reader. 4 bytes are read.
+ ///
+ /// The 32-bit unsigned integer read.
+ public uint ReadUInt32()
+ {
+ ReadInternal(_buffer, 4);
+
+ return BinaryPrimitives.ReadUInt32BigEndian(_buffer);
+ }
+
+ ///
+ /// Reads a 32-bit unsigned integer from the stream representing an offset position.
+ /// 4 bytes are read.
+ ///
+ /// The 32-bit unsigned integer read.
+ public uint ReadOffset32() => ReadUInt32();
+
+ ///
+ /// Reads the specified number of bytes, returning them in a new byte array.
+ /// If not enough bytes are available before the end of the stream, this
+ /// method will return what is available.
+ ///
+ /// The number of bytes to read.
+ /// The bytes read.
+ public byte[] ReadBytes(int count)
+ {
+ byte[] ret = new byte[count];
+ int index = 0;
+ while (index < count)
+ {
+ int read = BaseStream.Read(ret, index, count - index);
+
+ // Stream has finished half way through. That's fine, return what we've got.
+ if (read == 0)
+ {
+ byte[] copy = new byte[index];
+ Buffer.BlockCopy(ret, 0, copy, 0, index);
+ return copy;
+ }
+
+ index += read;
+ }
+
+ return ret;
+ }
+
+ ///
+ /// Reads a string of a specific length, which specifies the number of bytes
+ /// to read from the stream. These bytes are then converted into a string with
+ /// the encoding for this reader.
+ ///
+ /// The bytes to read.
+ /// The encoding.
+ ///
+ /// The string read from the stream.
+ ///
+ public string ReadString(int bytesToRead, Encoding encoding)
+ {
+ byte[] data = new byte[bytesToRead];
+ ReadInternal(data, bytesToRead);
+ return encoding.GetString(data, 0, data.Length);
+ }
+
+ ///
+ /// Reads the uint32 string.
+ ///
+ /// a 4 character long UTF8 encoded string.
+ public string ReadTag()
+ {
+ ReadInternal(_buffer, 4);
+
+ return Encoding.UTF8.GetString(_buffer, 0, 4);
+ }
+
+ ///
+ /// Reads an offset consuming the given nuber of bytes.
+ ///
+ /// The offset size in bytes.
+ /// The 32-bit signed integer representing the offset.
+ /// Size is not in range.
+ public int ReadOffset(int size)
+ => size switch
+ {
+ 1 => ReadByte(),
+ 2 => (ReadByte() << 8) | (ReadByte() << 0),
+ 3 => (ReadByte() << 16) | (ReadByte() << 8) | (ReadByte() << 0),
+ 4 => (ReadByte() << 24) | (ReadByte() << 16) | (ReadByte() << 8) | (ReadByte() << 0),
+ _ => throw new InvalidOperationException(),
+ };
+
+ ///
+ /// Reads the given number of bytes from the stream, throwing an exception
+ /// if they can't all be read.
+ ///
+ /// Buffer to read into.
+ /// Number of bytes to read.
+ private void ReadInternal(byte[] data, int size)
+ {
+ int index = 0;
+
+ while (index < size)
+ {
+ int read = BaseStream.Read(data, index, size - index);
+ if (read == 0)
+ {
+ throw new EndOfStreamException($"End of stream reached with {size - index} byte{(size - index == 1 ? "s" : string.Empty)} left to read.");
+ }
+
+ index += read;
+ }
+ }
+
+ public void Dispose()
+ {
+ if (!_leaveOpen)
+ {
+ BaseStream?.Dispose();
+ }
+ }
+
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ private static bool TryConvert(T input, out TEnum value)
+ where T : struct, IConvertible, IFormattable, IComparable
+ where TEnum : struct, Enum
+ {
+ if (Unsafe.SizeOf() == Unsafe.SizeOf())
+ {
+ value = Unsafe.As(ref input);
+ return true;
+ }
+
+ value = default;
+ return false;
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/EncodingIDExtensions.cs b/src/Avalonia.Base/Media/Fonts/Tables/EncodingIDExtensions.cs
new file mode 100644
index 0000000000..6c054648cd
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/EncodingIDExtensions.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System.Text;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// Converts encoding ID to TextEncoding
+ ///
+ internal static class EncodingIDExtensions
+ {
+ ///
+ /// Converts encoding ID to TextEncoding
+ ///
+ /// The identifier.
+ /// the encoding for this encoding ID
+ public static Encoding AsEncoding(this EncodingIDs id)
+ {
+ switch (id)
+ {
+ case EncodingIDs.Unicode11:
+ case EncodingIDs.Unicode2:
+ return Encoding.BigEndianUnicode;
+ default:
+ return Encoding.UTF8;
+ }
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/EncodingIDs.cs b/src/Avalonia.Base/Media/Fonts/Tables/EncodingIDs.cs
new file mode 100644
index 0000000000..78ab91cc77
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/EncodingIDs.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// Encoding IDS
+ ///
+ internal enum EncodingIDs : ushort
+ {
+ ///
+ /// Unicode 1.0 semantics
+ ///
+ Unicode1 = 0,
+
+ ///
+ /// Unicode 1.1 semantics
+ ///
+ Unicode11 = 1,
+
+ ///
+ /// ISO/IEC 10646 semantics
+ ///
+ ISO10646 = 2,
+
+ ///
+ /// Unicode 2.0 and onwards semantics, Unicode BMP only (cmap subtable formats 0, 4, 6).
+ ///
+ Unicode2 = 3,
+
+ ///
+ /// Unicode 2.0 and onwards semantics, Unicode full repertoire (cmap subtable formats 0, 4, 6, 10, 12).
+ ///
+ Unicode2Plus = 4,
+
+ ///
+ /// Unicode Variation Sequences (cmap subtable format 14).
+ ///
+ UnicodeVariationSequences = 5,
+
+ ///
+ /// Unicode full repertoire (cmap subtable formats 0, 4, 6, 10, 12, 13)
+ ///
+ UnicodeFull = 6,
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/FeatureListTable.cs b/src/Avalonia.Base/Media/Fonts/Tables/FeatureListTable.cs
new file mode 100644
index 0000000000..0a916c7ed0
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/FeatureListTable.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// Features provide information about how to use the glyphs in a font to render a script or language.
+ /// For example, an Arabic font might have a feature for substituting initial glyph forms, and a Kanji font
+ /// might have a feature for positioning glyphs vertically. All OpenType Layout features define data for
+ /// glyph substitution, glyph positioning, or both.
+ ///
+ ///
+ ///
+ internal class FeatureListTable
+ {
+ private static OpenTypeTag GSubTag = OpenTypeTag.Parse("GSUB");
+ private static OpenTypeTag GPosTag = OpenTypeTag.Parse("GPOS");
+
+ private FeatureListTable(IReadOnlyList features)
+ {
+ Features = features;
+ }
+
+ public IReadOnlyList Features { get; }
+
+ public static FeatureListTable? LoadGSub(IGlyphTypeface glyphTypeface)
+ {
+ if (!glyphTypeface.TryGetTable(GSubTag, out var gPosTable))
+ {
+ return null;
+ }
+
+ using var stream = new MemoryStream(gPosTable);
+ using var reader = new BigEndianBinaryReader(stream, false);
+
+ return Load(reader);
+
+ }
+ public static FeatureListTable? LoadGPos(IGlyphTypeface glyphTypeface)
+ {
+ if (!glyphTypeface.TryGetTable(GPosTag, out var gSubTable))
+ {
+ return null;
+ }
+
+ using var stream = new MemoryStream(gSubTable);
+ using var reader = new BigEndianBinaryReader(stream, false);
+
+ return Load(reader);
+
+ }
+
+ private static FeatureListTable Load(BigEndianBinaryReader reader)
+ {
+ // GPOS/GSUB Header, Version 1.0
+ // +----------+-------------------+-----------------------------------------------------------+
+ // | Type | Name | Description |
+ // +==========+===================+===========================================================+
+ // | uint16 | majorVersion | Major version of the GPOS table, = 1 |
+ // +----------+-------------------+-----------------------------------------------------------+
+ // | uint16 | minorVersion | Minor version of the GPOS table, = 0 |
+ // +----------+-------------------+-----------------------------------------------------------+
+ // | Offset16 | scriptListOffset | Offset to ScriptList table, from beginning of GPOS table |
+ // +----------+-------------------+-----------------------------------------------------------+
+ // | Offset16 | featureListOffset | Offset to FeatureList table, from beginning of GPOS table |
+ // +----------+-------------------+-----------------------------------------------------------+
+ // | Offset16 | lookupListOffset | Offset to LookupList table, from beginning of GPOS table |
+ // +----------+-------------------+-----------------------------------------------------------+
+
+ reader.ReadUInt16();
+ reader.ReadUInt16();
+
+ reader.ReadOffset16();
+ var featureListOffset = reader.ReadOffset16();
+
+ return Load(reader, featureListOffset);
+ }
+
+ private static FeatureListTable Load(BigEndianBinaryReader reader, long offset)
+ {
+ // FeatureList
+ // +---------------+------------------------------+-----------------------------------------------------------------------------------------------------------------+
+ // | Type | Name | Description |
+ // +===============+==============================+=================================================================================================================+
+ // | uint16 | featureCount | Number of FeatureRecords in this table |
+ // +---------------+------------------------------+-----------------------------------------------------------------------------------------------------------------+
+ // | FeatureRecord | featureRecords[featureCount] | Array of FeatureRecords — zero-based (first feature has FeatureIndex = 0), listed alphabetically by feature tag |
+ // +---------------+------------------------------+-----------------------------------------------------------------------------------------------------------------+
+ reader.Seek(offset, SeekOrigin.Begin);
+
+ var featureCount = reader.ReadUInt16();
+
+ var features = new List(featureCount);
+
+ for (var i = 0; i < featureCount; i++)
+ {
+ // FeatureRecord
+ // +----------+---------------+--------------------------------------------------------+
+ // | Type | Name | Description |
+ // +==========+===============+========================================================+
+ // | Tag | featureTag | 4-byte feature identification tag |
+ // +----------+---------------+--------------------------------------------------------+
+ // | Offset16 | featureOffset | Offset to Feature table, from beginning of FeatureList |
+ // +----------+---------------+--------------------------------------------------------+
+ var featureTag = reader.ReadUInt32();
+
+ reader.ReadOffset16();
+
+ var tag = new OpenTypeTag(featureTag);
+
+ if (!features.Contains(tag))
+ {
+ features.Add(tag);
+ }
+ }
+
+ return new FeatureListTable(features /*featureTables*/);
+ }
+
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/HorizontalHeadTable.cs b/src/Avalonia.Base/Media/Fonts/Tables/HorizontalHeadTable.cs
new file mode 100644
index 0000000000..0942296536
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/HorizontalHeadTable.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System.IO;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ internal class HorizontalHeadTable
+ {
+ internal const string TableName = "hhea";
+ internal static OpenTypeTag Tag = OpenTypeTag.Parse(TableName);
+
+ public HorizontalHeadTable(
+ short ascender,
+ short descender,
+ short lineGap,
+ ushort advanceWidthMax,
+ short minLeftSideBearing,
+ short minRightSideBearing,
+ short xMaxExtent,
+ short caretSlopeRise,
+ short caretSlopeRun,
+ short caretOffset,
+ ushort numberOfHMetrics)
+ {
+ Ascender = ascender;
+ Descender = descender;
+ LineGap = lineGap;
+ AdvanceWidthMax = advanceWidthMax;
+ MinLeftSideBearing = minLeftSideBearing;
+ MinRightSideBearing = minRightSideBearing;
+ XMaxExtent = xMaxExtent;
+ CaretSlopeRise = caretSlopeRise;
+ CaretSlopeRun = caretSlopeRun;
+ CaretOffset = caretOffset;
+ NumberOfHMetrics = numberOfHMetrics;
+ }
+
+ public ushort AdvanceWidthMax { get; }
+
+ public short Ascender { get; }
+
+ public short CaretOffset { get; }
+
+ public short CaretSlopeRise { get; }
+
+ public short CaretSlopeRun { get; }
+
+ public short Descender { get; }
+
+ public short LineGap { get; }
+
+ public short MinLeftSideBearing { get; }
+
+ public short MinRightSideBearing { get; }
+
+ public ushort NumberOfHMetrics { get; }
+
+ public short XMaxExtent { get; }
+
+ public static HorizontalHeadTable? Load(IGlyphTypeface glyphTypeface)
+ {
+ if (!glyphTypeface.TryGetTable(Tag, out var table))
+ {
+ return null;
+ }
+
+ using var stream = new MemoryStream(table);
+ using var binaryReader = new BigEndianBinaryReader(stream, false);
+
+ // Move to start of table.
+ return Load(binaryReader);
+ }
+
+ public static HorizontalHeadTable Load(BigEndianBinaryReader reader)
+ {
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | Type | Name | Description |
+ // +========+=====================+=================================================================================+
+ // | Fixed | version | 0x00010000 (1.0) |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | FWord | ascent | Distance from baseline of highest ascender |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | FWord | descent | Distance from baseline of lowest descender |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | FWord | lineGap | typographic line gap |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | uFWord | advanceWidthMax | must be consistent with horizontal metrics |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | FWord | minLeftSideBearing | must be consistent with horizontal metrics |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | FWord | minRightSideBearing | must be consistent with horizontal metrics |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | FWord | xMaxExtent | max(lsb + (xMax-xMin)) |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | int16 | caretSlopeRise | used to calculate the slope of the caret (rise/run) set to 1 for vertical caret |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | int16 | caretSlopeRun | 0 for vertical |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | FWord | caretOffset | set value to 0 for non-slanted fonts |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | int16 | reserved | set value to 0 |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | int16 | reserved | set value to 0 |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | int16 | reserved | set value to 0 |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | int16 | reserved | set value to 0 |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | int16 | metricDataFormat | 0 for current format |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ // | uint16 | numOfLongHorMetrics | number of advance widths in metrics table |
+ // +--------+---------------------+---------------------------------------------------------------------------------+
+ ushort majorVersion = reader.ReadUInt16();
+ ushort minorVersion = reader.ReadUInt16();
+ short ascender = reader.ReadFWORD();
+ short descender = reader.ReadFWORD();
+ short lineGap = reader.ReadFWORD();
+ ushort advanceWidthMax = reader.ReadUFWORD();
+ short minLeftSideBearing = reader.ReadFWORD();
+ short minRightSideBearing = reader.ReadFWORD();
+ short xMaxExtent = reader.ReadFWORD();
+ short caretSlopeRise = reader.ReadInt16();
+ short caretSlopeRun = reader.ReadInt16();
+ short caretOffset = reader.ReadInt16();
+ reader.ReadInt16(); // reserved
+ reader.ReadInt16(); // reserved
+ reader.ReadInt16(); // reserved
+ reader.ReadInt16(); // reserved
+ short metricDataFormat = reader.ReadInt16(); // 0
+ if (metricDataFormat != 0)
+ {
+ throw new InvalidFontTableException($"Expected metricDataFormat = 0 found {metricDataFormat}", TableName);
+ }
+
+ ushort numberOfHMetrics = reader.ReadUInt16();
+
+ return new HorizontalHeadTable(
+ ascender,
+ descender,
+ lineGap,
+ advanceWidthMax,
+ minLeftSideBearing,
+ minRightSideBearing,
+ xMaxExtent,
+ caretSlopeRise,
+ caretSlopeRun,
+ caretOffset,
+ numberOfHMetrics);
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/InvalidFontTableException.cs b/src/Avalonia.Base/Media/Fonts/Tables/InvalidFontTableException.cs
new file mode 100644
index 0000000000..d8be26a848
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/InvalidFontTableException.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// Exception font loading can throw if it encounters invalid data during font loading.
+ ///
+ ///
+ public class InvalidFontTableException : Exception
+ {
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The message that describes the error.
+ /// The table.
+ public InvalidFontTableException(string message, string table)
+ : base(message)
+ => Table = table;
+
+ ///
+ /// Gets the table where the error originated.
+ ///
+ public string Table { get; }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/KnownNameIds.cs b/src/Avalonia.Base/Media/Fonts/Tables/KnownNameIds.cs
new file mode 100644
index 0000000000..82e6926600
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/KnownNameIds.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// Provides enumeration of common name ids
+ ///
+ ///
+ public enum KnownNameIds : ushort
+ {
+ ///
+ /// The copyright notice
+ ///
+ CopyrightNotice = 0,
+
+ ///
+ /// The font family name; Up to four fonts can share the Font Family name, forming a font style linking
+ /// group (regular, italic, bold, bold italic — as defined by OS/2.fsSelection bit settings).
+ ///
+ FontFamilyName = 1,
+
+ ///
+ /// The font subfamily name; The Font Subfamily name distinguishes the font in a group with the same Font Family name (name ID 1).
+ /// This is assumed to address style (italic, oblique) and weight (light, bold, black, etc.). A font with no particular differences
+ /// in weight or style (e.g. medium weight, not italic and fsSelection bit 6 set) should have the string "Regular" stored in this position.
+ ///
+ FontSubfamilyName = 2,
+
+ ///
+ /// The unique font identifier
+ ///
+ UniqueFontID = 3,
+
+ ///
+ /// The full font name; a combination of strings 1 and 2, or a similar human-readable variant. If string 2 is "Regular", it is sometimes omitted from name ID 4.
+ ///
+ FullFontName = 4,
+
+ ///
+ /// Version string. Should begin with the syntax 'Version <number>.<number>' (upper case, lower case, or mixed, with a space between "Version" and the number).
+ /// The string must contain a version number of the following form: one or more digits (0-9) of value less than 65,535, followed by a period, followed by one or more
+ /// digits of value less than 65,535. Any character other than a digit will terminate the minor number. A character such as ";" is helpful to separate different pieces of version information.
+ /// The first such match in the string can be used by installation software to compare font versions.
+ /// Note that some installers may require the string to start with "Version ", followed by a version number as above.
+ ///
+ Version = 5,
+
+ ///
+ /// Postscript name for the font; Name ID 6 specifies a string which is used to invoke a PostScript language font that corresponds to this OpenType font.
+ /// When translated to ASCII, the name string must be no longer than 63 characters and restricted to the printable ASCII subset, codes 33 to 126,
+ /// except for the 10 characters '[', ']', '(', ')', '{', '}', '<', '>', '/', '%'.
+ /// In a CFF OpenType font, there is no requirement that this name be the same as the font name in the CFF’s Name INDEX.
+ /// Thus, the same CFF may be shared among multiple font components in a Font Collection. See the 'name' table section of
+ /// Recommendations for OpenType fonts "" for additional information.
+ ///
+ PostscriptName = 6,
+
+ ///
+ /// Trademark; this is used to save any trademark notice/information for this font. Such information should
+ /// be based on legal advice. This is distinctly separate from the copyright.
+ ///
+ Trademark = 7,
+
+ ///
+ /// The manufacturer
+ ///
+ Manufacturer = 8,
+
+ ///
+ /// Designer; name of the designer of the typeface.
+ ///
+ Designer = 9,
+
+ ///
+ /// Description; description of the typeface. Can contain revision information, usage recommendations, history, features, etc.
+ ///
+ Description = 10,
+
+ ///
+ /// URL Vendor; URL of font vendor (with protocol, e.g., http://, ftp://). If a unique serial number is embedded in
+ /// the URL, it can be used to register the font.
+ ///
+ VendorUrl = 11,
+
+ ///
+ /// URL Designer; URL of typeface designer (with protocol, e.g., http://, ftp://).
+ ///
+ DesignerUrl = 12,
+
+ ///
+ /// License Description; description of how the font may be legally used, or different example scenarios for licensed use.
+ /// This field should be written in plain language, not legalese.
+ ///
+ LicenseDescription = 13,
+
+ ///
+ /// License Info URL; URL where additional licensing information can be found.
+ ///
+ LicenseInfoUrl = 14,
+
+ ///
+ /// Typographic Family name: The typographic family grouping doesn't impose any constraints on the number of faces within it,
+ /// in contrast with the 4-style family grouping (ID 1), which is present both for historical reasons and to express style linking groups.
+ /// If name ID 16 is absent, then name ID 1 is considered to be the typographic family name.
+ /// (In earlier versions of the specification, name ID 16 was known as "Preferred Family".)
+ ///
+ TypographicFamilyName = 16,
+
+ ///
+ /// Typographic Subfamily name: This allows font designers to specify a subfamily name within the typographic family grouping.
+ /// This string must be unique within a particular typographic family. If it is absent, then name ID 2 is considered to be the
+ /// typographic subfamily name. (In earlier versions of the specification, name ID 17 was known as "Preferred Subfamily".)
+ ///
+ TypographicSubfamilyName = 17,
+
+ ///
+ /// Sample text; This can be the font name, or any other text that the designer thinks is the best sample to display the font in.
+ ///
+ SampleText = 19,
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/MissingFontTableException.cs b/src/Avalonia.Base/Media/Fonts/Tables/MissingFontTableException.cs
new file mode 100644
index 0000000000..890414fc59
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/MissingFontTableException.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// Exception font loading can throw if it finds a required table is missing during font loading.
+ ///
+ ///
+ public class MissingFontTableException : Exception
+ {
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The message that describes the error.
+ /// The table.
+ public MissingFontTableException(string message, string table)
+ : base(message)
+ => Table = table;
+
+ ///
+ /// Gets the table where the error originated.
+ ///
+ public string Table { get; }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/Name/NameRecord.cs b/src/Avalonia.Base/Media/Fonts/Tables/Name/NameRecord.cs
new file mode 100644
index 0000000000..7a7ad71995
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/Name/NameRecord.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+namespace Avalonia.Media.Fonts.Tables.Name
+{
+ internal class NameRecord
+ {
+ private readonly string value;
+
+ public NameRecord(PlatformIDs platform, ushort languageId, KnownNameIds nameId, string value)
+ {
+ Platform = platform;
+ LanguageID = languageId;
+ NameID = nameId;
+ this.value = value;
+ }
+
+ public PlatformIDs Platform { get; }
+
+ public ushort LanguageID { get; }
+
+ public KnownNameIds NameID { get; }
+
+ internal StringLoader? StringReader { get; private set; }
+
+ public string Value => StringReader?.Value ?? value;
+
+ public static NameRecord Read(BigEndianBinaryReader reader)
+ {
+ var platform = reader.ReadUInt16();
+ var encodingId = reader.ReadUInt16();
+ var encoding = encodingId.AsEncoding();
+ var languageID = reader.ReadUInt16();
+ var nameID = reader.ReadUInt16();
+
+ var stringReader = StringLoader.Create(reader, encoding);
+
+ return new NameRecord(platform, languageID, nameID, string.Empty)
+ {
+ StringReader = stringReader
+ };
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/Name/NameTable.cs b/src/Avalonia.Base/Media/Fonts/Tables/Name/NameTable.cs
new file mode 100644
index 0000000000..e2a5cbb681
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/Name/NameTable.cs
@@ -0,0 +1,179 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace Avalonia.Media.Fonts.Tables.Name
+{
+ internal class NameTable
+ {
+ internal const string TableName = "name";
+ internal static readonly OpenTypeTag Tag = OpenTypeTag.Parse(TableName);
+
+ private readonly NameRecord[] _names;
+
+ internal NameTable(NameRecord[] names, IReadOnlyList languages)
+ {
+ _names = names;
+ Languages = languages;
+ }
+
+ public IReadOnlyList Languages { get; }
+
+ ///
+ /// Gets the name of the font.
+ ///
+ ///
+ /// The name of the font.
+ ///
+ public string Id(ushort culture)
+ => GetNameById(culture, KnownNameIds.UniqueFontID);
+
+ ///
+ /// Gets the name of the font.
+ ///
+ ///
+ /// The name of the font.
+ ///
+ public string FontName(ushort culture)
+ => GetNameById(culture, KnownNameIds.FullFontName);
+
+ ///
+ /// Gets the name of the font.
+ ///
+ ///
+ /// The name of the font.
+ ///
+ public string FontFamilyName(ushort culture)
+ => GetNameById(culture, KnownNameIds.FontFamilyName);
+
+ ///
+ /// Gets the name of the font.
+ ///
+ ///
+ /// The name of the font.
+ ///
+ public string FontSubFamilyName(ushort culture)
+ => GetNameById(culture, KnownNameIds.FontSubfamilyName);
+
+ public string GetNameById(ushort culture, KnownNameIds nameId)
+ {
+ var languageId = culture;
+ NameRecord? usaVersion = null;
+ NameRecord? firstWindows = null;
+ NameRecord? first = null;
+ foreach (var name in _names)
+ {
+ if (name.NameID == nameId)
+ {
+ // Get just the first one, just in case.
+ first ??= name;
+ if (name.Platform == PlatformIDs.Windows)
+ {
+ // If us not found return the first windows one.
+ firstWindows ??= name;
+ if (name.LanguageID == 0x0409)
+ {
+ // Grab the us version as its on next best match.
+ usaVersion ??= name;
+ }
+
+ if (name.LanguageID == languageId)
+ {
+ // Return the most exact first.
+ return name.Value;
+ }
+ }
+ }
+ }
+
+ return usaVersion?.Value ??
+ firstWindows?.Value ??
+ first?.Value ??
+ string.Empty;
+ }
+
+ public string GetNameById(ushort culture, ushort nameId)
+ => GetNameById(culture, (KnownNameIds)nameId);
+
+ public static NameTable Load(IGlyphTypeface glyphTypeface)
+ {
+ if (!glyphTypeface.TryGetTable(Tag, out var table))
+ {
+ throw new MissingFontTableException("Could not load table", "name");
+ }
+
+ using var stream = new MemoryStream(table);
+ using var binaryReader = new BigEndianBinaryReader(stream, false);
+
+ // Move to start of table.
+ return Load(binaryReader);
+ }
+
+ public static NameTable Load(BigEndianBinaryReader reader)
+ {
+ var strings = new List();
+ var format = reader.ReadUInt16();
+ var nameCount = reader.ReadUInt16();
+ var stringOffset = reader.ReadUInt16();
+
+ var names = new NameRecord[nameCount];
+
+ for (var i = 0; i < nameCount; i++)
+ {
+ names[i] = NameRecord.Read(reader);
+
+ var sr = names[i].StringReader;
+
+ if (sr is not null)
+ {
+ strings.Add(sr);
+ }
+ }
+
+ //var languageNames = Array.Empty();
+
+ //if (format == 1)
+ //{
+ // // Format 1 adds language data.
+ // var langCount = reader.ReadUInt16();
+ // languageNames = new StringLoader[langCount];
+
+ // for (var i = 0; i < langCount; i++)
+ // {
+ // languageNames[i] = StringLoader.Create(reader);
+
+ // strings.Add(languageNames[i]);
+ // }
+ //}
+
+ foreach (var readable in strings)
+ {
+ var readableStartOffset = stringOffset + readable.Offset;
+
+ reader.Seek(readableStartOffset, SeekOrigin.Begin);
+
+ readable.LoadValue(reader);
+ }
+
+ var cultures = new List();
+
+ foreach (var nameRecord in names)
+ {
+ if (nameRecord.NameID != KnownNameIds.FontFamilyName || nameRecord.Platform != PlatformIDs.Windows || nameRecord.LanguageID == 0)
+ {
+ continue;
+ }
+
+ if (!cultures.Contains(nameRecord.LanguageID))
+ {
+ cultures.Add(nameRecord.LanguageID);
+ }
+ }
+
+ return new NameTable(names, cultures);
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/OS2Table.cs b/src/Avalonia.Base/Media/Fonts/Tables/OS2Table.cs
new file mode 100644
index 0000000000..73d80edd7d
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/OS2Table.cs
@@ -0,0 +1,423 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System;
+using System.IO;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ internal sealed class OS2Table
+ {
+ internal const string TableName = "OS/2";
+ internal static OpenTypeTag Tag = OpenTypeTag.Parse(TableName);
+
+ private readonly ushort styleType;
+ private readonly byte[] panose;
+ private readonly short capHeight;
+ private readonly short familyClass;
+ private readonly short heightX;
+ private readonly string tag;
+ private readonly ushort codePageRange1;
+ private readonly ushort codePageRange2;
+ private readonly uint unicodeRange1;
+ private readonly uint unicodeRange2;
+ private readonly uint unicodeRange3;
+ private readonly uint unicodeRange4;
+ private readonly ushort breakChar;
+ private readonly ushort defaultChar;
+ private readonly ushort firstCharIndex;
+ private readonly ushort lastCharIndex;
+ private readonly ushort lowerOpticalPointSize;
+ private readonly ushort maxContext;
+ private readonly ushort upperOpticalPointSize;
+ private readonly ushort weightClass;
+ private readonly ushort widthClass;
+ private readonly short averageCharWidth;
+
+ public OS2Table(
+ short averageCharWidth,
+ ushort weightClass,
+ ushort widthClass,
+ ushort styleType,
+ short subscriptXSize,
+ short subscriptYSize,
+ short subscriptXOffset,
+ short subscriptYOffset,
+ short superscriptXSize,
+ short superscriptYSize,
+ short superscriptXOffset,
+ short superscriptYOffset,
+ short strikeoutSize,
+ short strikeoutPosition,
+ short familyClass,
+ byte[] panose,
+ uint unicodeRange1,
+ uint unicodeRange2,
+ uint unicodeRange3,
+ uint unicodeRange4,
+ string tag,
+ FontStyleSelection fontStyle,
+ ushort firstCharIndex,
+ ushort lastCharIndex,
+ short typoAscender,
+ short typoDescender,
+ short typoLineGap,
+ ushort winAscent,
+ ushort winDescent)
+ {
+ this.averageCharWidth = averageCharWidth;
+ this.weightClass = weightClass;
+ this.widthClass = widthClass;
+ this.styleType = styleType;
+ SubscriptXSize = subscriptXSize;
+ SubscriptYSize = subscriptYSize;
+ SubscriptXOffset = subscriptXOffset;
+ SubscriptYOffset = subscriptYOffset;
+ SuperscriptXSize = superscriptXSize;
+ SuperscriptYSize = superscriptYSize;
+ SuperscriptXOffset = superscriptXOffset;
+ SuperscriptYOffset = superscriptYOffset;
+ StrikeoutSize = strikeoutSize;
+ StrikeoutPosition = strikeoutPosition;
+ this.familyClass = familyClass;
+ this.panose = panose;
+ this.unicodeRange1 = unicodeRange1;
+ this.unicodeRange2 = unicodeRange2;
+ this.unicodeRange3 = unicodeRange3;
+ this.unicodeRange4 = unicodeRange4;
+ this.tag = tag;
+ FontStyle = fontStyle;
+ this.firstCharIndex = firstCharIndex;
+ this.lastCharIndex = lastCharIndex;
+ TypoAscender = typoAscender;
+ TypoDescender = typoDescender;
+ TypoLineGap = typoLineGap;
+ WinAscent = winAscent;
+ WinDescent = winDescent;
+ }
+
+ public OS2Table(
+ OS2Table version0Table,
+ ushort codePageRange1,
+ ushort codePageRange2,
+ short heightX,
+ short capHeight,
+ ushort defaultChar,
+ ushort breakChar,
+ ushort maxContext)
+ : this(
+ version0Table.averageCharWidth,
+ version0Table.weightClass,
+ version0Table.widthClass,
+ version0Table.styleType,
+ version0Table.SubscriptXSize,
+ version0Table.SubscriptYSize,
+ version0Table.SubscriptXOffset,
+ version0Table.SubscriptYOffset,
+ version0Table.SuperscriptXSize,
+ version0Table.SuperscriptYSize,
+ version0Table.SuperscriptXOffset,
+ version0Table.SuperscriptYOffset,
+ version0Table.StrikeoutSize,
+ version0Table.StrikeoutPosition,
+ version0Table.familyClass,
+ version0Table.panose,
+ version0Table.unicodeRange1,
+ version0Table.unicodeRange2,
+ version0Table.unicodeRange3,
+ version0Table.unicodeRange4,
+ version0Table.tag,
+ version0Table.FontStyle,
+ version0Table.firstCharIndex,
+ version0Table.lastCharIndex,
+ version0Table.TypoAscender,
+ version0Table.TypoDescender,
+ version0Table.TypoLineGap,
+ version0Table.WinAscent,
+ version0Table.WinDescent)
+ {
+ this.codePageRange1 = codePageRange1;
+ this.codePageRange2 = codePageRange2;
+ this.heightX = heightX;
+ this.capHeight = capHeight;
+ this.defaultChar = defaultChar;
+ this.breakChar = breakChar;
+ this.maxContext = maxContext;
+ }
+
+ public OS2Table(OS2Table versionLessThan5Table, ushort lowerOpticalPointSize, ushort upperOpticalPointSize)
+ : this(
+ versionLessThan5Table,
+ versionLessThan5Table.codePageRange1,
+ versionLessThan5Table.codePageRange2,
+ versionLessThan5Table.heightX,
+ versionLessThan5Table.capHeight,
+ versionLessThan5Table.defaultChar,
+ versionLessThan5Table.breakChar,
+ versionLessThan5Table.maxContext)
+ {
+ this.lowerOpticalPointSize = lowerOpticalPointSize;
+ this.upperOpticalPointSize = upperOpticalPointSize;
+ }
+
+ [Flags]
+ internal enum FontStyleSelection : ushort
+ {
+ ///
+ /// Font contains italic or oblique characters, otherwise they are upright.
+ ///
+ ITALIC = 1,
+
+ ///
+ /// Characters are underscored.
+ ///
+ UNDERSCORE = 1 << 1,
+
+ ///
+ /// Characters have their foreground and background reversed.
+ ///
+ NEGATIVE = 1 << 2,
+
+ ///
+ /// characters, otherwise they are solid.
+ ///
+ OUTLINED = 1 << 3,
+
+ ///
+ /// Characters are overstruck.
+ ///
+ STRIKEOUT = 1 << 4,
+
+ ///
+ /// Characters are emboldened.
+ ///
+ BOLD = 1 << 5,
+
+ ///
+ /// Characters are in the standard weight/style for the font.
+ ///
+ REGULAR = 1 << 6,
+
+ ///
+ /// If set, it is strongly recommended to use OS/2.typoAscender - OS/2.typoDescender+ OS/2.typoLineGap as a value for default line spacing for this font.
+ ///
+ USE_TYPO_METRICS = 1 << 7,
+
+ ///
+ /// The font has ‘name’ table strings consistent with a weight/width/slope family without requiring use of ‘name’ IDs 21 and 22. (Please see more detailed description below.)
+ ///
+ WWS = 1 << 8,
+
+ ///
+ /// Font contains oblique characters.
+ ///
+ OBLIQUE = 1 << 9,
+
+ // 10–15 Reserved; set to 0.
+ }
+
+ public FontStyleSelection FontStyle { get; }
+
+ public short TypoAscender { get; }
+
+ public short TypoDescender { get; }
+
+ public short TypoLineGap { get; }
+
+ public ushort WinAscent { get; }
+
+ public ushort WinDescent { get; }
+
+ public short StrikeoutPosition { get; }
+
+ public short StrikeoutSize { get; }
+
+ public short SubscriptXOffset { get; }
+
+ public short SubscriptXSize { get; }
+
+ public short SubscriptYOffset { get; }
+
+ public short SubscriptYSize { get; }
+
+ public short SuperscriptXOffset { get; }
+
+ public short SuperscriptXSize { get; }
+
+ public short SuperscriptYOffset { get; }
+
+ public short SuperscriptYSize { get; }
+
+ public static OS2Table? Load(IGlyphTypeface glyphTypeface)
+ {
+ if (!glyphTypeface.TryGetTable(Tag, out var table))
+ {
+ return null;
+ }
+
+ using var stream = new MemoryStream(table);
+ using var binaryReader = new BigEndianBinaryReader(stream, false);
+
+ // Move to start of table.
+ return Load(binaryReader);
+ }
+
+ public static OS2Table Load(BigEndianBinaryReader reader)
+ {
+ // Version 1.0
+ // Type | Name | Comments
+ // -------|------------------------|-----------------------
+ // uint16 |version | 0x0005
+ // int16 |xAvgCharWidth |
+ // uint16 |usWeightClass |
+ // uint16 |usWidthClass |
+ // uint16 |fsType |
+ // int16 |ySubscriptXSize |
+ // int16 |ySubscriptYSize |
+ // int16 |ySubscriptXOffset |
+ // int16 |ySubscriptYOffset |
+ // int16 |ySuperscriptXSize |
+ // int16 |ySuperscriptYSize |
+ // int16 |ySuperscriptXOffset |
+ // int16 |ySuperscriptYOffset |
+ // int16 |yStrikeoutSize |
+ // int16 |yStrikeoutPosition |
+ // int16 |sFamilyClass |
+ // uint8 |panose[10] |
+ // uint32 |ulUnicodeRange1 | Bits 0–31
+ // uint32 |ulUnicodeRange2 | Bits 32–63
+ // uint32 |ulUnicodeRange3 | Bits 64–95
+ // uint32 |ulUnicodeRange4 | Bits 96–127
+ // Tag |achVendID |
+ // uint16 |fsSelection |
+ // uint16 |usFirstCharIndex |
+ // uint16 |usLastCharIndex |
+ // int16 |sTypoAscender |
+ // int16 |sTypoDescender |
+ // int16 |sTypoLineGap |
+ // uint16 |usWinAscent |
+ // uint16 |usWinDescent |
+ // uint32 |ulCodePageRange1 | Bits 0–31
+ // uint32 |ulCodePageRange2 | Bits 32–63
+ // int16 |sxHeight |
+ // int16 |sCapHeight |
+ // uint16 |usDefaultChar |
+ // uint16 |usBreakChar |
+ // uint16 |usMaxContext |
+ // uint16 |usLowerOpticalPointSize |
+ // uint16 |usUpperOpticalPointSize |
+ ushort version = reader.ReadUInt16(); // assert 0x0005
+ short averageCharWidth = reader.ReadInt16();
+ ushort weightClass = reader.ReadUInt16();
+ ushort widthClass = reader.ReadUInt16();
+ ushort styleType = reader.ReadUInt16();
+ short subscriptXSize = reader.ReadInt16();
+ short subscriptYSize = reader.ReadInt16();
+ short subscriptXOffset = reader.ReadInt16();
+ short subscriptYOffset = reader.ReadInt16();
+
+ short superscriptXSize = reader.ReadInt16();
+ short superscriptYSize = reader.ReadInt16();
+ short superscriptXOffset = reader.ReadInt16();
+ short superscriptYOffset = reader.ReadInt16();
+
+ short strikeoutSize = reader.ReadInt16();
+ short strikeoutPosition = reader.ReadInt16();
+ short familyClass = reader.ReadInt16();
+ byte[] panose = reader.ReadUInt8Array(10);
+ uint unicodeRange1 = reader.ReadUInt32(); // Bits 0–31
+ uint unicodeRange2 = reader.ReadUInt32(); // Bits 32–63
+ uint unicodeRange3 = reader.ReadUInt32(); // Bits 64–95
+ uint unicodeRange4 = reader.ReadUInt32(); // Bits 96–127
+ string tag = reader.ReadTag();
+ FontStyleSelection fontStyle = reader.ReadUInt16();
+ ushort firstCharIndex = reader.ReadUInt16();
+ ushort lastCharIndex = reader.ReadUInt16();
+ short typoAscender = reader.ReadInt16();
+ short typoDescender = reader.ReadInt16();
+ short typoLineGap = reader.ReadInt16();
+ ushort winAscent = reader.ReadUInt16();
+ ushort winDescent = reader.ReadUInt16();
+
+ var version0Table = new OS2Table(
+ averageCharWidth,
+ weightClass,
+ widthClass,
+ styleType,
+ subscriptXSize,
+ subscriptYSize,
+ subscriptXOffset,
+ subscriptYOffset,
+ superscriptXSize,
+ superscriptYSize,
+ superscriptXOffset,
+ superscriptYOffset,
+ strikeoutSize,
+ strikeoutPosition,
+ familyClass,
+ panose,
+ unicodeRange1,
+ unicodeRange2,
+ unicodeRange3,
+ unicodeRange4,
+ tag,
+ fontStyle,
+ firstCharIndex,
+ lastCharIndex,
+ typoAscender,
+ typoDescender,
+ typoLineGap,
+ winAscent,
+ winDescent);
+
+ if (version == 0)
+ {
+ return version0Table;
+ }
+
+ short heightX = 0;
+ short capHeight = 0;
+
+ ushort defaultChar = 0;
+ ushort breakChar = 0;
+ ushort maxContext = 0;
+
+ ushort codePageRange1 = reader.ReadUInt16(); // Bits 0–31
+ ushort codePageRange2 = reader.ReadUInt16(); // Bits 32–63
+
+ // fields exist only in > v1 https://docs.microsoft.com/en-us/typography/opentype/spec/os2
+ if (version > 1)
+ {
+ heightX = reader.ReadInt16();
+ capHeight = reader.ReadInt16();
+ defaultChar = reader.ReadUInt16();
+ breakChar = reader.ReadUInt16();
+ maxContext = reader.ReadUInt16();
+ }
+
+ var versionLessThan5Table = new OS2Table(
+ version0Table,
+ codePageRange1,
+ codePageRange2,
+ heightX,
+ capHeight,
+ defaultChar,
+ breakChar,
+ maxContext);
+
+ if (version < 5)
+ {
+ return versionLessThan5Table;
+ }
+
+ ushort lowerOpticalPointSize = reader.ReadUInt16();
+ ushort upperOpticalPointSize = reader.ReadUInt16();
+
+ return new OS2Table(
+ versionLessThan5Table,
+ lowerOpticalPointSize,
+ upperOpticalPointSize);
+ }
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/PlatformIDs.cs b/src/Avalonia.Base/Media/Fonts/Tables/PlatformIDs.cs
new file mode 100644
index 0000000000..c57c4e2726
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/PlatformIDs.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ ///
+ /// platforms ids
+ ///
+ internal enum PlatformIDs : ushort
+ {
+ ///
+ /// Unicode platform
+ ///
+ Unicode = 0,
+
+ ///
+ /// Script manager code
+ ///
+ Macintosh = 1,
+
+ ///
+ /// [deprecated] ISO encoding
+ ///
+ ISO = 2,
+
+ ///
+ /// Window encoding
+ ///
+ Windows = 3,
+
+ ///
+ /// Custom platform
+ ///
+ Custom = 4 // Custom None
+ }
+}
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/StringLoader.cs b/src/Avalonia.Base/Media/Fonts/Tables/StringLoader.cs
new file mode 100644
index 0000000000..a42c87b5bd
--- /dev/null
+++ b/src/Avalonia.Base/Media/Fonts/Tables/StringLoader.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
+
+using System.Diagnostics;
+using System.Text;
+
+namespace Avalonia.Media.Fonts.Tables
+{
+ [DebuggerDisplay("Offset: {Offset}, Length: {Length}, Value: {Value}")]
+ internal class StringLoader
+ {
+ public StringLoader(ushort length, ushort offset, Encoding encoding)
+ {
+ Length = length;
+ Offset = offset;
+ Encoding = encoding;
+ Value = string.Empty;
+ }
+
+ public ushort Length { get; }
+
+ public ushort Offset { get; }
+
+ public string Value { get; private set; }
+
+ public Encoding Encoding { get; }
+
+ public static StringLoader Create(BigEndianBinaryReader reader)
+ => Create(reader, Encoding.BigEndianUnicode);
+
+ public static StringLoader Create(BigEndianBinaryReader reader, Encoding encoding)
+ => new StringLoader(reader.ReadUInt16(), reader.ReadUInt16(), encoding);
+
+ public void LoadValue(BigEndianBinaryReader reader)
+ => Value = reader.ReadString(Length, Encoding).Replace("\0", string.Empty);
+ }
+}
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index a751ccc9bc..a81dbdb3f0 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -153,7 +153,8 @@ namespace Avalonia.Media
///
/// Gets the conservative bounding box of the .
///
- public Rect Bounds => new Rect(new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height));
+ public Rect Bounds => new Rect(new Point(BaselineOrigin.X, 0),
+ new Size(Metrics.WidthIncludingTrailingWhitespace, Metrics.Height));
public Rect InkBounds => PlatformImpl.Item.Bounds;
@@ -573,7 +574,10 @@ namespace Avalonia.Media
}
}
- nextCluster = _glyphInfos[currentIndex].GlyphCluster;
+ if (_glyphInfos.Count > 0 && currentIndex <= _glyphInfos.Count)
+ {
+ nextCluster = _glyphInfos[currentIndex].GlyphCluster;
+ }
}
var clusterLength = Math.Max(0, nextCluster - cluster);
@@ -638,7 +642,7 @@ namespace Avalonia.Media
{
int firstCluster, lastCluster;
- if (Characters.IsEmpty)
+ if (Characters.IsEmpty || _glyphInfos.Count == 0)
{
firstCluster = 0;
lastCluster = 0;
@@ -687,7 +691,7 @@ namespace Avalonia.Media
return new GlyphRunMetrics
{
- Baseline = -GlyphTypeface.Metrics.Ascent * Scale,
+ Baseline = (-GlyphTypeface.Metrics.Ascent + GlyphTypeface.Metrics.LineGap) * Scale,
Width = width,
WidthIncludingTrailingWhitespace = widthIncludingTrailingWhitespace,
Height = height,
diff --git a/src/Avalonia.Base/Media/IGlyphTypeface2.cs b/src/Avalonia.Base/Media/IGlyphTypeface2.cs
index d0152ccb3c..2c7ea58bcb 100644
--- a/src/Avalonia.Base/Media/IGlyphTypeface2.cs
+++ b/src/Avalonia.Base/Media/IGlyphTypeface2.cs
@@ -1,16 +1,28 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
using System.IO;
+using Avalonia.Media.Fonts;
namespace Avalonia.Media
{
internal interface IGlyphTypeface2 : IGlyphTypeface
{
-
///
/// Returns the font file stream represented by the object.
///
/// The stream.
/// Returns true if the stream can be obtained, otherwise false.
bool TryGetStream([NotNullWhen(true)] out Stream? stream);
+
+ ///
+ /// Gets the localized family names.
+ /// Keys are culture identifiers.
+ ///
+ IReadOnlyDictionary FamilyNames { get; }
+
+ ///
+ /// Gets supported font features.
+ ///
+ IReadOnlyList SupportedFeatures { get; }
}
}
diff --git a/src/Avalonia.Base/Media/LineSegment.cs b/src/Avalonia.Base/Media/LineSegment.cs
index 68193bb770..8b0014fcc8 100644
--- a/src/Avalonia.Base/Media/LineSegment.cs
+++ b/src/Avalonia.Base/Media/LineSegment.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Media
internal override void ApplyTo(StreamGeometryContext ctx)
{
- ctx.LineTo(Point);
+ ctx.LineTo(Point, IsStroked);
}
public override string ToString()
diff --git a/src/Avalonia.Base/Media/PathSegment.cs b/src/Avalonia.Base/Media/PathSegment.cs
index 0b517e56f3..6b5f5f601d 100644
--- a/src/Avalonia.Base/Media/PathSegment.cs
+++ b/src/Avalonia.Base/Media/PathSegment.cs
@@ -3,5 +3,14 @@ namespace Avalonia.Media
public abstract class PathSegment : AvaloniaObject
{
internal abstract void ApplyTo(StreamGeometryContext ctx);
+
+ public static readonly StyledProperty IsStrokedProperty =
+ AvaloniaProperty.Register(nameof(IsStroked), true);
+
+ public bool IsStroked
+ {
+ get => GetValue(IsStrokedProperty);
+ set => SetValue(IsStrokedProperty, value);
+ }
}
}
diff --git a/src/Avalonia.Base/Media/PolyBezierSegment.cs b/src/Avalonia.Base/Media/PolyBezierSegment.cs
new file mode 100644
index 0000000000..e77efe4b6d
--- /dev/null
+++ b/src/Avalonia.Base/Media/PolyBezierSegment.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Utilities;
+
+namespace Avalonia.Media;
+
+///
+/// PolyBezierSegment
+///
+public sealed class PolyBezierSegment : PathSegment
+{
+ ///
+ /// Points DirectProperty definition
+ ///
+ public static readonly DirectProperty PointsProperty =
+ AvaloniaProperty.RegisterDirect(nameof(Points),
+ o => o.Points,
+ (o, v) => o.Points = v);
+
+ private Points? _points = [];
+
+ public PolyBezierSegment()
+ {
+
+ }
+
+ public PolyBezierSegment(IEnumerable points, bool isStroked)
+ {
+ if (points is null)
+ {
+ throw new ArgumentNullException(nameof(points));
+ }
+
+ Points = new Points(points);
+ IsStroked = isStroked;
+ }
+
+ ///
+ /// Gets or sets the Point collection that defines this object.
+ ///
+ ///
+ /// The points.
+ ///
+ [Metadata.Content]
+ public Points? Points
+ {
+ get => _points;
+ set => SetAndRaise(PointsProperty, ref _points, value);
+ }
+
+ internal override void ApplyTo(StreamGeometryContext ctx)
+ {
+ var isStroken = this.IsStroked;
+ if (_points is { Count: > 0 } points)
+ {
+ var i = 0;
+ for (; i < points.Count; i += 3)
+ {
+ ctx.CubicBezierTo(points[i],
+ points[i + 1],
+ points[i + 2],
+ isStroken);
+ }
+ var delta = i - points.Count;
+ if (delta != 0)
+ {
+ Logging.Logger.TryGet(Logging.LogEventLevel.Warning,
+ Logging.LogArea.Visual)
+ ?.Log(nameof(PolyBezierSegment),
+ $"{nameof(PolyBezierSegment)} has ivalid number of points. Last {Math.Abs(delta)} points will be ignored.");
+ }
+ }
+ }
+
+ public override string ToString()
+ {
+ var builder = StringBuilderCache.Acquire();
+ if (_points is { Count: > 0 } points)
+ {
+ builder.Append('C').Append(' ');
+ foreach (var point in _points)
+ {
+ builder.Append(FormattableString.Invariant($"{point}"));
+ builder.Append(' ');
+ }
+ builder.Length = builder.Length - 1;
+ }
+ return StringBuilderCache.GetStringAndRelease(builder);
+ }
+}
diff --git a/src/Avalonia.Base/Media/PolyLineSegment.cs b/src/Avalonia.Base/Media/PolyLineSegment.cs
index da87a2155b..c97c016ab3 100644
--- a/src/Avalonia.Base/Media/PolyLineSegment.cs
+++ b/src/Avalonia.Base/Media/PolyLineSegment.cs
@@ -53,7 +53,7 @@ namespace Avalonia.Media
{
for (int i = 0; i < points.Count; i++)
{
- ctx.LineTo(points[i]);
+ ctx.LineTo(points[i], IsStroked);
}
}
}
diff --git a/src/Avalonia.Base/Media/QuadraticBezierSegment .cs b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
index 01d22f2043..a338080065 100644
--- a/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
+++ b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
@@ -42,7 +42,7 @@ namespace Avalonia.Media
internal override void ApplyTo(StreamGeometryContext ctx)
{
- ctx.QuadraticBezierTo(Point1, Point2);
+ ctx.QuadraticBezierTo(Point1, Point2, IsStroked);
}
public override string ToString()
diff --git a/src/Avalonia.Base/Media/StreamGeometryContext.cs b/src/Avalonia.Base/Media/StreamGeometryContext.cs
index 66fb65a6c2..c8072564b1 100644
--- a/src/Avalonia.Base/Media/StreamGeometryContext.cs
+++ b/src/Avalonia.Base/Media/StreamGeometryContext.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Media
/// of is obtained by calling
/// .
///
- public class StreamGeometryContext : IGeometryContext
+ public class StreamGeometryContext : IGeometryContext, IGeometryContext2
{
private readonly IStreamGeometryContextImpl _impl;
@@ -102,5 +102,46 @@ namespace Avalonia.Media
{
_impl.Dispose();
}
+
+ ///
+ public void LineTo(Point point, bool isStroked)
+ {
+ if (_impl is IGeometryContext2 context2)
+ context2.LineTo(point, isStroked);
+ else
+ _impl.LineTo(point);
+
+ _currentPoint = point;
+ }
+
+ public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection, bool isStroked)
+ {
+ if (_impl is IGeometryContext2 context2)
+ context2.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection, isStroked);
+ else
+ _impl.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection);
+
+ _currentPoint = point;
+ }
+
+ public void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint, bool isStroked)
+ {
+ if (_impl is IGeometryContext2 context2)
+ context2.CubicBezierTo(controlPoint1, controlPoint2, endPoint, isStroked);
+ else
+ _impl.CubicBezierTo(controlPoint1, controlPoint2, endPoint);
+
+ _currentPoint = endPoint;
+ }
+
+ public void QuadraticBezierTo(Point controlPoint, Point endPoint, bool isStroked)
+ {
+ if (_impl is IGeometryContext2 context2)
+ context2.QuadraticBezierTo(controlPoint, endPoint, isStroked);
+ else
+ _impl.QuadraticBezierTo(controlPoint, endPoint);
+
+ _currentPoint = endPoint;
+ }
}
}
diff --git a/src/Avalonia.Base/Media/TextDecoration.cs b/src/Avalonia.Base/Media/TextDecoration.cs
index 8661959aa6..beac28da4a 100644
--- a/src/Avalonia.Base/Media/TextDecoration.cs
+++ b/src/Avalonia.Base/Media/TextDecoration.cs
@@ -182,18 +182,18 @@ namespace Avalonia.Media
break;
}
- var origin = new Point();
+ var origin = baselineOrigin;
switch (Location)
{
- case TextDecorationLocation.Baseline:
- origin += glyphRun.BaselineOrigin;
+ case TextDecorationLocation.Overline:
+ origin += new Point(0, textMetrics.Ascent);
break;
case TextDecorationLocation.Strikethrough:
- origin += new Point(baselineOrigin.X, baselineOrigin.Y + textMetrics.StrikethroughPosition);
+ origin += new Point(0, textMetrics.StrikethroughPosition);
break;
case TextDecorationLocation.Underline:
- origin += new Point(baselineOrigin.X, baselineOrigin.Y + textMetrics.UnderlinePosition);
+ origin += new Point(0, textMetrics.UnderlinePosition);
break;
}
@@ -255,7 +255,10 @@ namespace Avalonia.Media
}
}
- drawingContext.DrawLine(pen, origin, origin + new Point(glyphRun.Metrics.Width, 0));
+ var p1 = origin;
+ var p2 = p1 + new Point(glyphRun.Metrics.Width, 0);
+
+ drawingContext.DrawLine(pen, p1, p2);
}
}
}
diff --git a/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs b/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
index a1dc0827e8..caaaa00780 100644
--- a/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
@@ -98,7 +98,7 @@ namespace Avalonia.Media.TextFormatting
///
/// true if characters fit into the available width; otherwise, false.
///
- internal bool TryMeasureCharacters(double availableWidth, out int length)
+ public bool TryMeasureCharacters(double availableWidth, out int length)
{
length = 0;
var currentWidth = 0.0;
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
index 7cdf81ecc9..e1d9253415 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCollapsingProperties.cs
@@ -27,5 +27,56 @@ namespace Avalonia.Media.TextFormatting
///
/// Text line to collapse.
public abstract TextRun[]? Collapse(TextLine textLine);
+
+ ///
+ /// Creates a list of runs for given collapsed length which includes specified symbol at the end.
+ ///
+ /// The text line.
+ /// The collapsed length.
+ /// The flow direction.
+ /// The symbol.
+ /// List of remaining runs.
+ public static TextRun[] CreateCollapsedRuns(TextLine textLine, int collapsedLength,
+ FlowDirection flowDirection, TextRun shapedSymbol)
+ {
+ var textRuns = textLine.TextRuns;
+
+ if (collapsedLength <= 0)
+ {
+ return new[] { shapedSymbol };
+ }
+
+ if (flowDirection == FlowDirection.RightToLeft)
+ {
+ collapsedLength = textLine.Length - collapsedLength;
+ }
+
+ var objectPool = FormattingObjectPool.Instance;
+
+ var (preSplitRuns, postSplitRuns) = TextFormatterImpl.SplitTextRuns(textRuns, collapsedLength, objectPool);
+
+ try
+ {
+ if (flowDirection == FlowDirection.RightToLeft)
+ {
+ var collapsedRuns = new TextRun[postSplitRuns!.Count + 1];
+ postSplitRuns.CopyTo(collapsedRuns, 1);
+ collapsedRuns[0] = shapedSymbol;
+ return collapsedRuns;
+ }
+ else
+ {
+ var collapsedRuns = new TextRun[preSplitRuns!.Count + 1];
+ preSplitRuns.CopyTo(collapsedRuns);
+ collapsedRuns[collapsedRuns.Length - 1] = shapedSymbol;
+ return collapsedRuns;
+ }
+ }
+ finally
+ {
+ objectPool.TextRunLists.Return(ref preSplitRuns);
+ objectPool.TextRunLists.Return(ref postSplitRuns);
+ }
+ }
}
}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
index 8b6d576c6e..fb01afa33d 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextEllipsisHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using Avalonia.Media.TextFormatting.Unicode;
+using Avalonia.Media.TextFormatting.Unicode;
namespace Avalonia.Media.TextFormatting
{
@@ -17,12 +16,12 @@ namespace Avalonia.Media.TextFormatting
var runIndex = 0;
var currentWidth = 0.0;
var collapsedLength = 0;
- var shapedSymbol = TextFormatterImpl.CreateSymbol(properties.Symbol, FlowDirection.LeftToRight);
+ var shapedSymbol = TextFormatter.CreateSymbol(properties.Symbol, FlowDirection.LeftToRight);
if (properties.Width < shapedSymbol.GlyphRun.Bounds.Width)
{
//Not enough space to fit in the symbol
- return Array.Empty();
+ return [];
}
var availableWidth = properties.Width - shapedSymbol.Size.Width;
@@ -72,7 +71,7 @@ namespace Avalonia.Media.TextFormatting
collapsedLength += measuredLength;
- return CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.LeftToRight, shapedSymbol);
+ return TextCollapsingProperties.CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.LeftToRight, shapedSymbol);
}
availableWidth -= shapedRun.Size.Width;
@@ -85,7 +84,7 @@ namespace Avalonia.Media.TextFormatting
//The whole run needs to fit into available space
if (currentWidth + drawableRun.Size.Width > availableWidth)
{
- return CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.LeftToRight, shapedSymbol);
+ return TextCollapsingProperties.CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.LeftToRight, shapedSymbol);
}
availableWidth -= drawableRun.Size.Width;
@@ -146,7 +145,7 @@ namespace Avalonia.Media.TextFormatting
collapsedLength += measuredLength;
- return CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.RightToLeft, shapedSymbol);
+ return TextCollapsingProperties.CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.RightToLeft, shapedSymbol);
}
availableWidth -= shapedRun.Size.Width;
@@ -159,7 +158,7 @@ namespace Avalonia.Media.TextFormatting
//The whole run needs to fit into available space
if (currentWidth + drawableRun.Size.Width > availableWidth)
{
- return CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.RightToLeft, shapedSymbol);
+ return TextCollapsingProperties.CreateCollapsedRuns(textLine, collapsedLength, FlowDirection.RightToLeft, shapedSymbol);
}
availableWidth -= drawableRun.Size.Width;
@@ -176,48 +175,5 @@ namespace Avalonia.Media.TextFormatting
return null;
}
-
- private static TextRun[] CreateCollapsedRuns(TextLine textLine, int collapsedLength,
- FlowDirection flowDirection, TextRun shapedSymbol)
- {
- var textRuns = textLine.TextRuns;
-
- if (collapsedLength <= 0)
- {
- return new[] { shapedSymbol };
- }
-
- if(flowDirection == FlowDirection.RightToLeft)
- {
- collapsedLength = textLine.Length - collapsedLength;
- }
-
- var objectPool = FormattingObjectPool.Instance;
-
- var (preSplitRuns, postSplitRuns) = TextFormatterImpl.SplitTextRuns(textRuns, collapsedLength, objectPool);
-
- try
- {
- if (flowDirection == FlowDirection.RightToLeft)
- {
- var collapsedRuns = new TextRun[postSplitRuns!.Count + 1];
- postSplitRuns.CopyTo(collapsedRuns, 1);
- collapsedRuns[0] = shapedSymbol;
- return collapsedRuns;
- }
- else
- {
- var collapsedRuns = new TextRun[preSplitRuns!.Count + 1];
- preSplitRuns.CopyTo(collapsedRuns);
- collapsedRuns[collapsedRuns.Length - 1] = shapedSymbol;
- return collapsedRuns;
- }
- }
- finally
- {
- objectPool.TextRunLists.Return(ref preSplitRuns);
- objectPool.TextRunLists.Return(ref postSplitRuns);
- }
- }
}
}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs
index ff8c1c4860..1dbf55fb97 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatter.cs
@@ -40,5 +40,31 @@
/// The formatted line.
public abstract TextLine? FormatLine(ITextSource textSource, int firstTextSourceIndex, double paragraphWidth,
TextParagraphProperties paragraphProperties, TextLineBreak? previousLineBreak = null);
+
+ ///
+ /// Creates a shaped symbol.
+ ///
+ /// The symbol run to shape.
+ /// The flow direction.
+ ///
+ /// The shaped symbol.
+ ///
+ public static ShapedTextRun CreateSymbol(TextRun textRun, FlowDirection flowDirection)
+ {
+ var textShaper = TextShaper.Current;
+
+ var glyphTypeface = textRun.Properties!.CachedGlyphTypeface;
+
+ var fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
+
+ var cultureInfo = textRun.Properties.CultureInfo;
+
+ var shaperOptions = new TextShaperOptions(glyphTypeface, textRun.Properties.FontFeatures,
+ fontRenderingEmSize, (sbyte)flowDirection, cultureInfo);
+
+ var shapedBuffer = textShaper.ShapeText(textRun.Text, shaperOptions);
+
+ return new ShapedTextRun(shapedBuffer, textRun.Properties);
+ }
}
}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
index 5aeff0fba2..8e2325fb14 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
@@ -957,31 +957,5 @@ namespace Avalonia.Media.TextFormatting
return true;
}
}
-
- ///
- /// Creates a shaped symbol.
- ///
- /// The symbol run to shape.
- /// The flow direction.
- ///
- /// The shaped symbol.
- ///
- internal static ShapedTextRun CreateSymbol(TextRun textRun, FlowDirection flowDirection)
- {
- var textShaper = TextShaper.Current;
-
- var glyphTypeface = textRun.Properties!.CachedGlyphTypeface;
-
- var fontRenderingEmSize = textRun.Properties.FontRenderingEmSize;
-
- var cultureInfo = textRun.Properties.CultureInfo;
-
- var shaperOptions = new TextShaperOptions(glyphTypeface, textRun.Properties.FontFeatures,
- fontRenderingEmSize, (sbyte)flowDirection, cultureInfo);
-
- var shapedBuffer = textShaper.ShapeText(textRun.Text, shaperOptions);
-
- return new ShapedTextRun(shapedBuffer, textRun.Properties);
- }
}
}
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index f60440e6b1..c6da172604 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -96,7 +96,7 @@ namespace Avalonia.Media.TextFormatting
{
case DrawableTextRun drawableTextRun:
{
- var offsetY = GetBaselineOffset(this, drawableTextRun);
+ var offsetY = GetBaselineOffset(drawableTextRun);
drawableTextRun.Draw(drawingContext, new Point(currentX, currentY + offsetY));
@@ -108,28 +108,38 @@ namespace Avalonia.Media.TextFormatting
}
}
- private static double GetBaselineOffset(TextLine textLine, DrawableTextRun textRun)
+ private double GetBaselineOffset(DrawableTextRun textRun)
{
var baseline = textRun.Baseline;
var baselineAlignment = textRun.Properties?.BaselineAlignment;
+ var baselineOffset = -baseline;
+
switch (baselineAlignment)
{
+ case BaselineAlignment.Baseline:
+ baselineOffset += Baseline;
+ break;
case BaselineAlignment.Top:
- return 0;
+ case BaselineAlignment.TextTop:
+ baselineOffset += Height - Extent + textRun.Size.Height / 2;
+ break;
case BaselineAlignment.Center:
- return textLine.Height / 2 - textRun.Size.Height / 2;
+ baselineOffset += Height / 2 + baseline - textRun.Size.Height / 2;
+ break;
+ case BaselineAlignment.Subscript:
case BaselineAlignment.Bottom:
- return textLine.Height - textRun.Size.Height;
- case BaselineAlignment.Baseline:
- case BaselineAlignment.TextTop:
case BaselineAlignment.TextBottom:
- case BaselineAlignment.Subscript:
+ baselineOffset += Height - textRun.Size.Height + baseline;
+ break;
case BaselineAlignment.Superscript:
- return textLine.Baseline - baseline;
+ baselineOffset += baseline;
+ break;
default:
throw new ArgumentOutOfRangeException(nameof(baselineAlignment), baselineAlignment, null);
}
+
+ return baselineOffset;
}
///
@@ -731,23 +741,26 @@ namespace Avalonia.Media.TextFormatting
}
}
- if (coveredLength > 0)
+ if (coveredLength == 0)
{
- if (lastBounds != null && TryMergeWithLastBounds(currentBounds, lastBounds))
- {
- currentBounds = lastBounds;
-
- result[result.Count - 1] = currentBounds;
- }
- else
- {
- result.Add(currentBounds);
- }
+ //This should never happen
+ break;
+ }
- lastBounds = currentBounds;
+ if (lastBounds != null && TryMergeWithLastBounds(currentBounds, lastBounds))
+ {
+ currentBounds = lastBounds;
- remainingLength -= coveredLength;
+ result[result.Count - 1] = currentBounds;
+ }
+ else
+ {
+ result.Add(currentBounds);
}
+
+ lastBounds = currentBounds;
+
+ remainingLength -= coveredLength;
}
result.Sort(TextBoundsComparer);
@@ -1017,10 +1030,23 @@ namespace Avalonia.Media.TextFormatting
var characterLength = Math.Abs(startHit.FirstCharacterIndex + startHit.TrailingLength - endHit.FirstCharacterIndex - endHit.TrailingLength);
- //Make sure we properly deal with zero width space runs
- if (characterLength == 0 && currentRun.Length > 0 && currentRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace == 0)
+ if (characterLength == 0 && currentRun.Text.Length > 0 && startIndex < currentRun.Text.Length)
{
- characterLength = currentRun.Length;
+ //Make sure we are properly dealing with zero width space runs
+ var codepointEnumerator = new CodepointEnumerator(currentRun.Text.Span.Slice(startIndex));
+
+ while (remainingLength > 0 && codepointEnumerator.MoveNext(out var codepoint))
+ {
+ if (codepoint.IsWhiteSpace)
+ {
+ characterLength++;
+ remainingLength--;
+ }
+ else
+ {
+ break;
+ }
+ }
}
if (endX < startX)
@@ -1073,13 +1099,26 @@ namespace Avalonia.Media.TextFormatting
var characterLength = Math.Abs(startHit.FirstCharacterIndex + startHit.TrailingLength - endHit.FirstCharacterIndex - endHit.TrailingLength);
- //Make sure we properly deal with zero width space runs
- if (characterLength == 0 && currentRun.Length > 0 && currentRun.GlyphRun.Metrics.WidthIncludingTrailingWhitespace == 0)
+ if (characterLength == 0 && currentRun.Text.Length > 0 && startIndex < currentRun.Text.Length)
{
- characterLength = currentRun.Length;
+ //Make sure we are properly dealing with zero width space runs
+ var codepointEnumerator = new CodepointEnumerator(currentRun.Text.Span.Slice(startIndex));
+
+ while (remainingLength > 0 && codepointEnumerator.MoveNext(out var codepoint))
+ {
+ if (codepoint.IsWhiteSpace)
+ {
+ characterLength++;
+ remainingLength--;
+ }
+ else
+ {
+ break;
+ }
+ }
}
- if(startHit.FirstCharacterIndex > endHit.FirstCharacterIndex)
+ if (startHit.FirstCharacterIndex > endHit.FirstCharacterIndex)
{
startHit = endHit;
}
@@ -1143,7 +1182,6 @@ namespace Avalonia.Media.TextFormatting
}
TextRun? currentRun = null;
- TextRun? previousRun = null;
while (runIndex < _indexedTextRuns.Count)
{
@@ -1182,7 +1220,7 @@ namespace Avalonia.Media.TextFormatting
break;
}
- case TextRun:
+ case not null:
{
if(direction == LogicalDirection.Forward)
{
@@ -1212,8 +1250,6 @@ namespace Avalonia.Media.TextFormatting
}
runIndex++;
-
- previousRun = currentRun;
}
return currentRun;
@@ -1242,61 +1278,57 @@ namespace Avalonia.Media.TextFormatting
switch (_textRuns[index])
{
case ShapedTextRun textRun:
- {
- var textMetrics = textRun.TextMetrics;
- var glyphRun = textRun.GlyphRun;
- var runBounds = glyphRun.InkBounds.WithX(widthIncludingWhitespace + glyphRun.InkBounds.X);
+ {
+ var textMetrics = textRun.TextMetrics;
+ var glyphRun = textRun.GlyphRun;
+ var runBounds = glyphRun.InkBounds.WithX(widthIncludingWhitespace + glyphRun.InkBounds.X);
- bounds = bounds.Union(runBounds);
+ bounds = bounds.Union(runBounds);
- if (fontRenderingEmSize < textMetrics.FontRenderingEmSize)
- {
- fontRenderingEmSize = textMetrics.FontRenderingEmSize;
+ if (ascent > textMetrics.Ascent)
+ {
+ ascent = textMetrics.Ascent;
+ }
- if (ascent > textMetrics.Ascent)
- {
- ascent = textMetrics.Ascent;
- }
+ if (descent < textMetrics.Descent)
+ {
+ descent = textMetrics.Descent;
+ }
- if (descent < textMetrics.Descent)
- {
- descent = textMetrics.Descent;
- }
+ if (lineGap < textMetrics.LineGap)
+ {
+ lineGap = textMetrics.LineGap;
+ }
- if (lineGap < textMetrics.LineGap)
- {
- lineGap = textMetrics.LineGap;
- }
+ if (descent - ascent + lineGap > height)
+ {
+ height = descent - ascent + lineGap;
+ }
- if (descent - ascent + lineGap > height)
- {
- height = descent - ascent + lineGap;
- }
- }
- widthIncludingWhitespace += textRun.Size.Width;
+ widthIncludingWhitespace += textRun.Size.Width;
- break;
- }
+ break;
+ }
case DrawableTextRun drawableTextRun:
+ {
+ widthIncludingWhitespace += drawableTextRun.Size.Width;
+
+ if (drawableTextRun.Size.Height > height)
{
- widthIncludingWhitespace += drawableTextRun.Size.Width;
+ height = drawableTextRun.Size.Height;
+ }
- if (drawableTextRun.Size.Height > height)
- {
- height = drawableTextRun.Size.Height;
- }
+ //Adjust current ascent so drawables and text align at the bottom edge of the line.
+ var offset = Math.Max(0, drawableTextRun.Baseline + ascent - descent);
- if (ascent > -drawableTextRun.Baseline)
- {
- ascent = -drawableTextRun.Baseline;
- }
+ ascent -= offset;
- bounds = bounds.Union(new Rect(new Point(bounds.Right, 0), drawableTextRun.Size));
+ bounds = bounds.Union(new Rect(new Point(bounds.Right, 0), drawableTextRun.Size));
- break;
- }
+ break;
+ }
}
}
diff --git a/src/Avalonia.Base/Media/Typeface.cs b/src/Avalonia.Base/Media/Typeface.cs
index 8363b82400..d9bd158886 100644
--- a/src/Avalonia.Base/Media/Typeface.cs
+++ b/src/Avalonia.Base/Media/Typeface.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Media
throw new ArgumentException("Font stretch must be > 1.");
}
- FontFamily = fontFamily;
+ FontFamily = fontFamily ?? FontFamily.Default;
Style = style;
Weight = weight;
Stretch = stretch;
diff --git a/src/Avalonia.Base/Media/VisualBrush.cs b/src/Avalonia.Base/Media/VisualBrush.cs
index 15d4f39d6c..1e315688e9 100644
--- a/src/Avalonia.Base/Media/VisualBrush.cs
+++ b/src/Avalonia.Base/Media/VisualBrush.cs
@@ -1,4 +1,5 @@
using System;
+using Avalonia.Collections.Pooled;
using Avalonia.Media.Immutable;
using Avalonia.Rendering;
using Avalonia.Rendering.Composition;
@@ -62,31 +63,65 @@ namespace Avalonia.Media
internal override Func Factory =>
static c => new ServerCompositionSimpleContentBrush(c.Server);
- private InlineDictionary _renderDataDictionary;
-
- private protected override void OnReferencedFromCompositor(Compositor c)
+ class RenderDataItem(CompositionRenderData data, Rect rect) : IDisposable
{
- _renderDataDictionary.Add(c, CreateServerContent(c));
- base.OnReferencedFromCompositor(c);
+ public CompositionRenderData Data { get; } = data;
+ public Rect Rect { get; } = rect;
+ public bool IsDirty;
+ public void Dispose() => Data?.Dispose();
}
-
+
+ private InlineDictionary _renderDataDictionary;
+
protected override void OnUnreferencedFromCompositor(Compositor c)
{
if (_renderDataDictionary.TryGetAndRemoveValue(c, out var content))
- content?.RenderData.Dispose();
+ content?.Dispose();
base.OnUnreferencedFromCompositor(c);
}
private protected override void SerializeChanges(Compositor c, BatchStreamWriter writer)
{
base.SerializeChanges(c, writer);
- if (_renderDataDictionary.TryGetValue(c, out var content))
- writer.WriteObject(content);
- else
- writer.WriteObject(null);
+ CompositionRenderDataSceneBrushContent.Properties? content = null;
+ if (IsOnCompositor(c)) // Should always be true here, but just in case do this check
+ {
+ _renderDataDictionary.TryGetValue(c, out var data);
+ if (data == null || data.IsDirty)
+ {
+ var created = CreateServerContent(c);
+ // Dispose the old render list _after_ creating a new one to avoid unnecessary detach/attach
+ // sequence for referenced resources
+ if (data != null)
+ data.Dispose();
+
+ _renderDataDictionary[c] = data = created;
+ }
+
+ if (data != null)
+ content = new(data.Data.Server, data.Rect, false);
+ }
+
+ writer.WriteObject(content);
}
- CompositionRenderDataSceneBrushContent? CreateServerContent(Compositor c)
+ void InvalidateContent()
+ {
+ foreach(var item in _renderDataDictionary)
+ if (item.Value != null)
+ item.Value.IsDirty = true;
+ RegisterForSerialization();
+ }
+
+ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+ {
+ // We are supposed to be only calling this when content is actually changed,
+ // but instead we are calling this on brush property change for backwards compat with 0.10.x
+ InvalidateContent();
+ base.OnPropertyChanged(change);
+ }
+
+ RenderDataItem? CreateServerContent(Compositor c)
{
if (Visual == null)
return null;
@@ -99,10 +134,8 @@ namespace Avalonia.Media
var renderData = recorder.GetRenderResults();
if (renderData == null)
return null;
-
- return new CompositionRenderDataSceneBrushContent(
- (ServerCompositionSimpleContentBrush)((ICompositionRenderResource)this).GetForCompositor(c),
- renderData, new(Visual.Bounds.Size), false);
+
+ return new(renderData, new(Visual.Bounds.Size));
}
}
}
diff --git a/src/Avalonia.Base/Metadata/InheritDataTypeFromAttribute.cs b/src/Avalonia.Base/Metadata/InheritDataTypeFromAttribute.cs
new file mode 100644
index 0000000000..4a57667f82
--- /dev/null
+++ b/src/Avalonia.Base/Metadata/InheritDataTypeFromAttribute.cs
@@ -0,0 +1,44 @@
+using System;
+
+namespace Avalonia.Metadata;
+
+///
+/// Represents the kind of scope from which a data type can be inherited. Used in resolving target for AvaloniaProperty.
+///
+public enum InheritDataTypeFromScopeKind
+{
+ ///
+ /// Indicates that the data type should be inherited from a style.
+ ///
+ Style = 1,
+
+ ///
+ /// Indicates that the data type should be inherited from a control template.
+ ///
+ ControlTemplate,
+}
+
+///
+/// Attribute that instructs the compiler to resolve the data type using specific scope hints, such as Style or ControlTemplate.
+///
+///
+/// This attribute is used to configure markup extensions like TemplateBinding to properly parse AvaloniaProperty values,
+/// targeting a specific scope data type.
+///
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+public sealed class InheritDataTypeFromAttribute : Attribute
+{
+ ///
+ /// Initializes a new instance of the class with the specified scope kind.
+ ///
+ /// The kind of scope from which to inherit the data type.
+ public InheritDataTypeFromAttribute(InheritDataTypeFromScopeKind scopeKind)
+ {
+ ScopeKind = scopeKind;
+ }
+
+ ///
+ /// Gets the kind of scope from which the data type should be inherited.
+ ///
+ public InheritDataTypeFromScopeKind ScopeKind { get; }
+}
diff --git a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
index 9621037cc1..476bca5a33 100644
--- a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
@@ -229,4 +229,10 @@ namespace Avalonia.Platform
///
bool CanBlit { get; }
}
+
+ public interface IDrawingContextLayerWithRenderContextAffinityImpl : IDrawingContextLayerImpl
+ {
+ bool HasRenderContextAffinity { get; }
+ IBitmapImpl CreateNonAffinedSnapshot();
+ }
}
diff --git a/src/Avalonia.Base/Platform/IGeometryContext2.cs b/src/Avalonia.Base/Platform/IGeometryContext2.cs
new file mode 100644
index 0000000000..4142430e9d
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IGeometryContext2.cs
@@ -0,0 +1,46 @@
+using Avalonia.Media;
+
+namespace Avalonia.Platform
+{
+ // TODO12 combine with IGeometryContext
+ public interface IGeometryContext2 : IGeometryContext
+ {
+ ///
+ /// Draws a line to the specified point.
+ ///
+ /// The destination point.
+ /// Whether the segment is stroked
+ void LineTo(Point point, bool isStroked);
+
+ ///
+ /// Draws an arc to the specified point.
+ ///
+ /// The destination point.
+ /// The radii of an oval whose perimeter is used to draw the angle.
+ /// The rotation angle (in radians) of the oval that specifies the curve.
+ /// true to draw the arc greater than 180 degrees; otherwise, false.
+ ///
+ /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
+ ///
+ /// Whether the segment is stroked
+ void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection, bool isStroked);
+
+ ///
+ /// Draws a Bezier curve to the specified point.
+ ///
+ /// The first control point used to specify the shape of the curve.
+ /// The second control point used to specify the shape of the curve.
+ /// The destination point for the end of the curve.
+ /// Whether the segment is stroked
+ void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint, bool isStroked);
+
+ ///
+ /// Draws a quadratic Bezier curve to the specified point
+ ///
+ /// Control point
+ /// DestinationPoint
+ /// Whether the segment is stroked
+ void QuadraticBezierTo(Point controlPoint, Point endPoint, bool isStroked);
+ }
+
+}
diff --git a/src/Avalonia.Base/Platform/IPlatformGpu.cs b/src/Avalonia.Base/Platform/IPlatformGpu.cs
index f6953619d2..b9f11c3ebb 100644
--- a/src/Avalonia.Base/Platform/IPlatformGpu.cs
+++ b/src/Avalonia.Base/Platform/IPlatformGpu.cs
@@ -11,6 +11,19 @@ public interface IPlatformGraphics
IPlatformGraphicsContext GetSharedContext();
}
+[Unstable]
+public interface IPlatformGraphicsWithFeatures : IPlatformGraphics, IOptionalFeatureProvider
+{
+
+}
+
+[Unstable]
+public interface IPlatformGraphicsReadyStateFeature
+{
+ bool IsReady { get; }
+ bool UsesContexts { get; }
+}
+
[Unstable]
public interface IPlatformGraphicsContext : IDisposable, IOptionalFeatureProvider
{
diff --git a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
index 0ead242a27..30b426489a 100644
--- a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
@@ -215,6 +215,14 @@ namespace Avalonia.Platform
///
/// An .
IRenderTarget CreateRenderTarget(IEnumerable
-### Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Avalonia#sponsor)]
-
-