/// 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/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/TemplateBinding.cs b/src/Avalonia.Base/Data/TemplateBinding.cs
index db878620b4..fd3c0f5b62 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
@@ -26,7 +27,7 @@ namespace Avalonia.Data
{
}
- public TemplateBinding(AvaloniaProperty property)
+ public TemplateBinding([InheritDataTypeFrom(InheritDataTypeFromScopeKind.ControlTemplate)] AvaloniaProperty property)
: base(BindingPriority.Template)
{
Property = property;
@@ -64,6 +65,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; }
///
diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
index 9624bd2ef6..fc60551606 100644
--- a/src/Avalonia.Base/Input/MouseDevice.cs
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -305,5 +305,10 @@ namespace Avalonia.Input
{
return _pointer;
}
+
+ internal void PlatformCaptureLost()
+ {
+ _pointer.Capture(null);
+ }
}
}
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
index cc80457226..8e662ea1b9 100644
--- a/src/Avalonia.Base/Input/TouchDevice.cs
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -160,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/Fonts/Tables/HorizontalHeadTable.cs b/src/Avalonia.Base/Media/Fonts/Tables/HorizontalHeadTable.cs
index 10b831dd1e..0942296536 100644
--- a/src/Avalonia.Base/Media/Fonts/Tables/HorizontalHeadTable.cs
+++ b/src/Avalonia.Base/Media/Fonts/Tables/HorizontalHeadTable.cs
@@ -59,11 +59,11 @@ namespace Avalonia.Media.Fonts.Tables
public short XMaxExtent { get; }
- public static HorizontalHeadTable Load(IGlyphTypeface glyphTypeface)
+ public static HorizontalHeadTable? Load(IGlyphTypeface glyphTypeface)
{
if (!glyphTypeface.TryGetTable(Tag, out var table))
{
- throw new MissingFontTableException("Could not load table", "name");
+ return null;
}
using var stream = new MemoryStream(table);
diff --git a/src/Avalonia.Base/Media/Fonts/Tables/Name/NameTable.cs b/src/Avalonia.Base/Media/Fonts/Tables/Name/NameTable.cs
index f94482222c..e2a5cbb681 100644
--- a/src/Avalonia.Base/Media/Fonts/Tables/Name/NameTable.cs
+++ b/src/Avalonia.Base/Media/Fonts/Tables/Name/NameTable.cs
@@ -3,26 +3,24 @@
// Ported from: https://github.com/SixLabors/Fonts/blob/034a440aece357341fcc6b02db58ffbe153e54ef/src/SixLabors.Fonts
using System.Collections.Generic;
-using System.Globalization;
using System.IO;
-using System.Linq;
namespace Avalonia.Media.Fonts.Tables.Name
{
internal class NameTable
{
internal const string TableName = "name";
- internal static OpenTypeTag Tag = OpenTypeTag.Parse(TableName);
+ internal static readonly OpenTypeTag Tag = OpenTypeTag.Parse(TableName);
private readonly NameRecord[] _names;
- internal NameTable(NameRecord[] names, IReadOnlyList languages)
+ internal NameTable(NameRecord[] names, IReadOnlyList languages)
{
_names = names;
Languages = languages;
}
- public IReadOnlyList Languages { get; }
+ public IReadOnlyList Languages { get; }
///
/// Gets the name of the font.
@@ -30,7 +28,7 @@ namespace Avalonia.Media.Fonts.Tables.Name
///
/// The name of the font.
///
- public string Id(CultureInfo culture)
+ public string Id(ushort culture)
=> GetNameById(culture, KnownNameIds.UniqueFontID);
///
@@ -39,7 +37,7 @@ namespace Avalonia.Media.Fonts.Tables.Name
///
/// The name of the font.
///
- public string FontName(CultureInfo culture)
+ public string FontName(ushort culture)
=> GetNameById(culture, KnownNameIds.FullFontName);
///
@@ -48,7 +46,7 @@ namespace Avalonia.Media.Fonts.Tables.Name
///
/// The name of the font.
///
- public string FontFamilyName(CultureInfo culture)
+ public string FontFamilyName(ushort culture)
=> GetNameById(culture, KnownNameIds.FontFamilyName);
///
@@ -57,12 +55,12 @@ namespace Avalonia.Media.Fonts.Tables.Name
///
/// The name of the font.
///
- public string FontSubFamilyName(CultureInfo culture)
+ public string FontSubFamilyName(ushort culture)
=> GetNameById(culture, KnownNameIds.FontSubfamilyName);
- public string GetNameById(CultureInfo culture, KnownNameIds nameId)
+ public string GetNameById(ushort culture, KnownNameIds nameId)
{
- var languageId = culture.LCID;
+ var languageId = culture;
NameRecord? usaVersion = null;
NameRecord? firstWindows = null;
NameRecord? first = null;
@@ -97,7 +95,7 @@ namespace Avalonia.Media.Fonts.Tables.Name
string.Empty;
}
- public string GetNameById(CultureInfo culture, ushort nameId)
+ public string GetNameById(ushort culture, ushort nameId)
=> GetNameById(culture, (KnownNameIds)nameId);
public static NameTable Load(IGlyphTypeface glyphTypeface)
@@ -160,7 +158,7 @@ namespace Avalonia.Media.Fonts.Tables.Name
readable.LoadValue(reader);
}
- var cultures = new List();
+ var cultures = new List();
foreach (var nameRecord in names)
{
@@ -169,16 +167,12 @@ namespace Avalonia.Media.Fonts.Tables.Name
continue;
}
- var culture = new CultureInfo(nameRecord.LanguageID);
-
- if (!cultures.Contains(culture))
+ if (!cultures.Contains(nameRecord.LanguageID))
{
- cultures.Add(culture);
+ cultures.Add(nameRecord.LanguageID);
}
}
- //var languages = languageNames.Select(x => x.Value).ToArray();
-
return new NameTable(names, cultures);
}
}
diff --git a/src/Avalonia.Base/Media/GlyphRun.cs b/src/Avalonia.Base/Media/GlyphRun.cs
index 350f3ec028..a81dbdb3f0 100644
--- a/src/Avalonia.Base/Media/GlyphRun.cs
+++ b/src/Avalonia.Base/Media/GlyphRun.cs
@@ -574,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);
@@ -639,7 +642,7 @@ namespace Avalonia.Media
{
int firstCluster, lastCluster;
- if (Characters.IsEmpty)
+ if (Characters.IsEmpty || _glyphInfos.Count == 0)
{
firstCluster = 0;
lastCluster = 0;
diff --git a/src/Avalonia.Base/Media/IGlyphTypeface2.cs b/src/Avalonia.Base/Media/IGlyphTypeface2.cs
index d2e0e4d2dd..2c7ea58bcb 100644
--- a/src/Avalonia.Base/Media/IGlyphTypeface2.cs
+++ b/src/Avalonia.Base/Media/IGlyphTypeface2.cs
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.IO;
using Avalonia.Media.Fonts;
@@ -17,8 +16,9 @@ namespace Avalonia.Media
///
/// Gets the localized family names.
+ /// Keys are culture identifiers.
///
- IReadOnlyDictionary FamilyNames { get; }
+ IReadOnlyDictionary FamilyNames { get; }
///
/// Gets supported font features.
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..5bb8ad5b95 100644
--- a/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/ShapedTextRun.cs
@@ -64,7 +64,7 @@ namespace Avalonia.Media.TextFormatting
if (Properties.BackgroundBrush != null)
{
- drawingContext.DrawRectangle(Properties.BackgroundBrush, null, GlyphRun.Bounds);
+ drawingContext.DrawRectangle(Properties.BackgroundBrush, null, GlyphRun.Bounds.Translate(new Vector(0, -Baseline)));
}
drawingContext.DrawGlyphRun(Properties.ForegroundBrush, GlyphRun);
@@ -204,7 +204,8 @@ namespace Avalonia.Media.TextFormatting
ShapedBuffer.FontRenderingEmSize,
Text,
ShapedBuffer,
- biDiLevel: BidiLevel);
+ biDiLevel: BidiLevel,
+ baselineOrigin: new Point());
}
public void Dispose()
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 954a9b2deb..154c98ae54 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -115,18 +115,19 @@ namespace Avalonia.Media.TextFormatting
switch (baselineAlignment)
{
+ case BaselineAlignment.Baseline:
+ return textLine.Baseline;
case BaselineAlignment.Top:
- return 0;
+ case BaselineAlignment.TextTop:
+ return textLine.Baseline - textLine.Extent + textRun.Size.Height / 2;
case BaselineAlignment.Center:
- return textLine.Height / 2 - textRun.Size.Height / 2;
+ return textLine.Height / 2 + baseline - textRun.Size.Height / 2;
+ case BaselineAlignment.Subscript:
case BaselineAlignment.Bottom:
- return textLine.Height - textRun.Size.Height;
- case BaselineAlignment.Baseline:
- case BaselineAlignment.TextTop:
case BaselineAlignment.TextBottom:
- case BaselineAlignment.Subscript:
+ return textLine.Height - textRun.Size.Height + baseline;
case BaselineAlignment.Superscript:
- return textLine.Baseline - baseline;
+ return baseline;
default:
throw new ArgumentOutOfRangeException(nameof(baselineAlignment), baselineAlignment, null);
}
@@ -731,23 +732,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 +1021,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 +1090,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 +1173,6 @@ namespace Avalonia.Media.TextFormatting
}
TextRun? currentRun = null;
- TextRun? previousRun = null;
while (runIndex < _indexedTextRuns.Count)
{
@@ -1182,7 +1211,7 @@ namespace Avalonia.Media.TextFormatting
break;
}
- case TextRun:
+ case not null:
{
if(direction == LogicalDirection.Forward)
{
@@ -1212,8 +1241,6 @@ namespace Avalonia.Media.TextFormatting
}
runIndex++;
-
- previousRun = currentRun;
}
return currentRun;
@@ -1242,61 +1269,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);
+ //Adjust current ascent so drawables and text align at the bottom edge of the line.
+ var offset = Math.Max(0, drawableTextRun.Baseline + ascent - descent);
- ascent -= offset;
+ 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/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/PlatformHandle.cs b/src/Avalonia.Base/Platform/PlatformHandle.cs
index 9cc2741a12..79dd4f54dc 100644
--- a/src/Avalonia.Base/Platform/PlatformHandle.cs
+++ b/src/Avalonia.Base/Platform/PlatformHandle.cs
@@ -5,7 +5,7 @@ namespace Avalonia.Platform
///
/// Represents a platform-specific handle.
///
- public class PlatformHandle : IPlatformHandle
+ public class PlatformHandle : IPlatformHandle, IEquatable
{
///
/// Initializes a new instance of the class.
@@ -29,5 +29,44 @@ namespace Avalonia.Platform
/// Gets an optional string that describes what represents.
///
public string? HandleDescriptor { get; }
+
+ ///
+ public override string ToString()
+ {
+ return $"PlatformHandle {{ {HandleDescriptor} = {Handle} }}";
+ }
+
+ ///
+ public bool Equals(PlatformHandle? other)
+ {
+ if (other is null) return false;
+ if (ReferenceEquals(this, other)) return true;
+ return Handle == other.Handle && HandleDescriptor == other.HandleDescriptor;
+ }
+
+ ///
+ public override bool Equals(object? obj)
+ {
+ if (obj is null) return false;
+ if (ReferenceEquals(this, obj)) return true;
+ if (obj.GetType() != GetType()) return false;
+ return Equals((PlatformHandle)obj);
+ }
+
+ ///
+ public override int GetHashCode()
+ {
+ return (Handle, HandleDescriptor).GetHashCode();
+ }
+
+ public static bool operator ==(PlatformHandle? left, PlatformHandle? right)
+ {
+ return Equals(left, right);
+ }
+
+ public static bool operator !=(PlatformHandle? left, PlatformHandle? right)
+ {
+ return !Equals(left, right);
+ }
}
}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
index 715fc182d6..c465dddb84 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFile.cs
@@ -1,115 +1,10 @@
-using System;
-using System.IO;
-using System.Security;
+using System.IO;
using System.Threading.Tasks;
namespace Avalonia.Platform.Storage.FileIO;
-internal class BclStorageFile : IStorageBookmarkFile
+internal sealed class BclStorageFile(FileInfo fileInfo) : BclStorageItem(fileInfo), IStorageBookmarkFile
{
- public BclStorageFile(FileInfo fileInfo)
- {
- FileInfo = fileInfo ?? throw new ArgumentNullException(nameof(fileInfo));
- }
-
- public FileInfo FileInfo { get; }
-
- public string Name => FileInfo.Name;
-
- public virtual bool CanBookmark => true;
-
- public Uri Path
- {
- get
- {
- try
- {
- if (FileInfo.Directory is not null)
- {
- return StorageProviderHelpers.FilePathToUri(FileInfo.FullName);
- }
- }
- catch (SecurityException)
- {
- }
- return new Uri(FileInfo.Name, UriKind.Relative);
- }
- }
-
- public Task GetBasicPropertiesAsync()
- {
- if (FileInfo.Exists)
- {
- return Task.FromResult(new StorageItemProperties(
- (ulong)FileInfo.Length,
- FileInfo.CreationTimeUtc,
- FileInfo.LastAccessTimeUtc));
- }
- return Task.FromResult(new StorageItemProperties());
- }
-
- public Task GetParentAsync()
- {
- if (FileInfo.Directory is { } directory)
- {
- return Task.FromResult(new BclStorageFolder(directory));
- }
- return Task.FromResult(null);
- }
-
- public Task OpenReadAsync()
- {
- return Task.FromResult(FileInfo.OpenRead());
- }
-
- public Task OpenWriteAsync()
- {
- var stream = new FileStream(FileInfo.FullName, FileMode.Create, FileAccess.Write, FileShare.Write);
- return Task.FromResult(stream);
- }
-
- public virtual Task SaveBookmarkAsync()
- {
- return Task.FromResult(FileInfo.FullName);
- }
-
- public Task ReleaseBookmarkAsync()
- {
- // No-op
- return Task.CompletedTask;
- }
-
- protected virtual void Dispose(bool disposing)
- {
- }
-
- ~BclStorageFile()
- {
- Dispose(disposing: false);
- }
-
- public void Dispose()
- {
- Dispose(disposing: true);
- GC.SuppressFinalize(this);
- }
-
- public Task DeleteAsync()
- {
- FileInfo.Delete();
- return Task.CompletedTask;
- }
-
- public Task MoveAsync(IStorageFolder destination)
- {
- if (destination is BclStorageFolder storageFolder)
- {
- var newPath = System.IO.Path.Combine(storageFolder.DirectoryInfo.FullName, FileInfo.Name);
- FileInfo.MoveTo(newPath);
-
- return Task.FromResult(new BclStorageFile(new FileInfo(newPath)));
- }
-
- return Task.FromResult(null);
- }
+ public Task OpenReadAsync() => Task.FromResult(OpenReadCore(fileInfo));
+ public Task OpenWriteAsync() => Task.FromResult(OpenWriteCore(fileInfo));
}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
index a5727dc3cd..05572d6058 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageFolder.cs
@@ -1,128 +1,22 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Security;
using System.Threading.Tasks;
using Avalonia.Utilities;
namespace Avalonia.Platform.Storage.FileIO;
-internal class BclStorageFolder : IStorageBookmarkFolder
+internal sealed class BclStorageFolder(DirectoryInfo directoryInfo)
+ : BclStorageItem(directoryInfo), IStorageBookmarkFolder
{
- public BclStorageFolder(DirectoryInfo directoryInfo)
- {
- DirectoryInfo = directoryInfo ?? throw new ArgumentNullException(nameof(directoryInfo));
- if (!DirectoryInfo.Exists)
- {
- throw new ArgumentException("Directory must exist", nameof(directoryInfo));
- }
- }
+ public IAsyncEnumerable GetItemsAsync() => GetItemsCore(directoryInfo)
+ .Select(WrapFileSystemInfo)
+ .Where(f => f is not null)
+ .AsAsyncEnumerable()!;
- public string Name => DirectoryInfo.Name;
+ public Task CreateFileAsync(string name) => Task.FromResult(
+ (IStorageFile?)WrapFileSystemInfo(CreateFileCore(directoryInfo, name)));
- public DirectoryInfo DirectoryInfo { get; }
-
- public bool CanBookmark => true;
-
- public Uri Path
- {
- get
- {
- try
- {
- return StorageProviderHelpers.FilePathToUri(DirectoryInfo.FullName);
- }
- catch (SecurityException)
- {
- return new Uri(DirectoryInfo.Name, UriKind.Relative);
- }
- }
- }
-
- public Task GetBasicPropertiesAsync()
- {
- var props = new StorageItemProperties(
- null,
- DirectoryInfo.CreationTimeUtc,
- DirectoryInfo.LastAccessTimeUtc);
- return Task.FromResult(props);
- }
-
- public Task GetParentAsync()
- {
- if (DirectoryInfo.Parent is { } directory)
- {
- return Task.FromResult(new BclStorageFolder(directory));
- }
- return Task.FromResult(null);
- }
-
- public IAsyncEnumerable GetItemsAsync()
- => DirectoryInfo.EnumerateDirectories()
- .Select(d => (IStorageItem)new BclStorageFolder(d))
- .Concat(DirectoryInfo.EnumerateFiles().Select(f => new BclStorageFile(f)))
- .AsAsyncEnumerable();
-
- public virtual Task SaveBookmarkAsync()
- {
- return Task.FromResult(DirectoryInfo.FullName);
- }
-
- public Task ReleaseBookmarkAsync()
- {
- // No-op
- return Task.CompletedTask;
- }
-
- protected virtual void Dispose(bool disposing)
- {
- }
-
- ~BclStorageFolder()
- {
- Dispose(disposing: false);
- }
-
- public void Dispose()
- {
- Dispose(disposing: true);
- GC.SuppressFinalize(this);
- }
-
- public Task DeleteAsync()
- {
- DirectoryInfo.Delete(true);
- return Task.CompletedTask;
- }
-
- public Task MoveAsync(IStorageFolder destination)
- {
- if (destination is BclStorageFolder storageFolder)
- {
- var newPath = System.IO.Path.Combine(storageFolder.DirectoryInfo.FullName, DirectoryInfo.Name);
- DirectoryInfo.MoveTo(newPath);
-
- return Task.FromResult(new BclStorageFolder(new DirectoryInfo(newPath)));
- }
-
- return Task.FromResult(null);
- }
-
- public Task CreateFileAsync(string name)
- {
- var fileName = System.IO.Path.Combine(DirectoryInfo.FullName, name);
- var newFile = new FileInfo(fileName);
-
- using var stream = newFile.Create();
-
- return Task.FromResult(new BclStorageFile(newFile));
- }
-
- public Task CreateFolderAsync(string name)
- {
- var newFolder = DirectoryInfo.CreateSubdirectory(name);
-
- return Task.FromResult(new BclStorageFolder(newFolder));
- }
+ public Task CreateFolderAsync(string name) => Task.FromResult(
+ (IStorageFolder?)WrapFileSystemInfo(CreateFolderCore(directoryInfo, name)));
}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageItem.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageItem.cs
new file mode 100644
index 0000000000..123d0e9283
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageItem.cs
@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Security;
+using System.Threading.Tasks;
+
+namespace Avalonia.Platform.Storage.FileIO;
+
+internal abstract class BclStorageItem(FileSystemInfo fileSystemInfo) : IStorageBookmarkItem, IStorageItemWithFileSystemInfo
+{
+ public FileSystemInfo FileSystemInfo { get; } = fileSystemInfo switch
+ {
+ null => throw new ArgumentNullException(nameof(fileSystemInfo)),
+ DirectoryInfo { Exists: false } => throw new ArgumentException("Directory must exist", nameof(fileSystemInfo)),
+ _ => fileSystemInfo
+ };
+
+ public string Name => FileSystemInfo.Name;
+
+ public bool CanBookmark => true;
+
+ public Uri Path => GetPathCore(FileSystemInfo);
+
+ public Task GetBasicPropertiesAsync()
+ {
+ return Task.FromResult(GetBasicPropertiesAsyncCore(FileSystemInfo));
+ }
+
+ public Task GetParentAsync() => Task.FromResult(
+ (IStorageFolder?)WrapFileSystemInfo(GetParentCore(FileSystemInfo)));
+
+ public Task DeleteAsync()
+ {
+ DeleteCore(FileSystemInfo);
+ return Task.CompletedTask;
+ }
+
+ public Task MoveAsync(IStorageFolder destination) => Task.FromResult(
+ WrapFileSystemInfo(MoveCore(FileSystemInfo, destination)));
+
+ public Task SaveBookmarkAsync()
+ {
+ var path = FileSystemInfo.FullName;
+ return Task.FromResult(StorageBookmarkHelper.EncodeBclBookmark(path));
+ }
+
+ public Task ReleaseBookmarkAsync() => Task.CompletedTask;
+
+ public void Dispose() { }
+
+ [return: NotNullIfNotNull(nameof(fileSystemInfo))]
+ protected IStorageItem? WrapFileSystemInfo(FileSystemInfo? fileSystemInfo) => fileSystemInfo switch
+ {
+ DirectoryInfo directoryInfo => new BclStorageFolder(directoryInfo),
+ FileInfo fileInfo => new BclStorageFile(fileInfo),
+ _ => null
+ };
+
+ internal static void DeleteCore(FileSystemInfo fileSystemInfo) => fileSystemInfo.Delete();
+
+ internal static Uri GetPathCore(FileSystemInfo fileSystemInfo)
+ {
+ try
+ {
+ if (fileSystemInfo is DirectoryInfo { Parent: not null } or FileInfo { Directory: not null })
+ {
+ return StorageProviderHelpers.UriFromFilePath(fileSystemInfo.FullName, fileSystemInfo is DirectoryInfo);
+ }
+ }
+ catch (SecurityException)
+ {
+ }
+
+ return new Uri(fileSystemInfo.Name, UriKind.Relative);
+ }
+
+ internal static StorageItemProperties GetBasicPropertiesAsyncCore(FileSystemInfo fileSystemInfo)
+ {
+ if (fileSystemInfo.Exists)
+ {
+ return new StorageItemProperties(
+ fileSystemInfo is FileInfo fileInfo ? (ulong)fileInfo.Length : 0,
+ fileSystemInfo.CreationTimeUtc,
+ fileSystemInfo.LastAccessTimeUtc);
+ }
+
+ return new StorageItemProperties();
+ }
+
+ internal static DirectoryInfo? GetParentCore(FileSystemInfo fileSystemInfo) => fileSystemInfo switch
+ {
+ FileInfo { Directory: { } directory } => directory,
+ DirectoryInfo { Parent: { } parent } => parent,
+ _ => null
+ };
+
+ internal static FileSystemInfo? MoveCore(FileSystemInfo fileSystemInfo, IStorageFolder destination)
+ {
+ if (destination?.TryGetLocalPath() is { } destinationPath)
+ {
+ var newPath = System.IO.Path.Combine(destinationPath, fileSystemInfo.Name);
+ if (fileSystemInfo is DirectoryInfo directoryInfo)
+ {
+ directoryInfo.MoveTo(newPath);
+ return new DirectoryInfo(newPath);
+ }
+
+ if (fileSystemInfo is FileInfo fileInfo)
+ {
+ fileInfo.MoveTo(newPath);
+ return new FileInfo(newPath);
+ }
+ }
+
+ return null;
+ }
+
+ internal static FileStream OpenReadCore(FileInfo fileInfo) => fileInfo.OpenRead();
+
+ internal static FileStream OpenWriteCore(FileInfo fileInfo) =>
+ new(fileInfo.FullName, FileMode.Create, FileAccess.Write, FileShare.Write);
+
+ internal static IEnumerable GetItemsCore(DirectoryInfo directoryInfo) => directoryInfo
+ .EnumerateDirectories()
+ .OfType()
+ .Concat(directoryInfo.EnumerateFiles());
+
+ internal static FileInfo CreateFileCore(DirectoryInfo directoryInfo, string name)
+ {
+ var fileName = System.IO.Path.Combine(directoryInfo.FullName, name);
+ var newFile = new FileInfo(fileName);
+
+ using var stream = newFile.Create();
+ return newFile;
+ }
+
+ internal static DirectoryInfo CreateFolderCore(DirectoryInfo directoryInfo, string name) =>
+ directoryInfo.CreateSubdirectory(name);
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
index 34409f5fda..fd2f499d06 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/BclStorageProvider.cs
@@ -4,6 +4,7 @@ using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Avalonia.Compatibility;
+using Avalonia.Logging;
namespace Avalonia.Platform.Storage.FileIO;
@@ -20,18 +21,12 @@ internal abstract class BclStorageProvider : IStorageProvider
public virtual Task OpenFileBookmarkAsync(string bookmark)
{
- var file = new FileInfo(bookmark);
- return file.Exists
- ? Task.FromResult(new BclStorageFile(file))
- : Task.FromResult(null);
+ return Task.FromResult(OpenBookmark(bookmark) as IStorageBookmarkFile);
}
public virtual Task OpenFolderBookmarkAsync(string bookmark)
{
- var folder = new DirectoryInfo(bookmark);
- return folder.Exists
- ? Task.FromResult(new BclStorageFolder(folder))
- : Task.FromResult(null);
+ return Task.FromResult(OpenBookmark(bookmark) as IStorageBookmarkFolder);
}
public virtual Task TryGetFileFromPathAsync(Uri filePath)
@@ -63,6 +58,16 @@ internal abstract class BclStorageProvider : IStorageProvider
}
public virtual Task TryGetWellKnownFolderAsync(WellKnownFolder wellKnownFolder)
+ {
+ if (TryGetWellKnownFolderCore(wellKnownFolder) is { } directoryInfo)
+ {
+ return Task.FromResult(new BclStorageFolder(directoryInfo));
+ }
+
+ return Task.FromResult(null);
+ }
+
+ internal static DirectoryInfo? TryGetWellKnownFolderCore(WellKnownFolder wellKnownFolder)
{
// Note, this BCL API returns different values depending on the .NET version.
// We should also document it.
@@ -82,16 +87,16 @@ internal abstract class BclStorageProvider : IStorageProvider
if (folderPath is null)
{
- return Task.FromResult(null);
+ return null;
}
var directory = new DirectoryInfo(folderPath);
if (!directory.Exists)
{
- return Task.FromResult(null);
+ return null;
}
-
- return Task.FromResult(new BclStorageFolder(directory));
+
+ return directory;
string GetFromSpecialFolder(Environment.SpecialFolder folder) =>
Environment.GetFolderPath(folder, Environment.SpecialFolderOption.Create);
@@ -104,7 +109,7 @@ internal abstract class BclStorageProvider : IStorageProvider
if (OperatingSystemEx.IsWindows())
{
return Environment.OSVersion.Version.Major < 6 ? null :
- SHGetKnownFolderPath(s_folderDownloads, 0, IntPtr.Zero);
+ Marshal.PtrToStringUni(SHGetKnownFolderPath(s_folderDownloads, 0, IntPtr.Zero));
}
if (OperatingSystemEx.IsLinux())
@@ -123,8 +128,27 @@ internal abstract class BclStorageProvider : IStorageProvider
return null;
}
-
+
+ private IStorageBookmarkItem? OpenBookmark(string bookmark)
+ {
+ try
+ {
+ if (StorageBookmarkHelper.TryDecodeBclBookmark(bookmark, out var localPath))
+ {
+ return StorageProviderHelpers.TryCreateBclStorageItem(localPath);
+ }
+
+ return null;
+ }
+ catch (Exception ex)
+ {
+ Logger.TryGet(LogEventLevel.Information, LogArea.Platform)?
+ .Log(this, "Unable to read file bookmark: {Exception}", ex);
+ return null;
+ }
+ }
+
private static readonly Guid s_folderDownloads = new Guid("374DE290-123F-4565-9164-39C4925E467B");
- [DllImport("shell32.dll", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
- private static extern string SHGetKnownFolderPath([MarshalAs(UnmanagedType.LPStruct)] Guid id, int flags, IntPtr token);
+ [DllImport("shell32.dll")]
+ private static extern IntPtr SHGetKnownFolderPath([MarshalAs(UnmanagedType.LPStruct)] Guid id, int flags, IntPtr token);
}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/SecurityScopedStream.cs b/src/Avalonia.Base/Platform/Storage/FileIO/SecurityScopedStream.cs
new file mode 100644
index 0000000000..0e0ffa3b1b
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/SecurityScopedStream.cs
@@ -0,0 +1,116 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Avalonia.Platform.Storage.FileIO;
+
+///
+/// Stream wrapper currently used by Apple platforms,
+/// where in sandboxed scenario it's advised to call [NSUri startAccessingSecurityScopedResource].
+///
+internal sealed class SecurityScopedStream(FileStream _stream, IDisposable _securityScope) : Stream
+{
+ public override bool CanRead => _stream.CanRead;
+
+ public override bool CanSeek => _stream.CanSeek;
+
+ public override bool CanWrite => _stream.CanWrite;
+
+ public override long Length => _stream.Length;
+
+ public override long Position
+ {
+ get => _stream.Position;
+ set => _stream.Position = value;
+ }
+
+ public override void Flush() =>
+ _stream.Flush();
+
+ public override Task FlushAsync(CancellationToken cancellationToken) =>
+ _stream.FlushAsync(cancellationToken);
+
+ public override int ReadByte() =>
+ _stream.ReadByte();
+
+ public override int Read(byte[] buffer, int offset, int count) =>
+ _stream.Read(buffer, offset, count);
+
+ public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) =>
+ _stream.ReadAsync(buffer, offset, count, cancellationToken);
+
+#if NET6_0_OR_GREATER
+ public override int Read(Span buffer) => _stream.Read(buffer);
+
+ public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) =>
+ _stream.ReadAsync(buffer, cancellationToken);
+#endif
+
+ public override void Write(byte[] buffer, int offset, int count) =>
+ _stream.Write(buffer, offset, count);
+
+ public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) =>
+ _stream.WriteAsync(buffer, offset, count, cancellationToken);
+
+#if NET6_0_OR_GREATER
+ public override void Write(ReadOnlySpan buffer) => _stream.Write(buffer);
+
+ public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) =>
+ _stream.WriteAsync(buffer, cancellationToken);
+#endif
+
+ public override void WriteByte(byte value) => _stream.WriteByte(value);
+
+ public override long Seek(long offset, SeekOrigin origin) =>
+ _stream.Seek(offset, origin);
+
+ public override void SetLength(long value) =>
+ _stream.SetLength(value);
+
+#if NET6_0_OR_GREATER
+ public override void CopyTo(Stream destination, int bufferSize) => _stream.CopyTo(destination, bufferSize);
+#endif
+
+ public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) =>
+ _stream.CopyToAsync(destination, bufferSize, cancellationToken);
+
+ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state) =>
+ _stream.BeginRead(buffer, offset, count, callback, state);
+
+ public override int EndRead(IAsyncResult asyncResult) => _stream.EndRead(asyncResult);
+
+ public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state) =>
+ _stream.BeginWrite(buffer, offset, count, callback, state);
+
+ public override void EndWrite(IAsyncResult asyncResult) => _stream.EndWrite(asyncResult);
+
+ protected override void Dispose(bool disposing)
+ {
+ try
+ {
+ if (disposing)
+ {
+ _stream.Dispose();
+ }
+ }
+ finally
+ {
+ _securityScope.Dispose();
+ }
+ }
+
+#if NET6_0_OR_GREATER
+ public override async ValueTask DisposeAsync()
+ {
+ try
+ {
+ await _stream.DisposeAsync();
+ }
+ finally
+ {
+ _securityScope.Dispose();
+ }
+ }
+#endif
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/StorageBookmarkHelper.cs b/src/Avalonia.Base/Platform/Storage/FileIO/StorageBookmarkHelper.cs
new file mode 100644
index 0000000000..a71dd6f3e6
--- /dev/null
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/StorageBookmarkHelper.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Buffers;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Text;
+
+namespace Avalonia.Platform.Storage.FileIO;
+
+///
+/// In order to have unique bookmarks across platforms, we prepend a platform specific suffix before native bookmark.
+/// And always encoding them in base64 before returning to the user.
+///
+///
+/// Bookmarks are encoded as:
+/// 0-6 - avalonia prefix with version number
+/// 7-15 - platform key
+/// 16+ - native bookmark value
+/// Which is then encoded in Base64.
+///
+internal static class StorageBookmarkHelper
+{
+ private const int HeaderLength = 16;
+ private static ReadOnlySpan AvaHeaderPrefix => "ava.v1."u8;
+ private static ReadOnlySpan FakeBclBookmarkPlatform => "bcl"u8;
+
+ [return: NotNullIfNotNull(nameof(nativeBookmark))]
+ public static string? EncodeBookmark(ReadOnlySpan platform, string? nativeBookmark) =>
+ nativeBookmark is null ? null : EncodeBookmark(platform, Encoding.UTF8.GetBytes(nativeBookmark));
+
+ public static string? EncodeBookmark(ReadOnlySpan platform, ReadOnlySpan nativeBookmarkBytes)
+ {
+ if (nativeBookmarkBytes.Length == 0)
+ {
+ return null;
+ }
+
+ if (platform.Length > HeaderLength)
+ {
+ throw new ArgumentException($"Platform name should not be longer than {HeaderLength} bytes", nameof(platform));
+ }
+
+ var arrayLength = HeaderLength + nativeBookmarkBytes.Length;
+ var arrayPool = ArrayPool.Shared.Rent(arrayLength);
+ try
+ {
+ // Write platform into first 16 bytes.
+ var arraySpan = arrayPool.AsSpan(0, arrayLength);
+ AvaHeaderPrefix.CopyTo(arraySpan);
+ platform.CopyTo(arraySpan.Slice(AvaHeaderPrefix.Length));
+
+ // Write bookmark bytes.
+ nativeBookmarkBytes.CopyTo(arraySpan.Slice(HeaderLength));
+
+ // We must use span overload because ArrayPool might return way too big array.
+#if NET6_0_OR_GREATER
+ return Convert.ToBase64String(arraySpan);
+#else
+ return Convert.ToBase64String(arraySpan.ToArray(), Base64FormattingOptions.None);
+#endif
+ }
+ finally
+ {
+ ArrayPool.Shared.Return(arrayPool);
+ }
+ }
+
+ public enum DecodeResult
+ {
+ Success = 0,
+ InvalidFormat,
+ InvalidPlatform
+ }
+
+ public static DecodeResult TryDecodeBookmark(ReadOnlySpan platform, string? base64bookmark, out byte[]? nativeBookmark)
+ {
+ if (platform.Length > HeaderLength
+ || platform.Length == 0
+ || base64bookmark is null
+ || base64bookmark.Length % 4 != 0)
+ {
+ nativeBookmark = null;
+ return DecodeResult.InvalidFormat;
+ }
+
+ Span decodedBookmark;
+#if NET6_0_OR_GREATER
+ // Each base64 character represents 6 bits, but to be safe,
+ var arrayPool = ArrayPool.Shared.Rent(HeaderLength + base64bookmark.Length * 6);
+ if (Convert.TryFromBase64Chars(base64bookmark, arrayPool, out int bytesWritten))
+ {
+ decodedBookmark = arrayPool.AsSpan().Slice(0, bytesWritten);
+ }
+ else
+ {
+ nativeBookmark = null;
+ return DecodeResult.InvalidFormat;
+ }
+#else
+ decodedBookmark = Convert.FromBase64String(base64bookmark).AsSpan();
+#endif
+ try
+ {
+ if (decodedBookmark.Length < HeaderLength
+ // Check if decoded string starts with the correct prefix, checking v1 at the same time.
+ && !AvaHeaderPrefix.SequenceEqual(decodedBookmark.Slice(0, AvaHeaderPrefix.Length)))
+ {
+ nativeBookmark = null;
+ return DecodeResult.InvalidFormat;
+ }
+
+ var actualPlatform = decodedBookmark.Slice(AvaHeaderPrefix.Length, platform.Length);
+ if (!actualPlatform.SequenceEqual(platform))
+ {
+ nativeBookmark = null;
+ return DecodeResult.InvalidPlatform;
+ }
+
+ nativeBookmark = decodedBookmark.Slice(HeaderLength).ToArray();
+ return DecodeResult.Success;
+ }
+ finally
+ {
+#if NET6_0_OR_GREATER
+ ArrayPool.Shared.Return(arrayPool);
+#endif
+ }
+ }
+
+ public static string EncodeBclBookmark(string localPath) => EncodeBookmark(FakeBclBookmarkPlatform, localPath);
+
+ public static bool TryDecodeBclBookmark(string nativeBookmark, [NotNullWhen(true)] out string? localPath)
+ {
+ var decodeResult = TryDecodeBookmark(FakeBclBookmarkPlatform, nativeBookmark, out var bytes);
+ if (decodeResult == DecodeResult.Success)
+ {
+ localPath = Encoding.UTF8.GetString(bytes!);
+ return true;
+ }
+ if (decodeResult == DecodeResult.InvalidFormat
+ && nativeBookmark.IndexOfAny(Path.GetInvalidPathChars()) < 0
+ && !string.IsNullOrEmpty(Path.GetDirectoryName(nativeBookmark)))
+ {
+ // Attempt to restore old BCL bookmarks.
+ // Don't check for File.Exists here, as it will be done at later point in TryGetStorageItem.
+ // Just validate if it looks like a valid file path.
+ localPath = nativeBookmark;
+ return true;
+ }
+
+ localPath = null;
+ return false;
+ }
+}
diff --git a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
index 76323eb900..48cc79672b 100644
--- a/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
+++ b/src/Avalonia.Base/Platform/Storage/FileIO/StorageProviderHelpers.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Platform.Storage.FileIO;
internal static class StorageProviderHelpers
{
- public static IStorageItem? TryCreateBclStorageItem(string path)
+ public static BclStorageItem? TryCreateBclStorageItem(string path)
{
if (!string.IsNullOrWhiteSpace(path))
{
@@ -28,28 +28,36 @@ internal static class StorageProviderHelpers
return null;
}
- public static Uri FilePathToUri(string path)
+ public static string? TryGetPathFromFileUri(Uri? uri)
+ {
+ // android "content:", browser and ios relative links are ignored.
+ return uri is { IsAbsoluteUri: true, Scheme: "file" } ? uri.LocalPath : null;
+ }
+
+ public static Uri UriFromFilePath(string path, bool isDirectory)
{
var uriPath = new StringBuilder(path)
.Replace("%", $"%{(int)'%':X2}")
.Replace("[", $"%{(int)'[':X2}")
- .Replace("]", $"%{(int)']':X2}")
- .ToString();
+ .Replace("]", $"%{(int)']':X2}");
+
+ if (!path.EndsWith('/') && isDirectory)
+ {
+ uriPath.Append('/');
+ }
- return new UriBuilder("file", string.Empty) { Path = uriPath }.Uri;
+ return new UriBuilder("file", string.Empty) { Path = uriPath.ToString() }.Uri;
}
-
- public static bool TryFilePathToUri(string path, [NotNullWhen(true)] out Uri? uri)
+
+ public static Uri? TryGetUriFromFilePath(string path, bool isDirectory)
{
try
{
- uri = FilePathToUri(path);
- return true;
+ return UriFromFilePath(path, isDirectory);
}
catch
{
- uri = null;
- return false;
+ return null;
}
}
diff --git a/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs b/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
index 40f2720ee8..70c4f4bb0b 100644
--- a/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
+++ b/src/Avalonia.Base/Platform/Storage/IStorageBookmarkItem.cs
@@ -1,8 +1,14 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
using Avalonia.Metadata;
namespace Avalonia.Platform.Storage;
+internal interface IStorageItemWithFileSystemInfo : IStorageItem
+{
+ FileSystemInfo FileSystemInfo { get; }
+}
+
[NotClientImplementable]
public interface IStorageBookmarkItem : IStorageItem
{
diff --git a/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs b/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs
index 3933d23e4f..8f0c890ed1 100644
--- a/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs
+++ b/src/Avalonia.Base/Platform/Storage/StorageProviderExtensions.cs
@@ -17,7 +17,7 @@ public static class StorageProviderExtensions
return Task.FromResult(StorageProviderHelpers.TryCreateBclStorageItem(filePath) as IStorageFile);
}
- if (StorageProviderHelpers.TryFilePathToUri(filePath, out var uri))
+ if (StorageProviderHelpers.TryGetUriFromFilePath(filePath, false) is { } uri)
{
return provider.TryGetFileFromPathAsync(uri);
}
@@ -34,7 +34,7 @@ public static class StorageProviderExtensions
return Task.FromResult(StorageProviderHelpers.TryCreateBclStorageItem(folderPath) as IStorageFolder);
}
- if (StorageProviderHelpers.TryFilePathToUri(folderPath, out var uri))
+ if (StorageProviderHelpers.TryGetUriFromFilePath(folderPath, true) is { } uri)
{
return provider.TryGetFolderFromPathAsync(uri);
}
@@ -56,21 +56,11 @@ public static class StorageProviderExtensions
{
// We can avoid double escaping of the path by checking for BclStorageFolder.
// Ideally, `folder.Path.LocalPath` should also work, as that's only available way for the users.
- if (item is BclStorageFolder storageFolder)
+ if (item is IStorageItemWithFileSystemInfo storageItem)
{
- return storageFolder.DirectoryInfo.FullName;
- }
- if (item is BclStorageFile storageFile)
- {
- return storageFile.FileInfo.FullName;
- }
-
- if (item.Path is { IsAbsoluteUri: true, Scheme: "file" } absolutePath)
- {
- return absolutePath.LocalPath;
+ return storageItem.FileSystemInfo.FullName;
}
- // android "content:", browser and ios relative links go here.
- return null;
+ return StorageProviderHelpers.TryGetPathFromFileUri(item.Path);
}
}
diff --git a/src/Avalonia.Base/PropertyStore/ValueStore.cs b/src/Avalonia.Base/PropertyStore/ValueStore.cs
index 67d176ecea..789383b860 100644
--- a/src/Avalonia.Base/PropertyStore/ValueStore.cs
+++ b/src/Avalonia.Base/PropertyStore/ValueStore.cs
@@ -292,6 +292,42 @@ namespace Avalonia.PropertyStore
return property.GetDefaultValue(Owner);
}
+ public BindingExpressionBase? GetExpression(AvaloniaProperty property)
+ {
+ var evaluatedLocalValue = false;
+
+ bool TryGetLocalValue(out BindingExpressionBase? result)
+ {
+ if (!evaluatedLocalValue)
+ {
+ evaluatedLocalValue = true;
+
+ if (_localValueBindings?.TryGetValue(property.Id, out var o) == true)
+ {
+ result = o as BindingExpressionBase;
+ return true;
+ }
+ }
+
+ result = null;
+ return false;
+ }
+
+ for (var i = _frames.Count - 1; i >= 0; --i)
+ {
+ var frame = _frames[i];
+
+ if (frame.Priority > BindingPriority.LocalValue && TryGetLocalValue(out var localExpression))
+ return localExpression;
+
+ if (frame.TryGetEntryIfActive(property, out var entry, out _))
+ return entry as BindingExpressionBase;
+ }
+
+ TryGetLocalValue(out var e);
+ return e;
+ }
+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static EffectiveValue CastEffectiveValue(EffectiveValue value)
{
diff --git a/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt b/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt
deleted file mode 100644
index bfcec2960a..0000000000
--- a/src/Avalonia.Controls.DataGrid/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Compat issues with assembly Avalonia.Controls.DataGrid:
-MembersMustExist : Member 'protected void Avalonia.Controls.DataGridCheckBoxColumn.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.DataGridTextColumn.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 2
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index c3f428450b..63f47c3e4d 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -2140,7 +2140,7 @@ namespace Avalonia.Controls
if (DataConnection.DataSource != null && !DataConnection.EventsWired)
{
DataConnection.WireEvents(DataConnection.DataSource);
- InitializeElements(false /*recycleRows*/);
+ InitializeElements(true /*recycleRows*/);
}
}
diff --git a/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
index 38e18b57de..a33ae0e80b 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
@@ -19,6 +19,8 @@ namespace Avalonia.Controls.Utils
internal const char LeftIndexerToken = '[';
internal const char PropertyNameSeparator = '.';
internal const char RightIndexerToken = ']';
+ internal const char LeftParenthesisToken = '(';
+ internal const char RightParenthesisToken = ')';
private static Type FindGenericType(Type definition, Type type)
{
@@ -482,12 +484,35 @@ namespace Avalonia.Controls.Utils
List propertyPaths = new List();
if (!string.IsNullOrEmpty(propertyPath))
{
+ bool parenthesisOn = false;
int startIndex = 0;
for (int index = 0; index < propertyPath.Length; index++)
{
- if (propertyPath[index] == PropertyNameSeparator)
+ if (parenthesisOn)
{
- propertyPaths.Add(propertyPath.Substring(startIndex, index - startIndex));
+ if (propertyPath[index] == RightParenthesisToken)
+ {
+ parenthesisOn = false;
+ startIndex = index + 1;
+ }
+ continue;
+ }
+
+ if (propertyPath[index] == LeftParenthesisToken)
+ {
+ parenthesisOn = true;
+ if (startIndex != index)
+ {
+ propertyPaths.Add(propertyPath.Substring(startIndex, index - startIndex));
+ startIndex = index + 1;
+ }
+ }
+ else if (propertyPath[index] == PropertyNameSeparator)
+ {
+ if (startIndex != index)
+ {
+ propertyPaths.Add(propertyPath.Substring(startIndex, index - startIndex));
+ }
startIndex = index + 1;
}
else if (startIndex != index && propertyPath[index] == LeftIndexerToken)
diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt
deleted file mode 100644
index 33e5efbc15..0000000000
--- a/src/Avalonia.Controls/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-Compat issues with assembly Avalonia.Controls:
-MembersMustExist : Member 'protected void Avalonia.Controls.Button.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.ButtonSpinner.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.CalendarDatePicker.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.ContextMenu.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Controls.DropDown' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Controls.DropDownItem' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Expander.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.IMenuItem.StaysOpenOnClick.set(System.Boolean)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseClosed()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseOpening()' is present in the implementation but not in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.ItemsRepeater.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.DirectProperty Avalonia.DirectProperty Avalonia.Controls.NumericUpDown.ValueProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.NumericUpDown.IncrementProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.NumericUpDown.MaximumProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.NumericUpDown.MinimumProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDown.Increment.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDown.Increment.set(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDown.Maximum.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDown.Maximum.set(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDown.Minimum.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDown.Minimum.set(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected System.Double Avalonia.Controls.NumericUpDown.OnCoerceIncrement(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected System.Double Avalonia.Controls.NumericUpDown.OnCoerceMaximum(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected System.Double Avalonia.Controls.NumericUpDown.OnCoerceMinimum(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected System.Double Avalonia.Controls.NumericUpDown.OnCoerceValue(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.NumericUpDown.OnIncrementChanged(System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.NumericUpDown.OnMaximumChanged(System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.NumericUpDown.OnMinimumChanged(System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.NumericUpDown.OnValueChanged(System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.NumericUpDown.RaiseValueChangedEvent(System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDown.Value.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDown.Value.set(System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.NumericUpDownValueChangedEventArgs..ctor(Avalonia.Interactivity.RoutedEvent, System.Double, System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.NewValue.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Controls.NumericUpDownValueChangedEventArgs.OldValue.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.ProgressBar.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.ScrollViewer.AllowAutoHideProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Slider.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.AttachedProperty Avalonia.AttachedProperty Avalonia.Controls.TextBlock.FontFamilyProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.AttachedProperty Avalonia.AttachedProperty Avalonia.Controls.TextBlock.FontStyleProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.AttachedProperty Avalonia.AttachedProperty Avalonia.Controls.TextBlock.FontWeightProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.AttachedProperty Avalonia.AttachedProperty Avalonia.Controls.TextBlock.ForegroundProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.AttachedProperty Avalonia.AttachedProperty Avalonia.Controls.TextBlock.FontSizeProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.TextBlock.TextAlignmentProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.TextBlock.TextTrimmingProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.TextBlock.TextWrappingProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.TextBlock.LineHeightProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.StyledProperty Avalonia.StyledProperty Avalonia.Controls.TextBlock.MaxLinesProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.FontFamily Avalonia.Controls.TextBlock.GetFontFamily(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Double Avalonia.Controls.TextBlock.GetFontSize(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.FontStyle Avalonia.Controls.TextBlock.GetFontStyle(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.FontWeight Avalonia.Controls.TextBlock.GetFontWeight(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.IBrush Avalonia.Controls.TextBlock.GetForeground(Avalonia.Controls.Control)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontFamily(Avalonia.Controls.Control, Avalonia.Media.FontFamily)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontSize(Avalonia.Controls.Control, System.Double)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontStyle(Avalonia.Controls.Control, Avalonia.Media.FontStyle)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetFontWeight(Avalonia.Controls.Control, Avalonia.Media.FontWeight)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.TextBlock.SetForeground(Avalonia.Controls.Control, Avalonia.Media.IBrush)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.TextBox.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.TopLevel' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
-CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Viewbox' does not inherit from base type 'Avalonia.Controls.Decorator' in the implementation but it does in the contract.
-MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Viewbox.StretchProperty' does not exist in the implementation but it does exist in the contract.
-CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Window' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Window.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.WindowBase' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.EventHandler Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.ShutdownRequested' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.add_ShutdownRequested(System.EventHandler)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.remove_ShutdownRequested(System.EventHandler)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime.TryShutdown(System.Int32)' is present in the implementation but not in the contract.
-CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Embedding.EmbeddableControlRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
-MembersMustExist : Member 'public System.Action Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.Resized.set(System.Action)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Notifications.NotificationCard.CloseOnClickProperty' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Notifications.WindowNotificationManager.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.Platform.ITopLevelNativeMenuExporter.SetNativeMenu(Avalonia.Controls.NativeMenu)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'protected void Avalonia.Controls.Presenters.ScrollContentPresenter.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected Avalonia.Media.FormattedText Avalonia.Controls.Presenters.TextPresenter.CreateFormattedText()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public Avalonia.Media.FormattedText Avalonia.Controls.Presenters.TextPresenter.FormattedText.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'public System.Int32 Avalonia.Controls.Presenters.TextPresenter.GetCaretIndex(Avalonia.Point)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Presenters.TextPresenter.InvalidateFormattedText()' does not exist in the implementation but it does exist in the contract.
-CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Controls.Primitives.PopupRoot' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.ScrollBar.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.SelectingItemsControl.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.Track.OnPropertyChanged(Avalonia.AvaloniaPropertyChangedEventArgs)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'Avalonia.Platform.ExportWindowingSubsystemAttribute' does not exist in the implementation but it does exist in the contract.
-EnumValuesMustMatch : Enum value 'Avalonia.Platform.ExtendClientAreaChromeHints Avalonia.Platform.ExtendClientAreaChromeHints.Default' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromPoint(Avalonia.PixelPoint)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromRect(Avalonia.PixelRect)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.Screen Avalonia.Platform.IScreenImpl.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable Avalonia.Platform.ITopLevelImpl.FrameSize' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Nullable Avalonia.Platform.ITopLevelImpl.FrameSize.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Action Avalonia.Platform.ITopLevelImpl.Resized.get()' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Action Avalonia.Platform.ITopLevelImpl.Resized.get()' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public System.Action Avalonia.Platform.ITopLevelImpl.Resized.get()' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.Resized.set(System.Action)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.Resized.set(System.Action)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public void Avalonia.Platform.ITopLevelImpl.Resized.set(System.Action)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.ICursorImpl)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.IPlatformHandle)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowBaseImpl.Show(System.Boolean)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public void Avalonia.Platform.IWindowBaseImpl.Show(System.Boolean)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowBaseImpl.Show(System.Boolean, System.Boolean)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size, Avalonia.Platform.PlatformResizeReason)' is present in the implementation but not in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.ITrayIconImpl Avalonia.Platform.IWindowingPlatform.CreateTrayIcon()' is present in the implementation but not in the contract.
-Total Issues: 110
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
index 43c140a05f..2957214308 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@@ -117,16 +117,30 @@ namespace Avalonia.Controls.ApplicationLifetimes
}
public int Start(string[] args)
+ {
+ return StartCore(args);
+ }
+
+ ///
+ /// Since the lifetime must be set up/prepared with 'args' before executing Start(), an overload with no parameters seems more suitable for integrating with some lifetime manager providers, such as MS HostApplicationBuilder.
+ ///
+ /// exit code
+ public int Start()
+ {
+ return StartCore(Args ?? Array.Empty());
+ }
+
+ internal int StartCore(string[] args)
{
SetupCore(args);
-
+
_cts = new CancellationTokenSource();
// Note due to a bug in the JIT we wrap this in a method, otherwise MainWindow
// gets stuffed into a local var and can not be GCed until after the program stops.
// this method never exits until program end.
- ShowMainWindow();
-
+ ShowMainWindow();
+
Dispatcher.UIThread.MainLoop(_cts.Token);
Environment.ExitCode = _exitCode;
return _exitCode;
diff --git a/src/Avalonia.Controls/Automation/Peers/TitleBarAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/TitleBarAutomationPeer.cs
new file mode 100644
index 0000000000..e6920c1e02
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/TitleBarAutomationPeer.cs
@@ -0,0 +1,26 @@
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
+using Avalonia.Controls.Chrome;
+
+namespace Avalonia.Controls.Automation.Peers;
+
+internal class TitleBarAutomationPeer : ControlAutomationPeer
+{
+ public TitleBarAutomationPeer(TitleBar owner) : base(owner)
+ {
+ }
+
+ protected override bool IsContentElementCore() => true;
+
+ protected override string GetClassNameCore()
+ {
+ return "TitleBar";
+ }
+
+ protected override string? GetAutomationIdCore() => base.GetAutomationIdCore() ?? "AvaloniaTitleBar";
+
+ protected override AutomationControlType GetAutomationControlTypeCore()
+ {
+ return AutomationControlType.TitleBar;
+ }
+}
diff --git a/src/Avalonia.Controls/Chrome/TitleBar.cs b/src/Avalonia.Controls/Chrome/TitleBar.cs
index 498f9cdf7f..d796fabb05 100644
--- a/src/Avalonia.Controls/Chrome/TitleBar.cs
+++ b/src/Avalonia.Controls/Chrome/TitleBar.cs
@@ -1,4 +1,6 @@
using System;
+using Avalonia.Automation.Peers;
+using Avalonia.Controls.Automation.Peers;
using Avalonia.Reactive;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
@@ -94,5 +96,8 @@ namespace Avalonia.Controls.Chrome
_captionButtons?.Detach();
_captionButtons = null;
}
+
+ ///
+ protected override AutomationPeer OnCreateAutomationPeer() => new TitleBarAutomationPeer(this);
}
}
diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index cbe2eddf53..e9cdd3039a 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -18,6 +18,7 @@ namespace Avalonia.Controls.Primitives
Day,
Hour,
Minute,
+ Second,
TimePeriod //AM or PM
}
@@ -516,6 +517,8 @@ namespace Avalonia.Controls.Primitives
return new TimeSpan(value, 0, 0).ToString(ItemFormat);
case DateTimePickerPanelType.Minute:
return new TimeSpan(0, value, 0).ToString(ItemFormat);
+ case DateTimePickerPanelType.Second:
+ return new TimeSpan(0, 0, value).ToString(ItemFormat);
case DateTimePickerPanelType.TimePeriod:
return value == MinimumValue ? TimeUtils.GetAMDesignator() : TimeUtils.GetPMDesignator();
default:
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
index 62ac76e71c..111c9ff623 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -18,12 +18,15 @@ namespace Avalonia.Controls
[TemplatePart("PART_FlyoutButtonContentGrid", typeof(Grid))]
[TemplatePart("PART_HourTextBlock", typeof(TextBlock))]
[TemplatePart("PART_MinuteTextBlock", typeof(TextBlock))]
+ [TemplatePart("PART_SecondTextBlock", typeof(TextBlock))]
[TemplatePart("PART_PeriodTextBlock", typeof(TextBlock))]
[TemplatePart("PART_PickerPresenter", typeof(TimePickerPresenter))]
[TemplatePart("PART_Popup", typeof(Popup))]
[TemplatePart("PART_SecondColumnDivider", typeof(Rectangle))]
[TemplatePart("PART_SecondPickerHost", typeof(Border))]
- [TemplatePart("PART_ThirdPickerHost", typeof(Border))]
+ [TemplatePart("PART_ThirdColumnDivider", typeof(Rectangle))]
+ [TemplatePart("PART_ThirdPickerHost", typeof(Border))]
+ [TemplatePart("PART_FourthPickerHost", typeof(Border))]
[PseudoClasses(":hasnotime")]
public class TimePicker : TemplatedControl
{
@@ -32,12 +35,24 @@ namespace Avalonia.Controls
///
public static readonly StyledProperty MinuteIncrementProperty =
AvaloniaProperty.Register(nameof(MinuteIncrement), 1, coerce: CoerceMinuteIncrement);
+
+ ///
+ /// Defines the property
+ ///
+ public static readonly StyledProperty SecondIncrementProperty =
+ AvaloniaProperty.Register(nameof(SecondIncrement), 1, coerce: CoerceSecondIncrement);
///
/// Defines the property
///
public static readonly StyledProperty ClockIdentifierProperty =
AvaloniaProperty.Register(nameof(ClockIdentifier), "12HourClock", coerce: CoerceClockIdentifier);
+
+ ///
+ /// Defines the property
+ ///
+ public static readonly StyledProperty UseSecondsProperty =
+ AvaloniaProperty.Register(nameof(UseSeconds), false, coerce: CoerceUseSeconds);
///
/// Defines the property
@@ -52,11 +67,14 @@ namespace Avalonia.Controls
private Border? _firstPickerHost;
private Border? _secondPickerHost;
private Border? _thirdPickerHost;
+ private Border? _fourthPickerHost;
private TextBlock? _hourText;
private TextBlock? _minuteText;
+ private TextBlock? _secondText;
private TextBlock? _periodText;
private Rectangle? _firstSplitter;
private Rectangle? _secondSplitter;
+ private Rectangle? _thirdSplitter;
private Grid? _contentGrid;
private Popup? _popup;
@@ -85,6 +103,23 @@ namespace Avalonia.Controls
return value;
}
+
+ ///
+ /// Gets or sets the second increment in the picker
+ ///
+ public int SecondIncrement
+ {
+ get => GetValue(SecondIncrementProperty);
+ set => SetValue(SecondIncrementProperty, value);
+ }
+
+ private static int CoerceSecondIncrement(AvaloniaObject sender, int value)
+ {
+ if (value < 1 || value > 59)
+ throw new ArgumentOutOfRangeException(null, "1 >= SecondIncrement <= 59");
+
+ return value;
+ }
///
/// Gets or sets the clock identifier, either 12HourClock or 24HourClock
@@ -103,6 +138,24 @@ namespace Avalonia.Controls
return value;
}
+
+ ///
+ /// Gets or sets the use seconds switch, either true or false
+ ///
+ public bool UseSeconds
+ {
+
+ get => GetValue(UseSecondsProperty);
+ set => SetValue(UseSecondsProperty, value);
+ }
+
+ private static bool CoerceUseSeconds(AvaloniaObject sender, bool value)
+ {
+ if (!(value == true || value == false))
+ throw new ArgumentException("Invalid UseSeconds", default(bool).ToString());
+
+ return value;
+ }
///
/// Gets or sets the selected time. Can be null.
@@ -135,13 +188,16 @@ namespace Avalonia.Controls
_firstPickerHost = e.NameScope.Find("PART_FirstPickerHost");
_secondPickerHost = e.NameScope.Find("PART_SecondPickerHost");
_thirdPickerHost = e.NameScope.Find("PART_ThirdPickerHost");
+ _fourthPickerHost = e.NameScope.Find("PART_FourthPickerHost");
_hourText = e.NameScope.Find("PART_HourTextBlock");
_minuteText = e.NameScope.Find("PART_MinuteTextBlock");
+ _secondText = e.NameScope.Find("PART_SecondTextBlock");
_periodText = e.NameScope.Find("PART_PeriodTextBlock");
_firstSplitter = e.NameScope.Find("PART_FirstColumnDivider");
_secondSplitter = e.NameScope.Find("PART_SecondColumnDivider");
+ _thirdSplitter = e.NameScope.Find("PART_ThirdColumnDivider");
_contentGrid = e.NameScope.Find("PART_FlyoutButtonContentGrid");
@@ -160,7 +216,9 @@ namespace Avalonia.Controls
_presenter.Dismissed += OnDismissPicker;
_presenter[!TimePickerPresenter.MinuteIncrementProperty] = this[!MinuteIncrementProperty];
+ _presenter[!TimePickerPresenter.SecondIncrementProperty] = this[!SecondIncrementProperty];
_presenter[!TimePickerPresenter.ClockIdentifierProperty] = this[!ClockIdentifierProperty];
+ _presenter[!TimePickerPresenter.UseSecondsProperty] = this[!UseSecondsProperty];
}
}
@@ -172,11 +230,20 @@ namespace Avalonia.Controls
{
SetSelectedTimeText();
}
+ else if (change.Property == SecondIncrementProperty)
+ {
+ SetSelectedTimeText();
+ }
else if (change.Property == ClockIdentifierProperty)
{
SetGrid();
SetSelectedTimeText();
}
+ else if (change.Property == UseSecondsProperty)
+ {
+ SetGrid();
+ SetSelectedTimeText();
+ }
else if (change.Property == SelectedTimeProperty)
{
var (oldValue, newValue) = change.GetOldAndNewValue();
@@ -196,29 +263,40 @@ namespace Avalonia.Controls
columnsD.Add(new ColumnDefinition(GridLength.Star));
columnsD.Add(new ColumnDefinition(GridLength.Auto));
columnsD.Add(new ColumnDefinition(GridLength.Star));
+ if (UseSeconds)
+ {
+ columnsD.Add(new ColumnDefinition(GridLength.Auto));
+ columnsD.Add(new ColumnDefinition(GridLength.Star));
+ }
if (!use24HourClock)
{
columnsD.Add(new ColumnDefinition(GridLength.Auto));
columnsD.Add(new ColumnDefinition(GridLength.Star));
}
-
+
_contentGrid.ColumnDefinitions = columnsD;
+
+ _thirdPickerHost!.IsVisible = UseSeconds;
+ _secondSplitter!.IsVisible = UseSeconds;
- _thirdPickerHost!.IsVisible = !use24HourClock;
- _secondSplitter!.IsVisible = !use24HourClock;
+ _fourthPickerHost!.IsVisible = !use24HourClock;
+ _thirdSplitter!.IsVisible = !use24HourClock;
+
+ var amPmColumn = (UseSeconds) ? 6 : 4;
Grid.SetColumn(_firstPickerHost!, 0);
Grid.SetColumn(_secondPickerHost!, 2);
-
- Grid.SetColumn(_thirdPickerHost, use24HourClock ? 0 : 4);
+ Grid.SetColumn(_thirdPickerHost!, UseSeconds ? 4 : 0);
+ Grid.SetColumn(_fourthPickerHost, use24HourClock ? 0 : amPmColumn);
Grid.SetColumn(_firstSplitter!, 1);
- Grid.SetColumn(_secondSplitter, use24HourClock ? 0 : 3);
+ Grid.SetColumn(_secondSplitter!, UseSeconds ? 3 : 0);
+ Grid.SetColumn(_thirdSplitter, use24HourClock ? 0 : amPmColumn-1);
}
private void SetSelectedTimeText()
{
- if (_hourText == null || _minuteText == null || _periodText == null)
+ if (_hourText == null || _minuteText == null || _secondText == null || _periodText == null)
return;
var time = SelectedTime;
@@ -230,11 +308,12 @@ namespace Avalonia.Controls
{
var hr = newTime.Hours;
hr = hr > 12 ? hr - 12 : hr == 0 ? 12 : hr;
- newTime = new TimeSpan(hr, newTime.Minutes, 0);
+ newTime = new TimeSpan(hr, newTime.Minutes, newTime.Seconds);
}
_hourText.Text = newTime.ToString("%h");
_minuteText.Text = newTime.ToString("mm");
+ _secondText.Text = newTime.ToString("ss");
PseudoClasses.Set(":hasnotime", false);
_periodText.Text = time.Value.Hours >= 12 ? TimeUtils.GetPMDesignator() : TimeUtils.GetAMDesignator();
@@ -244,6 +323,7 @@ namespace Avalonia.Controls
// By clearing local value, we reset text property to the value from the template.
_hourText.ClearValue(TextBlock.TextProperty);
_minuteText.ClearValue(TextBlock.TextProperty);
+ _secondText.ClearValue(TextBlock.TextProperty);
PseudoClasses.Set(":hasnotime", true);
_periodText.Text = DateTime.Now.Hour >= 12 ? TimeUtils.GetPMDesignator() : TimeUtils.GetAMDesignator();
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
index 7f19d0545e..be5c2db6fa 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePickerPresenter.cs
@@ -19,12 +19,16 @@ namespace Avalonia.Controls
[TemplatePart("PART_MinuteDownButton", typeof(RepeatButton))]
[TemplatePart("PART_MinuteSelector", typeof(DateTimePickerPanel), IsRequired = true)]
[TemplatePart("PART_MinuteUpButton", typeof(RepeatButton))]
+ [TemplatePart("PART_SecondDownButton", typeof(RepeatButton))]
+ [TemplatePart("PART_SecondHost", typeof(Panel), IsRequired = true)]
+ [TemplatePart("PART_SecondSelector", typeof(DateTimePickerPanel), IsRequired = true)]
+ [TemplatePart("PART_SecondUpButton", typeof(RepeatButton))]
[TemplatePart("PART_PeriodDownButton", typeof(RepeatButton))]
[TemplatePart("PART_PeriodHost", typeof(Panel), IsRequired = true)]
[TemplatePart("PART_PeriodSelector", typeof(DateTimePickerPanel), IsRequired = true)]
[TemplatePart("PART_PeriodUpButton", typeof(RepeatButton))]
[TemplatePart("PART_PickerContainer", typeof(Grid), IsRequired = true)]
- [TemplatePart("PART_SecondSpacer", typeof(Rectangle), IsRequired = true)]
+ [TemplatePart("PART_ThirdSpacer", typeof(Rectangle), IsRequired = true)]
public class TimePickerPresenter : PickerPresenterBase
{
///
@@ -32,12 +36,24 @@ namespace Avalonia.Controls
///
public static readonly StyledProperty MinuteIncrementProperty =
TimePicker.MinuteIncrementProperty.AddOwner();
+
+ ///
+ /// Defines the property
+ ///
+ public static readonly StyledProperty SecondIncrementProperty =
+ TimePicker.SecondIncrementProperty.AddOwner();
///
/// Defines the property
///
public static readonly StyledProperty ClockIdentifierProperty =
TimePicker.ClockIdentifierProperty.AddOwner();
+
+ ///
+ /// Defines the property
+ ///
+ public static readonly StyledProperty UseSecondsProperty =
+ TimePicker.UseSecondsProperty.AddOwner();
///
/// Defines the property
@@ -60,15 +76,20 @@ namespace Avalonia.Controls
private Button? _acceptButton;
private Button? _dismissButton;
private Rectangle? _spacer2;
+ private Rectangle? _spacer3;
+ private Panel? _secondHost;
private Panel? _periodHost;
private DateTimePickerPanel? _hourSelector;
private DateTimePickerPanel? _minuteSelector;
+ private DateTimePickerPanel? _secondSelector;
private DateTimePickerPanel? _periodSelector;
private Button? _hourUpButton;
private Button? _minuteUpButton;
+ private Button? _secondUpButton;
private Button? _periodUpButton;
private Button? _hourDownButton;
private Button? _minuteDownButton;
+ private Button? _secondDownButton;
private Button? _periodDownButton;
///
@@ -79,6 +100,15 @@ namespace Avalonia.Controls
get => GetValue(MinuteIncrementProperty);
set => SetValue(MinuteIncrementProperty, value);
}
+
+ ///
+ /// Gets or sets the second increment in the selector
+ ///
+ public int SecondIncrement
+ {
+ get => GetValue(SecondIncrementProperty);
+ set => SetValue(SecondIncrementProperty, value);
+ }
///
/// Gets or sets the current clock identifier, either 12HourClock or 24HourClock
@@ -88,6 +118,15 @@ namespace Avalonia.Controls
get => GetValue(ClockIdentifierProperty);
set => SetValue(ClockIdentifierProperty, value);
}
+
+ ///
+ /// Gets or sets the current clock identifier, either 12HourClock or 24HourClock
+ ///
+ public bool UseSeconds
+ {
+ get => GetValue(UseSecondsProperty);
+ set => SetValue(UseSecondsProperty, value);
+ }
///
/// Gets or sets the current time
@@ -104,12 +143,15 @@ namespace Avalonia.Controls
_pickerContainer = e.NameScope.Get("PART_PickerContainer");
_periodHost = e.NameScope.Get("PART_PeriodHost");
+ _secondHost = e.NameScope.Get("PART_SecondHost");
_hourSelector = e.NameScope.Get("PART_HourSelector");
_minuteSelector = e.NameScope.Get("PART_MinuteSelector");
+ _secondSelector = e.NameScope.Get("PART_SecondSelector");
_periodSelector = e.NameScope.Get("PART_PeriodSelector");
-
+
_spacer2 = e.NameScope.Get("PART_SecondSpacer");
+ _spacer3 = e.NameScope.Get("PART_ThirdSpacer");
_acceptButton = e.NameScope.Get
double DesktopScaling { get; }
- ///
- /// Gets platform specific display information
- ///
- IScreenImpl? Screen { get; }
-
///
/// Get the platform handle.
///
diff --git a/src/Avalonia.Controls/Platform/Screen.cs b/src/Avalonia.Controls/Platform/Screen.cs
index fde90dc589..8d3fe1679d 100644
--- a/src/Avalonia.Controls/Platform/Screen.cs
+++ b/src/Avalonia.Controls/Platform/Screen.cs
@@ -1,13 +1,61 @@
using System;
using System.ComponentModel;
+using Avalonia.Diagnostics;
+using Avalonia.Metadata;
+using Avalonia.Utilities;
namespace Avalonia.Platform
{
+ ///
+ /// Describes the orientation of a screen.
+ ///
+ public enum ScreenOrientation
+ {
+ ///
+ /// No screen orientation is specified.
+ ///
+ None,
+
+ ///
+ /// Specifies that the monitor is oriented in landscape mode where the width of the screen viewing area is greater than the height.
+ ///
+ Landscape = 1,
+
+ ///
+ /// Specifies that the monitor rotated 90 degrees in the clockwise direction to orient the screen in portrait mode
+ /// where the height of the screen viewing area is greater than the width.
+ ///
+ Portrait = 2,
+
+ ///
+ /// Specifies that the monitor rotated another 90 degrees in the clockwise direction (to equal 180 degrees) to orient the screen in landscape mode
+ /// where the width of the screen viewing area is greater than the height.
+ /// This landscape mode is flipped 180 degrees from the Landscape mode.
+ ///
+ LandscapeFlipped = 4,
+
+ ///
+ /// Specifies that the monitor rotated another 90 degrees in the clockwise direction (to equal 270 degrees) to orient the screen in portrait mode
+ /// where the height of the screen viewing area is greater than the width. This portrait mode is flipped 180 degrees from the Portrait mode.
+ ///
+ PortraitFlipped = 8
+ }
+
///
/// Represents a single display screen.
///
- public class Screen
+ public class Screen : IEquatable
{
+ ///
+ /// Gets the device name associated with a display.
+ ///
+ public string? DisplayName { get; protected set; }
+
+ ///
+ /// Gets the current orientation of a screen.
+ ///
+ public ScreenOrientation CurrentOrientation { get; protected set; }
+
///
/// Gets the scaling factor applied to the screen by the operating system.
///
@@ -15,19 +63,19 @@ namespace Avalonia.Platform
/// Multiply this value by 100 to get a percentage.
/// Both X and Y scaling factors are assumed uniform.
///
- public double Scaling { get; }
+ public double Scaling { get; protected set; } = 1;
///
- [Obsolete("Use the Scaling property instead."), EditorBrowsable(EditorBrowsableState.Never)]
+ [Obsolete("Use the Scaling property instead.", true), EditorBrowsable(EditorBrowsableState.Never)]
public double PixelDensity => Scaling;
///
- /// Gets the overall pixel-size of the screen.
+ /// Gets the overall pixel-size and position of the screen.
///
///
/// This generally is the raw pixel counts in both the X and Y direction.
///
- public PixelRect Bounds { get; }
+ public PixelRect Bounds { get; protected set; }
///
/// Gets the actual working-area pixel-size of the screen.
@@ -36,15 +84,15 @@ namespace Avalonia.Platform
/// This area may be smaller than to account for notches and
/// other block-out areas such as taskbars etc.
///
- public PixelRect WorkingArea { get; }
+ public PixelRect WorkingArea { get; protected set; }
///
/// Gets a value indicating whether the screen is the primary one.
///
- public bool IsPrimary { get; }
+ public bool IsPrimary { get; protected set; }
///
- [Obsolete("Use the IsPrimary property instead."), EditorBrowsable(EditorBrowsableState.Never)]
+ [Obsolete("Use the IsPrimary property instead.", true), EditorBrowsable(EditorBrowsableState.Never)]
public bool Primary => IsPrimary;
///
@@ -54,12 +102,71 @@ namespace Avalonia.Platform
/// The overall pixel-size of the screen.
/// The actual working-area pixel-size of the screen.
/// Whether the screen is the primary one.
+ [Unstable(ObsoletionMessages.MayBeRemovedInAvalonia12)]
public Screen(double scaling, PixelRect bounds, PixelRect workingArea, bool isPrimary)
{
- this.Scaling = scaling;
- this.Bounds = bounds;
- this.WorkingArea = workingArea;
- this.IsPrimary = isPrimary;
- }
+ Scaling = scaling;
+ Bounds = bounds;
+ WorkingArea = workingArea;
+ IsPrimary = isPrimary;
+ }
+
+ private protected Screen() { }
+
+ ///
+ /// Tries to get the platform handle for the Screen.
+ ///
+ ///
+ /// An describing the screen handle, or null if the handle
+ /// could not be retrieved.
+ ///
+ public virtual IPlatformHandle? TryGetPlatformHandle() => null;
+
+ ///
+ public bool Equals(Screen? other)
+ {
+ if (other is null) return false;
+ if (ReferenceEquals(this, other)) return true;
+ return base.Equals(other);
+ }
+
+ public static bool operator ==(Screen? left, Screen? right)
+ {
+ return Equals(left, right);
+ }
+
+ public static bool operator !=(Screen? left, Screen? right)
+ {
+ return !Equals(left, right);
+ }
+
+ ///
+ public override string ToString()
+ {
+ var sb = StringBuilderCache.Acquire();
+ sb.Append("Screen");
+ sb.Append(" { ");
+
+ // Only printing properties that are supposed to be immutable:
+ sb.AppendFormat("{0} = {1}", nameof(DisplayName), DisplayName);
+ if (TryGetPlatformHandle() is { } platformHandle)
+ {
+ sb.AppendFormat(", {0}: {1}", platformHandle.HandleDescriptor, platformHandle.Handle);
+ }
+
+ sb.Append(" } ");
+ return StringBuilderCache.GetStringAndRelease(sb);
+ }
+
+ ///
+ /// When screen is removed, we should at least empty all the properties.
+ ///
+ internal void OnRemoved()
+ {
+ DisplayName = null;
+ Bounds = WorkingArea = default;
+ Scaling = default;
+ CurrentOrientation = default;
+ }
}
}
diff --git a/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs b/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs
index cba729d9d2..4027cd252f 100644
--- a/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs
+++ b/src/Avalonia.Controls/Presenters/PanelContainerGenerator.cs
@@ -136,12 +136,15 @@ namespace Avalonia.Controls.Presenters
return;
var itemsControl = _presenter.ItemsControl;
+ var generator = itemsControl.ItemContainerGenerator;
var panel = _presenter.Panel;
foreach (var c in panel.Children)
{
+ itemsControl.RemoveLogicalChild(c);
+
if (!c.IsSet(ItemIsOwnContainerProperty))
- itemsControl.RemoveLogicalChild(c);
+ generator.ClearItemContainer(c);
}
}
}
diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
index 83d157737e..33ed8908f1 100644
--- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
+++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs
@@ -27,12 +27,12 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
{
get
{
- if (_parent.Screen is null)
+ if (_parent.TryGetFeature() is not { } screenImpl)
{
return Array.Empty();
}
- return _parent.Screen.AllScreens
+ return screenImpl.AllScreens
.Select(s => new ManagedPopupPositionerScreenInfo(s.Bounds.ToRect(1), s.WorkingArea.ToRect(1)))
.ToArray();
}
diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index 4f7e531834..202f4e0252 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -6,6 +6,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Avalonia.Controls.Selection;
using Avalonia.Data;
+using Avalonia.Data.Core;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Metadata;
@@ -1387,6 +1388,9 @@ namespace Avalonia.Controls.Primitives
///
private class BindingHelper : StyledElement
{
+ private BindingExpressionBase? _expression;
+ private IBinding? _lastBinding;
+
public BindingHelper(IBinding binding)
{
UpdateBinding(binding);
@@ -1406,17 +1410,13 @@ namespace Avalonia.Controls.Primitives
public void UpdateBinding(IBinding binding)
{
- _lastBinding = binding;
- var ib = binding.Initiate(this, ValueProperty);
- if (ib is null)
- {
- throw new InvalidOperationException("Unable to create binding");
- }
+ if (binding == _lastBinding)
+ return;
- BindingOperations.Apply(this, ValueProperty, ib, null);
+ _expression?.Dispose();
+ _expression = Bind(ValueProperty, binding);
+ _lastBinding = binding;
}
-
- private IBinding? _lastBinding;
}
}
}
diff --git a/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs b/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
index 07e48653d7..3ec9221539 100644
--- a/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
+++ b/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Presenters;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Layout;
+using Avalonia.Media;
using Avalonia.VisualTree;
namespace Avalonia.Controls.Primitives
@@ -18,6 +19,7 @@ namespace Avalonia.Controls.Primitives
private TextPresenter? _presenter;
private TextBox? _textBox;
private bool _showHandle;
+ private bool _canShowContextMenu = true;
internal bool ShowHandles
{
@@ -33,7 +35,7 @@ namespace Avalonia.Controls.Primitives
_caretHandle.IsVisible = false;
}
- IsVisible = value;
+ IsVisible = !string.IsNullOrEmpty(_presenter?.Text) && value;
}
}
@@ -65,11 +67,20 @@ namespace Avalonia.Controls.Primitives
_caretHandle.SetTopLeft(default);
_endHandle.SetTopLeft(default);
+ _startHandle.PointerReleased += Handle_PointerReleased;
+ _caretHandle.PointerReleased += Handle_PointerReleased;
+ _endHandle.PointerReleased += Handle_PointerReleased;
+
IsVisible = ShowHandles;
ClipToBounds = false;
}
+ private void Handle_PointerReleased(object? sender, PointerReleasedEventArgs e)
+ {
+ ShowContextMenu();
+ }
+
private void Handle_DragStarted(object? sender, VectorEventArgs e)
{
if (_textBox?.ContextFlyout is { } flyout)
@@ -92,6 +103,7 @@ namespace Avalonia.Controls.Primitives
private void CaretHandle_DragDelta(object? sender, VectorEventArgs e)
{
+ _canShowContextMenu = false;
if (_presenter != null && _textBox != null)
{
var point = ToPresenter(_caretHandle.IndicatorPosition);
@@ -267,6 +279,7 @@ namespace Avalonia.Controls.Primitives
_textBox.PropertyChanged += TextBoxPropertyChanged;
_textBox.EffectiveViewportChanged += TextBoxEffectiveViewportChanged;
+ _textBox.SizeChanged += TextBox_SizeChanged;
}
}
else
@@ -281,12 +294,18 @@ namespace Avalonia.Controls.Primitives
_textBox.PropertyChanged -= TextBoxPropertyChanged;
_textBox.EffectiveViewportChanged -= TextBoxEffectiveViewportChanged;
+ _textBox.SizeChanged -= TextBox_SizeChanged;
}
_textBox = null;
}
}
+ private void TextBox_SizeChanged(object? sender, SizeChangedEventArgs e)
+ {
+ InvalidateMeasure();
+ }
+
private void TextBoxEffectiveViewportChanged(object? sender, EffectiveViewportChangedEventArgs e)
{
if (ShowHandles)
@@ -304,7 +323,7 @@ namespace Avalonia.Controls.Primitives
internal bool ShowContextMenu()
{
- if (_textBox != null)
+ if (_textBox != null && _canShowContextMenu)
{
if (_textBox.ContextFlyout is PopupFlyoutBase flyout)
{
@@ -345,6 +364,8 @@ namespace Avalonia.Controls.Primitives
}
}
+ _canShowContextMenu = true;
+
return false;
}
diff --git a/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs b/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs
index d9bf8b5529..550f82fe84 100644
--- a/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs
+++ b/src/Avalonia.Controls/Primitives/TextSelectionHandle.cs
@@ -134,32 +134,42 @@ namespace Avalonia.Controls.Primitives
protected override void OnPointerMoved(PointerEventArgs e)
{
- if (_lastPoint.HasValue)
+ VectorEventArgs ev;
+
+ if (!_lastPoint.HasValue)
{
- var ev = new VectorEventArgs
+ _lastPoint = e.GetPosition(VisualRoot as Visual);
+ e.Pointer.Capture(this);
+
+ ev = new VectorEventArgs
{
- RoutedEvent = DragDeltaEvent,
- Vector = e.GetPosition(VisualRoot as Visual) - _lastPoint.Value,
+ RoutedEvent = DragStartedEvent,
+ Vector = (Vector)_lastPoint,
};
+ }
+ else
+ {
+ var vector = e.GetPosition(VisualRoot as Visual) - _lastPoint.Value;
- RaiseEvent(ev);
+ var tapSize = TopLevel.GetTopLevel(this)?.PlatformSettings?.GetTapSize(PointerType.Touch) ?? new Size(10, 10);
+
+ if (Math.Abs(vector.X) < tapSize.Width && Math.Abs(vector.Y) < tapSize.Height)
+ return;
+
+ ev = new VectorEventArgs
+ {
+ RoutedEvent = DragDeltaEvent,
+ Vector = vector,
+ };
}
+
+ RaiseEvent(ev);
}
protected override void OnPointerPressed(PointerPressedEventArgs e)
{
e.Handled = true;
- _lastPoint = e.GetPosition(VisualRoot as Visual);
-
- var ev = new VectorEventArgs
- {
- RoutedEvent = DragStartedEvent,
- Vector = (Vector)_lastPoint,
- };
-
PseudoClasses.Add(":pressed");
-
- RaiseEvent(ev);
}
protected override void OnPointerReleased(PointerReleasedEventArgs e)
diff --git a/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs b/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs
index 07eef005c3..fad7718917 100644
--- a/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs
+++ b/src/Avalonia.Controls/Primitives/TextSelectorLayer.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Controls.Primitives
{
foreach (Control child in Children)
child.Measure(availableSize);
- return availableSize;
+ return default;
}
protected override Size ArrangeOverride(Size finalSize)
diff --git a/src/Avalonia.Controls/Screens.cs b/src/Avalonia.Controls/Screens.cs
index c65aaafa4b..d940900e2c 100644
--- a/src/Avalonia.Controls/Screens.cs
+++ b/src/Avalonia.Controls/Screens.cs
@@ -2,10 +2,10 @@ using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Metadata;
using Avalonia.Platform;
-#nullable enable
-
namespace Avalonia.Controls
{
///
@@ -14,25 +14,50 @@ namespace Avalonia.Controls
public class Screens
{
private readonly IScreenImpl _iScreenImpl;
+ private EventHandler? _changedHandlers;
///
/// Gets the total number of screens available on the device.
///
- public int ScreenCount => _iScreenImpl?.ScreenCount ?? 0;
+ public int ScreenCount => _iScreenImpl.ScreenCount;
///
/// Gets the list of all screens available on the device.
///
- public IReadOnlyList All => _iScreenImpl?.AllScreens ?? Array.Empty();
+ public IReadOnlyList All => _iScreenImpl.AllScreens;
///
/// Gets the primary screen on the device.
///
public Screen? Primary => All.FirstOrDefault(x => x.IsPrimary);
+ ///
+ /// Event raised when any screen was changed.
+ ///
+ public event EventHandler? Changed
+ {
+ add
+ {
+ if (_changedHandlers is null)
+ {
+ _iScreenImpl.Changed += ImplChanged;
+ }
+ _changedHandlers += value;
+ }
+ remove
+ {
+ _changedHandlers -= value;
+ if (_changedHandlers is null)
+ {
+ _iScreenImpl.Changed -= ImplChanged;
+ }
+ }
+ }
+
///
/// Initializes a new instance of the class.
///
+ [PrivateApi]
public Screens(IScreenImpl iScreenImpl)
{
_iScreenImpl = iScreenImpl;
@@ -41,6 +66,9 @@ namespace Avalonia.Controls
///
/// Retrieves a Screen for the display that contains the rectangle.
///
+ ///
+ /// On mobile, this method always returns null.
+ ///
/// Bounds that specifies the area for which to retrieve the display.
/// The .
public Screen? ScreenFromBounds(PixelRect bounds)
@@ -56,6 +84,10 @@ namespace Avalonia.Controls
/// The .
public Screen? ScreenFromWindow(WindowBase window)
{
+ if (window is null)
+ {
+ throw new ArgumentNullException(nameof(window));
+ }
if (window.PlatformImpl is null)
{
throw new ObjectDisposedException("Window platform implementation was already disposed.");
@@ -64,12 +96,32 @@ namespace Avalonia.Controls
return _iScreenImpl.ScreenFromWindow(window.PlatformImpl);
}
+ ///
+ /// Retrieves a Screen for the display that contains the specified .
+ ///
+ /// The top level for which to retrieve the Screen.
+ /// TopLevel platform implementation was already disposed.
+ /// The .
+ public Screen? ScreenFromTopLevel(TopLevel topLevel)
+ {
+ if (topLevel is null)
+ {
+ throw new ArgumentNullException(nameof(topLevel));
+ }
+ if (topLevel.PlatformImpl is null)
+ {
+ throw new ObjectDisposedException("Window platform implementation was already disposed.");
+ }
+
+ return _iScreenImpl.ScreenFromTopLevel(topLevel.PlatformImpl);
+ }
+
///
/// Retrieves a Screen for the display that contains the specified .
///
/// The window impl for which to retrieve the Screen.
/// The .
- [Obsolete("Use ScreenFromWindow(WindowBase) overload."), EditorBrowsable(EditorBrowsableState.Never)]
+ [Obsolete("Use ScreenFromWindow(WindowBase) overload.", true), EditorBrowsable(EditorBrowsableState.Never)]
public Screen? ScreenFromWindow(IWindowBaseImpl window)
{
return _iScreenImpl.ScreenFromWindow(window);
@@ -78,6 +130,9 @@ namespace Avalonia.Controls
///
/// Retrieves a Screen for the display that contains the specified point.
///
+ ///
+ /// On mobile, this method always returns null.
+ ///
/// A Point that specifies the location for which to retrieve a Screen.
/// The .
public Screen? ScreenFromPoint(PixelPoint point)
@@ -92,10 +147,45 @@ namespace Avalonia.Controls
/// The .
public Screen? ScreenFromVisual(Visual visual)
{
- var tl = visual.PointToScreen(visual.Bounds.TopLeft);
- var br = visual.PointToScreen(visual.Bounds.BottomRight);
+ if (visual is null)
+ {
+ throw new ArgumentNullException(nameof(visual));
+ }
+
+ var topLevel = TopLevel.GetTopLevel(visual);
+ if (topLevel is null)
+ {
+ throw new ArgumentException("Control does not belong to a visual tree.", nameof(visual));
+ }
+
+ if (topLevel is WindowBase)
+ {
+ var tl = visual.PointToScreen(visual.Bounds.TopLeft);
+ var br = visual.PointToScreen(visual.Bounds.BottomRight);
+
+ // Attempt to get screen from the physical position on any screen first. Fallback to the screen hosting top level.
+ return ScreenFromBounds(new PixelRect(tl, br))
+ ?? ScreenFromTopLevel(topLevel);
+ }
+ else
+ {
+ return ScreenFromTopLevel(topLevel);
+ }
+ }
- return ScreenFromBounds(new PixelRect(tl, br));
+ ///
+ /// Asks underlying platform to provide detailed screen information.
+ /// On some platforms it might include non-primary screens, as well as display names.
+ ///
+ ///
+ /// This method is async and might show a dialog to the user asking for a permission.
+ ///
+ /// True, if detailed screen information was provided. False, if denied by the platform or user.
+ public Task RequestScreenDetails() => _iScreenImpl.RequestScreenDetails();
+
+ private void ImplChanged()
+ {
+ _changedHandlers?.Invoke(this, EventArgs.Empty);
}
}
}
diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index 40c10fe29f..cb517b293d 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -256,7 +256,7 @@ namespace Avalonia.Controls
{
base.OnGotFocus(e);
- if (e.NavigationMethod == NavigationMethod.Directional)
+ if (e.NavigationMethod == NavigationMethod.Directional && e.Source is TabItem)
{
e.Handled = UpdateSelectionFromEventSource(e.Source);
}
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 699a13aae8..a627c15765 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1442,6 +1442,17 @@ namespace Avalonia.Controls
var backspacePosition = characterHit.FirstCharacterIndex + characterHit.TrailingLength;
+ var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, true);
+
+ var backspaceCharacterHit = _presenter.TextLayout.TextLines[lineIndex]
+ .GetBackspaceCaretCharacterHit(new CharacterHit(caretIndex));
+
+ if (backspaceCharacterHit.FirstCharacterIndex > backspacePosition &&
+ backspaceCharacterHit.FirstCharacterIndex < caretIndex)
+ {
+ backspacePosition = backspaceCharacterHit.FirstCharacterIndex;
+ }
+
if (caretIndex != backspacePosition)
{
var start = Math.Min(backspacePosition, caretIndex);
@@ -1456,6 +1467,8 @@ namespace Avalonia.Controls
SetCurrentValue(TextProperty, StringBuilderCache.GetStringAndRelease(sb));
SetCurrentValue(CaretIndexProperty, start);
+
+ _presenter.MoveCaretToTextPosition(start, true);
}
}
diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs
index 245b4d74b0..8bf0adedee 100644
--- a/src/Avalonia.Controls/ToolTip.cs
+++ b/src/Avalonia.Controls/ToolTip.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
using Avalonia.Controls.Diagnostics;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
using Avalonia.Reactive;
using Avalonia.Styling;
@@ -80,6 +81,28 @@ namespace Avalonia.Controls
internal static readonly AttachedProperty ToolTipProperty =
AvaloniaProperty.RegisterAttached("ToolTip");
+ ///
+ /// The event raised when a ToolTip is going to be shown on an element.
+ ///
+ ///
+ /// To prevent a tooltip from appearing in the UI, your handler for ToolTipOpening can mark the event data handled.
+ /// Otherwise, the tooltip is displayed, using the value of the ToolTip property as the tooltip content.
+ /// Another possible scenario is that you could write a handler that resets the value of the ToolTip property for the element that is the event source, just before the tooltip is displayed.
+ /// ToolTipOpening will not be raised if the value of ToolTip is null or otherwise unset. Do not deliberately set ToolTip to null while a tooltip is open or opening; this will not have the effect of closing the tooltip, and will instead create an undesirable visual artifact in the UI.
+ ///
+ public static readonly RoutedEvent ToolTipOpeningEvent =
+ RoutedEvent.Register("ToolTipOpening", RoutingStrategies.Direct);
+
+ ///
+ /// The event raised when a ToolTip on an element that was shown should now be hidden.
+ ///
+ ///
+ /// Marking the ToolTipClosing event as handled does not cancel closing the tooltip.
+ /// Once the tooltip is displayed, closing the tooltip is done only in response to user interaction with the UI.
+ ///
+ public static readonly RoutedEvent ToolTipClosingEvent =
+ RoutedEvent.Register("ToolTipClosing", RoutingStrategies.Direct);
+
private Popup? _popup;
private Action? _popupHostChangedHandler;
private CompositeDisposable? _subscriptions;
@@ -92,9 +115,6 @@ namespace Avalonia.Controls
IsOpenProperty.Changed.Subscribe(IsOpenChanged);
}
- internal Control? AdornedControl { get; private set; }
- internal event EventHandler? Closed;
-
///
/// Gets the value of the ToolTip.Tip attached property.
///
@@ -275,6 +295,38 @@ namespace Avalonia.Controls
public static void SetServiceEnabled(Control element, bool value) =>
element.SetValue(ServiceEnabledProperty, value);
+ ///
+ /// Adds a handler for the attached event.
+ ///
+ /// that listens to this event.
+ /// Event Handler to be added.
+ public static void AddToolTipOpeningHandler(Control element, EventHandler handler) =>
+ element.AddHandler(ToolTipOpeningEvent, handler);
+
+ ///
+ /// Removes a handler for the attached event.
+ ///
+ /// that listens to this event.
+ /// Event Handler to be removed.
+ public static void RemoveToolTipOpeningHandler(Control element, EventHandler handler) =>
+ element.RemoveHandler(ToolTipOpeningEvent, handler);
+
+ ///
+ /// Adds a handler for the attached event.
+ ///
+ /// that listens to this event.
+ /// Event Handler to be removed.
+ public static void AddToolTipClosingHandler(Control element, EventHandler handler) =>
+ element.AddHandler(ToolTipClosingEvent, handler);
+
+ ///
+ /// Removes a handler for the attached event.
+ ///
+ /// that listens to this event.
+ /// Event Handler to be removed.
+ public static void RemoveToolTipClosingHandler(Control element, EventHandler handler) =>
+ element.RemoveHandler(ToolTipClosingEvent, handler);
+
private static void IsOpenChanged(AvaloniaPropertyChangedEventArgs e)
{
var control = (Control)e.Sender;
@@ -282,8 +334,20 @@ namespace Avalonia.Controls
if (newValue)
{
+ var args = new CancelRoutedEventArgs(ToolTipOpeningEvent);
+ control.RaiseEvent(args);
+ if (args.Cancel)
+ {
+ control.SetCurrentValue(IsOpenProperty, false);
+ return;
+ }
+
var tip = GetTip(control);
- if (tip == null) return;
+ if (tip == null)
+ {
+ control.SetCurrentValue(IsOpenProperty, false);
+ return;
+ }
var toolTip = control.GetValue(ToolTipProperty);
if (toolTip == null || (tip != toolTip && tip != toolTip.Content))
@@ -292,25 +356,23 @@ namespace Avalonia.Controls
toolTip = tip as ToolTip ?? new ToolTip { Content = tip };
control.SetValue(ToolTipProperty, toolTip);
- toolTip.SetValue(ThemeVariant.RequestedThemeVariantProperty, control.ActualThemeVariant);
}
toolTip.AdornedControl = control;
toolTip.Open(control);
- toolTip?.UpdatePseudoClasses(newValue);
}
else if (control.GetValue(ToolTipProperty) is { } toolTip)
{
toolTip.AdornedControl = null;
toolTip.Close();
- toolTip?.UpdatePseudoClasses(newValue);
}
}
- IPopupHost? IPopupHostProvider.PopupHost => _popup?.Host;
-
+ internal Control? AdornedControl { get; private set; }
+ internal event EventHandler? Closed;
internal IPopupHost? PopupHost => _popup?.Host;
+ IPopupHost? IPopupHostProvider.PopupHost => _popup?.Host;
event Action? IPopupHostProvider.PopupHostChanged
{
add => _popupHostChangedHandler += value;
@@ -346,6 +408,13 @@ namespace Avalonia.Controls
private void Close()
{
+ if (AdornedControl is { } adornedControl
+ && GetIsOpen(adornedControl))
+ {
+ var args = new RoutedEventArgs(ToolTipClosingEvent);
+ adornedControl.RaiseEvent(args);
+ }
+
_subscriptions?.Dispose();
if (_popup is not null)
@@ -366,12 +435,14 @@ namespace Avalonia.Controls
}
_popupHostChangedHandler?.Invoke(null);
+ UpdatePseudoClasses(false);
Closed?.Invoke(this, EventArgs.Empty);
}
private void OnPopupOpened(object? sender, EventArgs e)
{
_popupHostChangedHandler?.Invoke(((Popup)sender!).Host);
+ UpdatePseudoClasses(true);
}
private void UpdatePseudoClasses(bool newValue)
diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index c3231fcde9..d01114be6f 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -221,7 +221,8 @@ namespace Avalonia.Controls
{
ToolTip.SetIsOpen(control, true);
- if (control.GetValue(ToolTip.ToolTipProperty) is { } tooltip)
+ // Value can be coerced back to false, need to double check.
+ if (ToolTip.GetIsOpen(control) && control.GetValue(ToolTip.ToolTipProperty) is { } tooltip)
{
tooltip.Closed += ToolTipClosed;
tooltip.PointerExited += ToolTipPointerExited;
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index b9b0c29523..b4b76085d9 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -138,6 +138,7 @@ namespace Avalonia.Controls
private Border? _transparencyFallbackBorder;
private TargetWeakEventSubscriber? _resourcesChangesSubscriber;
private IStorageProvider? _storageProvider;
+ private Screens? _screens;
private LayoutDiagnosticBridge? _layoutDiagnosticBridge;
///
@@ -232,6 +233,11 @@ namespace Avalonia.Controls
impl.TransparencyLevelChanged = HandleTransparencyLevelChanged;
CreatePlatformImplBinding(TransparencyLevelHintProperty, hint => PlatformImpl.SetTransparencyLevelHint(hint ?? Array.Empty()));
+ CreatePlatformImplBinding(ActualThemeVariantProperty, variant =>
+ {
+ variant ??= ThemeVariant.Default;
+ PlatformImpl?.SetFrameThemeVariant((PlatformThemeVariant?)variant ?? PlatformThemeVariant.Light);
+ });
_keyboardNavigationHandler?.SetOwner(this);
_accessKeyHandler?.SetOwner(this);
@@ -535,7 +541,7 @@ namespace Avalonia.Controls
public double RenderScaling => PlatformImpl?.RenderScaling ?? 1;
IStyleHost IStyleHost.StylingParent => _globalStyles!;
-
+
///
/// File System storage service used for file pickers and bookmarks.
///
@@ -548,6 +554,12 @@ namespace Avalonia.Controls
public IInputPane? InputPane => PlatformImpl?.TryGetFeature();
public ILauncher Launcher => PlatformImpl?.TryGetFeature() ?? new NoopLauncher();
+ ///
+ /// Gets platform screens implementation.
+ ///
+ public Screens? Screens => _screens ??=
+ PlatformImpl?.TryGetFeature() is { } screenImpl ? new Screens(screenImpl) : null;
+
///
/// Gets the platform's clipboard implementation
///
diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs
index 1b91a08e34..4339675a9e 100644
--- a/src/Avalonia.Controls/TrayIcon.cs
+++ b/src/Avalonia.Controls/TrayIcon.cs
@@ -7,6 +7,7 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Controls.Platform;
using Avalonia.Platform;
using Avalonia.Reactive;
+using Avalonia.Threading;
namespace Avalonia.Controls
{
@@ -64,12 +65,7 @@ namespace Avalonia.Controls
}
});
- var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
-
- if (app.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
- {
- lifetime.Exit += Lifetime_Exit;
- }
+ Dispatcher.UIThread.ShutdownStarted += ShutdownStarted;
}
///
@@ -184,7 +180,7 @@ namespace Avalonia.Controls
internal ITrayIconImpl? Impl => _impl;
- private static void Lifetime_Exit(object? sender, ControlledApplicationLifetimeExitEventArgs e)
+ private static void ShutdownStarted(object? sender, EventArgs? e)
{
var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
var trayIcons = GetIcons(app);
diff --git a/src/Avalonia.Controls/Utils/RealizedStackElements.cs b/src/Avalonia.Controls/Utils/RealizedStackElements.cs
index b8f088f090..fab10b0ad9 100644
--- a/src/Avalonia.Controls/Utils/RealizedStackElements.cs
+++ b/src/Avalonia.Controls/Utils/RealizedStackElements.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using Avalonia.Layout;
using Avalonia.Utilities;
namespace Avalonia.Controls.Utils
@@ -42,16 +43,17 @@ namespace Avalonia.Controls.Utils
public IReadOnlyList SizeU => _sizes ??= new List();
///
- /// Gets the position of the first element on the primary axis.
+ /// Gets the position of the first element on the primary axis, or NaN if the position is
+ /// unstable.
///
- public double StartU => _startU;
+ public double StartU => _startUUnstable ? double.NaN : _startU;
///
/// Adds a newly realized element to the collection.
///
/// The index of the element.
/// The element.
- /// The position of the elemnt on the primary axis.
+ /// The position of the element on the primary axis.
/// The size of the element on the primary axis.
public void Add(int index, Control element, double u, double sizeU)
{
@@ -99,76 +101,6 @@ namespace Avalonia.Controls.Utils
return null;
}
- ///
- /// Gets or estimates the index and start U position of the anchor element for the
- /// specified viewport.
- ///
- /// The U position of the start of the viewport.
- /// The U position of the end of the viewport.
- /// The number of items in the list.
- /// The current estimated element size.
- ///
- /// A tuple containing:
- /// - The index of the anchor element, or -1 if an anchor could not be determined
- /// - The U position of the start of the anchor element, if determined
- ///
- ///
- /// This method tries to find an existing element in the specified viewport from which
- /// element realization can start. Failing that it estimates the first element in the
- /// viewport.
- ///
- public (int index, double position) GetOrEstimateAnchorElementForViewport(
- double viewportStartU,
- double viewportEndU,
- int itemCount,
- ref double estimatedElementSizeU)
- {
- // We have no elements, nothing to do here.
- if (itemCount <= 0)
- return (-1, 0);
-
- // If we're at 0 then display the first item.
- if (MathUtilities.IsZero(viewportStartU))
- return (0, 0);
-
- if (_sizes is not null && !_startUUnstable)
- {
- var u = _startU;
-
- for (var i = 0; i < _sizes.Count; ++i)
- {
- var size = _sizes[i];
-
- if (double.IsNaN(size))
- break;
-
- var endU = u + size;
-
- if (endU > viewportStartU && u < viewportEndU)
- return (FirstIndex + i, u);
-
- u = endU;
- }
- }
-
- // We don't have any realized elements in the requested viewport, or can't rely on
- // StartU being valid. Estimate the index using only the estimated size. First,
- // estimate the element size, using defaultElementSizeU if we don't have any realized
- // elements.
- var estimatedSize = EstimateElementSizeU() switch
- {
- -1 => estimatedElementSizeU,
- double v => v,
- };
-
- // Store the estimated size for the next layout pass.
- estimatedElementSizeU = estimatedSize;
-
- // Estimate the element at the start of the viewport.
- var index = Math.Min((int)(viewportStartU / estimatedSize), itemCount - 1);
- return (index, index * estimatedSize);
- }
-
///
/// Gets the position of the element with the requested index on the primary axis, if realized.
///
@@ -193,61 +125,6 @@ namespace Avalonia.Controls.Utils
return u;
}
- public double GetOrEstimateElementU(int index, ref double estimatedElementSizeU)
- {
- // Return the position of the existing element if realized.
- var u = GetElementU(index);
-
- if (!double.IsNaN(u))
- return u;
-
- // Estimate the element size, using defaultElementSizeU if we don't have any realized
- // elements.
- var estimatedSize = EstimateElementSizeU() switch
- {
- -1 => estimatedElementSizeU,
- double v => v,
- };
-
- // Store the estimated size for the next layout pass.
- estimatedElementSizeU = estimatedSize;
-
- // TODO: Use _startU to work this out.
- return index * estimatedSize;
- }
-
- ///
- /// Estimates the average U size of all elements in the source collection based on the
- /// realized elements.
- ///
- ///
- /// The estimated U size of an element, or -1 if not enough information is present to make
- /// an estimate.
- ///
- public double EstimateElementSizeU()
- {
- var total = 0.0;
- var divisor = 0.0;
-
- // Average the size of the realized elements.
- if (_sizes is not null)
- {
- foreach (var size in _sizes)
- {
- if (double.IsNaN(size))
- continue;
- total += size;
- ++divisor;
- }
- }
-
- // We don't have any elements on which to base our estimate.
- if (divisor == 0 || total == 0)
- return -1;
-
- return total / divisor;
- }
-
///
/// Gets the index of the specified element.
///
@@ -538,6 +415,34 @@ namespace Avalonia.Controls.Utils
_elements?.Clear();
_sizes?.Clear();
}
- }
+ ///
+ /// Validates that is still valid.
+ ///
+ /// The panel orientation.
+ ///
+ /// If the U size of any element in the realized elements has changed, then the value of
+ /// should be considered unstable.
+ ///
+ public void ValidateStartU(Orientation orientation)
+ {
+ if (_elements is null || _sizes is null || _startUUnstable)
+ return;
+
+ for (var i = 0; i < _elements.Count; ++i)
+ {
+ if (_elements[i] is not { } element)
+ continue;
+
+ var sizeU = orientation == Orientation.Horizontal ?
+ element.DesiredSize.Width : element.DesiredSize.Height;
+
+ if (sizeU != _sizes[i])
+ {
+ _startUUnstable = true;
+ break;
+ }
+ }
+ }
+ }
}
diff --git a/src/Avalonia.Controls/VirtualizingPanel.cs b/src/Avalonia.Controls/VirtualizingPanel.cs
index 779aa811b4..1cd676ed4f 100644
--- a/src/Avalonia.Controls/VirtualizingPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingPanel.cs
@@ -192,6 +192,12 @@ namespace Avalonia.Controls
Children.RemoveRange(index, count);
}
+ private protected override void InvalidateMeasureOnChildrenChanged()
+ {
+ // Don't invalidate measure when children are added or removed: the panel is responsible
+ // for managing its children.
+ }
+
internal void Attach(ItemsControl itemsControl)
{
if (ItemsControl is not null)
diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs
index 4c1a1ccb9a..e235d31474 100644
--- a/src/Avalonia.Controls/VirtualizingStackPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
+using System.Drawing;
using System.Linq;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Utils;
@@ -159,6 +160,7 @@ namespace Avalonia.Controls
try
{
+ _realizedElements?.ValidateStartU(Orientation);
_realizedElements ??= new();
_measureElements ??= new();
@@ -179,6 +181,10 @@ namespace Avalonia.Controls
(_measureElements, _realizedElements) = (_realizedElements, _measureElements);
_measureElements.ResetForReuse();
+ // If there is a focused element is outside the visible viewport (i.e.
+ // _focusedElement is non-null), ensure it's measured.
+ _focusedElement?.Measure(availableSize);
+
return CalculateDesiredSize(orientation, items.Count, viewport);
}
finally
@@ -215,6 +221,16 @@ namespace Avalonia.Controls
}
}
+ // Ensure that the focused element is in the correct position.
+ if (_focusedElement is not null && _focusedIndex >= 0)
+ {
+ u = GetOrEstimateElementU(_focusedIndex);
+ var rect = orientation == Orientation.Horizontal ?
+ new Rect(u, 0, _focusedElement.DesiredSize.Width, finalSize.Height) :
+ new Rect(0, u, finalSize.Width, _focusedElement.DesiredSize.Height);
+ _focusedElement.Arrange(rect);
+ }
+
return finalSize;
}
finally
@@ -389,7 +405,7 @@ namespace Avalonia.Controls
scrollToElement.Measure(Size.Infinity);
// Get the expected position of the element and put it in place.
- var anchorU = _realizedElements.GetOrEstimateElementU(index, ref _lastEstimatedElementSizeU);
+ var anchorU = GetOrEstimateElementU(index);
var rect = Orientation == Orientation.Horizontal ?
new Rect(anchorU, 0, scrollToElement.DesiredSize.Width, scrollToElement.DesiredSize.Height) :
new Rect(0, anchorU, scrollToElement.DesiredSize.Width, scrollToElement.DesiredSize.Height);
@@ -472,11 +488,12 @@ namespace Avalonia.Controls
}
else
{
- (anchorIndex, anchorU) = _realizedElements.GetOrEstimateAnchorElementForViewport(
+ GetOrEstimateAnchorElementForViewport(
viewportStart,
viewportEnd,
items.Count,
- ref _lastEstimatedElementSizeU);
+ out anchorIndex,
+ out anchorU);
}
// Check if the anchor element is not within the currently realized elements.
@@ -531,12 +548,98 @@ namespace Avalonia.Controls
if (_realizedElements is null)
return _lastEstimatedElementSizeU;
- var result = _realizedElements.EstimateElementSizeU();
- if (result >= 0)
- _lastEstimatedElementSizeU = result;
- return _lastEstimatedElementSizeU;
+ var orientation = Orientation;
+ var total = 0.0;
+ var divisor = 0.0;
+
+ // Average the desired size of the realized, measured elements.
+ foreach (var element in _realizedElements.Elements)
+ {
+ if (element is null || !element.IsMeasureValid)
+ continue;
+ var sizeU = orientation == Orientation.Horizontal ?
+ element.DesiredSize.Width :
+ element.DesiredSize.Height;
+ total += sizeU;
+ ++divisor;
+ }
+
+ // Check we have enough information on which to base our estimate.
+ if (divisor == 0 || total == 0)
+ return _lastEstimatedElementSizeU;
+
+ // Store and return the estimate.
+ return _lastEstimatedElementSizeU = total / divisor;
+ }
+
+ private void GetOrEstimateAnchorElementForViewport(
+ double viewportStartU,
+ double viewportEndU,
+ int itemCount,
+ out int index,
+ out double position)
+ {
+ // We have no elements, or we're at the start of the viewport.
+ if (itemCount <= 0 || MathUtilities.IsZero(viewportStartU))
+ {
+ index = 0;
+ position = 0;
+ return;
+ }
+
+ // If we have realised elements and a valid StartU then try to use this information to
+ // get the anchor element.
+ if (_realizedElements?.StartU is { } u && !double.IsNaN(u))
+ {
+ var orientation = Orientation;
+
+ for (var i = 0; i < _realizedElements.Elements.Count; ++i)
+ {
+ if (_realizedElements.Elements[i] is not { } element)
+ continue;
+
+ var sizeU = orientation == Orientation.Horizontal ?
+ element.DesiredSize.Width :
+ element.DesiredSize.Height;
+ var endU = u + sizeU;
+
+ if (endU > viewportStartU && u < viewportEndU)
+ {
+ index = _realizedElements.FirstIndex + i;
+ position = u;
+ return;
+ }
+
+ u = endU;
+ }
+ }
+
+ // We don't have any realized elements in the requested viewport, or can't rely on
+ // StartU being valid. Estimate the index using only the estimated element size.
+ var estimatedSize = EstimateElementSizeU();
+
+ // Estimate the element at the start of the viewport.
+ var startIndex = Math.Min((int)(viewportStartU / estimatedSize), itemCount - 1);
+ index = startIndex;
+ position = startIndex * estimatedSize;
}
+ private double GetOrEstimateElementU(int index)
+ {
+ // Return the position of the existing element if realized.
+ var u = _realizedElements?.GetElementU(index) ?? double.NaN;
+
+ if (!double.IsNaN(u))
+ return u;
+
+ // Estimate the element size.
+ var estimatedSize = EstimateElementSizeU();
+
+ // TODO: Use _startU to work this out.
+ return index * estimatedSize;
+ }
+
+
private void RealizeElements(
IReadOnlyList items,
Size availableSize,
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 6715c8e4bc..055979efb4 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -48,18 +48,12 @@ namespace Avalonia.Controls
public WindowBase(IWindowBaseImpl impl) : this(impl, AvaloniaLocator.Current)
{
CreatePlatformImplBinding(TopmostProperty, topmost => PlatformImpl!.SetTopmost(topmost));
- CreatePlatformImplBinding(ActualThemeVariantProperty, variant =>
- {
- variant ??= ThemeVariant.Default;
- PlatformImpl?.SetFrameThemeVariant((PlatformThemeVariant?)variant ?? PlatformThemeVariant.Light);
- });
FrameSize = impl.FrameSize;
}
public WindowBase(IWindowBaseImpl impl, IAvaloniaDependencyResolver? dependencyResolver) : base(impl, dependencyResolver)
{
- Screens = new Screens(impl.Screen!);
impl.Activated = HandleActivated;
impl.Deactivated = HandleDeactivated;
impl.PositionChanged = HandlePositionChanged;
@@ -114,7 +108,9 @@ namespace Avalonia.Controls
private set => SetAndRaise(IsActiveProperty, ref _isActive, value);
}
- public Screens Screens { get; }
+ ///
+ public new Screens Screens => base.Screens
+ ?? throw new InvalidOperationException("Windowing backend wasn't properly initialized.");
///
/// Gets or sets the owner of the window.
diff --git a/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt b/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt
deleted file mode 100644
index fcc74cf864..0000000000
--- a/src/Avalonia.DesignerSupport/ApiCompatBaseline.txt
+++ /dev/null
@@ -1 +0,0 @@
-Total Issues: 0
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index f6598d0928..50cebbce8f 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -83,7 +83,6 @@ namespace Avalonia.DesignerSupport.Remote
{
}
- public IScreenImpl Screen { get; } = new ScreenStub();
public Action GotInputWhenDisabled { get; set; }
public Action ExtendClientAreaToDecorationsChanged { get; set; }
@@ -102,7 +101,12 @@ namespace Avalonia.DesignerSupport.Remote
{
return new NoopStorageProvider();
}
-
+
+ if (featureType == typeof(IScreenImpl))
+ {
+ return new ScreenStub();
+ }
+
return base.TryGetFeature(featureType);
}
diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
index 568e56a130..e21f4dc843 100644
--- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs
+++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs
@@ -123,9 +123,7 @@ namespace Avalonia.DesignerSupport.Remote
{
}
-
- public IScreenImpl Screen { get; } = new ScreenStub();
-
+
public void SetMinMaxSize(Size minSize, Size maxSize)
{
}
@@ -243,26 +241,20 @@ namespace Avalonia.DesignerSupport.Remote
public IWindowIconImpl LoadIcon(IBitmapImpl bitmap) => new IconStub();
}
- class ScreenStub : IScreenImpl
+ class ScreenStub : ScreensBase
{
- public int ScreenCount => 1;
-
- public IReadOnlyList AllScreens { get; } =
- new Screen[] { new Screen(1, new PixelRect(0, 0, 4000, 4000), new PixelRect(0, 0, 4000, 4000), true) };
-
- public Screen ScreenFromPoint(PixelPoint point)
- {
- return ScreenHelper.ScreenFromPoint(point, AllScreens);
- }
+ protected override IReadOnlyList GetAllScreenKeys() => new[] { 1 };
- public Screen ScreenFromRect(PixelRect rect)
- {
- return ScreenHelper.ScreenFromRect(rect, AllScreens);
- }
+ protected override PlatformScreen CreateScreenFromKey(int key) => new PlatformScreenStub(key);
- public Screen ScreenFromWindow(IWindowBaseImpl window)
+ private class PlatformScreenStub : PlatformScreen
{
- return ScreenHelper.ScreenFromWindow(window, AllScreens);
+ public PlatformScreenStub(int key) : base(new PlatformHandle((nint) key, nameof(ScreenStub)))
+ {
+ Scaling = 1;
+ Bounds = WorkingArea = new PixelRect(0, 0, 4000, 4000);
+ IsPrimary = true;
+ }
}
}
diff --git a/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs b/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs
index 13a4ac51d2..7574c55042 100644
--- a/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs
+++ b/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs
@@ -9,12 +9,12 @@ namespace Avalonia
public static AppBuilder UsePlatformDetect(this AppBuilder builder)
{
// We don't have the ability to load every assembly right now, so we are
- // stuck with manual configuration here
+ // stuck with manual configuration here
// Helpers are extracted to separate methods to take the advantage of the fact
// that CLR doesn't try to load dependencies before referencing method is jitted
// Additionally, by having a hard reference to each assembly,
// we verify that the assemblies are in the final .deps.json file
- // so .NET Core knows where to load the assemblies from,.
+ // so .NET Core knows where to load the assemblies from.
if (OperatingSystemEx.IsWindows())
{
LoadWin32(builder);
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs b/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
index 540f2b549d..691bf664ed 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
@@ -1,21 +1,7 @@
-using System;
-using System.IO;
-
-namespace Avalonia.Diagnostics
+namespace Avalonia.Diagnostics
{
internal static class Conventions
{
- public static string DefaultScreenshotsRoot
- {
- get
- {
- var dir = System.IO.Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Screenshots");
- Directory.CreateDirectory(dir);
- return dir;
- }
- }
-
public static IScreenshotHandler DefaultScreenshotHandler { get; } =
new Screenshots.FilePickerHandler();
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
index 6ea46b6d54..65998091e7 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Diagnostics.Screenshots
public sealed class FilePickerHandler : BaseRenderToStreamHandler
{
private readonly string _title;
- private readonly string _screenshotRoot;
+ private readonly string? _screenshotRoot;
///
/// Instance FilePickerHandler
@@ -35,7 +35,7 @@ namespace Avalonia.Diagnostics.Screenshots
string? screenshotRoot = default)
{
_title = title ?? "Save Screenshot to ...";
- _screenshotRoot = screenshotRoot ?? Conventions.DefaultScreenshotsRoot;
+ _screenshotRoot = screenshotRoot;
}
private static TopLevel GetTopLevel(Control control)
@@ -54,8 +54,15 @@ namespace Avalonia.Diagnostics.Screenshots
protected override async Task GetStream(Control control)
{
var storageProvider = GetTopLevel(control).StorageProvider;
- var defaultFolder = await storageProvider.TryGetFolderFromPathAsync(_screenshotRoot)
- ?? await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Pictures);
+ IStorageFolder? defaultFolder = null;
+ if (_screenshotRoot is not null)
+ {
+ defaultFolder = await storageProvider.TryGetFolderFromPathAsync(_screenshotRoot);
+ }
+ if (defaultFolder is null)
+ {
+ defaultFolder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Pictures);
+ }
var result = await storageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
{
diff --git a/src/Avalonia.Dialogs/ApiCompatBaseline.txt b/src/Avalonia.Dialogs/ApiCompatBaseline.txt
deleted file mode 100644
index 9cb1b47015..0000000000
--- a/src/Avalonia.Dialogs/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Compat issues with assembly Avalonia.Dialogs:
-CannotRemoveBaseTypeOrInterface : Type 'Avalonia.Dialogs.AboutAvaloniaDialog' does not implement interface 'Avalonia.Utilities.IWeakSubscriber' in the implementation but it does in the contract.
-Total Issues: 1
diff --git a/src/Avalonia.FreeDesktop/DBusHelper.cs b/src/Avalonia.FreeDesktop/DBusHelper.cs
index da74f15a3e..b733176243 100644
--- a/src/Avalonia.FreeDesktop/DBusHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusHelper.cs
@@ -7,37 +7,51 @@ namespace Avalonia.FreeDesktop
{
internal static class DBusHelper
{
- public static Connection? Connection { get; private set; }
+ private static Connection? s_defaultConntection;
+ private static bool s_defaultConnectionFailed;
+ public static Connection? DefaultConnection
+ {
+ get
+ {
+ if (s_defaultConntection == null && !s_defaultConnectionFailed)
+ {
+ s_defaultConntection = TryCreateNewConnection();
+ if (s_defaultConntection == null)
+ s_defaultConnectionFailed = true;
+ }
- public static Connection? TryInitialize(string? dbusAddress = null)
- => Connection ?? TryCreateNewConnection(dbusAddress);
+ return s_defaultConntection;
+ }
+ }
public static Connection? TryCreateNewConnection(string? dbusAddress = null)
{
var oldContext = SynchronizationContext.Current;
+ Connection? conn = null;
try
{
- var conn = new Connection(new ClientConnectionOptions(dbusAddress ?? Address.Session!)
+ SynchronizationContext.SetSynchronizationContext(null);
+ conn = new Connection(new ClientConnectionOptions(dbusAddress ?? Address.Session!)
{
- AutoConnect = false
+ AutoConnect = false,
});
// Connect synchronously
conn.ConnectAsync().GetAwaiter().GetResult();
-
- Connection = conn;
+ return conn;
}
catch (Exception e)
{
Logger.TryGet(LogEventLevel.Error, "DBUS")
?.Log(null, "Unable to connect to DBus: " + e);
+ conn?.Dispose();
}
finally
{
SynchronizationContext.SetSynchronizationContext(oldContext);
}
- return Connection;
+ return null;
}
}
}
diff --git a/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs b/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
index 8042d3bff2..a189c2e5da 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/X11DBusImeHelper.cs
@@ -12,6 +12,8 @@ namespace Avalonia.FreeDesktop.DBusIme
{
["fcitx"] = static conn =>
new DBusInputMethodFactory(_ => new FcitxX11TextInputMethod(conn)),
+ ["fcitx5"] = static conn =>
+ new DBusInputMethodFactory(_ => new FcitxX11TextInputMethod(conn)),
["ibus"] = static conn =>
new DBusInputMethodFactory(_ => new IBusX11TextInputMethod(conn))
};
@@ -37,7 +39,7 @@ namespace Avalonia.FreeDesktop.DBusIme
var factory = DetectInputMethod();
if (factory is not null)
{
- var conn = DBusHelper.TryInitialize();
+ var conn = DBusHelper.DefaultConnection;
if (conn is not null)
{
AvaloniaLocator.CurrentMutable.Bind().ToConstant(factory(conn));
diff --git a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
index fcc118bd31..e7bd23e965 100644
--- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
@@ -17,7 +17,7 @@ namespace Avalonia.FreeDesktop
internal class DBusMenuExporter
{
public static ITopLevelNativeMenuExporter? TryCreateTopLevelNativeMenu(IntPtr xid) =>
- DBusHelper.Connection is null ? null : new DBusMenuExporterImpl(DBusHelper.Connection, xid);
+ DBusHelper.DefaultConnection is {} conn ? new DBusMenuExporterImpl(conn, xid) : null;
public static INativeMenuExporter TryCreateDetachedNativeMenu(string path, Connection currentConnection) =>
new DBusMenuExporterImpl(currentConnection, path);
diff --git a/src/Avalonia.FreeDesktop/DBusPlatformSettings.cs b/src/Avalonia.FreeDesktop/DBusPlatformSettings.cs
index 852ed90764..ee59982ba7 100644
--- a/src/Avalonia.FreeDesktop/DBusPlatformSettings.cs
+++ b/src/Avalonia.FreeDesktop/DBusPlatformSettings.cs
@@ -2,6 +2,7 @@
using System.Threading.Tasks;
using Avalonia.Media;
using Avalonia.Platform;
+using Avalonia.Threading;
using Tmds.DBus.Protocol;
using Tmds.DBus.SourceGenerator;
@@ -17,10 +18,11 @@ namespace Avalonia.FreeDesktop
public DBusPlatformSettings()
{
- if (DBusHelper.Connection is null)
+ if (DBusHelper.DefaultConnection is not {} conn)
return;
+ using var restoreContext = AvaloniaSynchronizationContext.Ensure(DispatcherPriority.Input);
- _settings = new OrgFreedesktopPortalSettings(DBusHelper.Connection, "org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop");
+ _settings = new OrgFreedesktopPortalSettings(conn, "org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop");
_ = _settings.WatchSettingChangedAsync(SettingsChangedHandler);
_ = TryGetInitialValuesAsync();
}
diff --git a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
index 7ee963fc17..50033fff29 100644
--- a/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
+++ b/src/Avalonia.FreeDesktop/DBusSystemDialog.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Avalonia.Platform;
using Avalonia.Platform.Storage;
using Avalonia.Platform.Storage.FileIO;
+using Avalonia.Threading;
using Tmds.DBus.Protocol;
using Tmds.DBus.SourceGenerator;
@@ -16,10 +17,12 @@ namespace Avalonia.FreeDesktop
{
internal static async Task TryCreateAsync(IPlatformHandle handle)
{
- if (DBusHelper.Connection is null)
+ if (DBusHelper.DefaultConnection is not {} conn)
return null;
- var dbusFileChooser = new OrgFreedesktopPortalFileChooser(DBusHelper.Connection, "org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop");
+ using var restoreContext = AvaloniaSynchronizationContext.Ensure(DispatcherPriority.Input);
+
+ var dbusFileChooser = new OrgFreedesktopPortalFileChooser(conn, "org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop");
uint version;
try
{
@@ -30,7 +33,7 @@ namespace Avalonia.FreeDesktop
return null;
}
- return new DBusSystemDialog(DBusHelper.Connection, handle, dbusFileChooser, version);
+ return new DBusSystemDialog(conn, handle, dbusFileChooser, version);
}
private readonly Connection _connection;
diff --git a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
index f7e95b83d0..c74506f769 100644
--- a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
+++ b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Avalonia.Controls.Platform;
using Avalonia.Logging;
using Avalonia.Platform;
+using Avalonia.Threading;
using Tmds.DBus.Protocol;
using Tmds.DBus.SourceGenerator;
@@ -38,6 +39,7 @@ namespace Avalonia.FreeDesktop
public DBusTrayIconImpl()
{
+ using var restoreContext = AvaloniaSynchronizationContext.Ensure(DispatcherPriority.Input);
_connection = DBusHelper.TryCreateNewConnection();
if (_connection is null)
@@ -69,11 +71,11 @@ namespace Avalonia.FreeDesktop
var nameOwner = await _dBus.GetNameOwnerAsync("org.kde.StatusNotifierWatcher");
OnNameChange("org.kde.StatusNotifierWatcher", nameOwner);
}
- catch
+ catch (Exception e)
{
_serviceWatchDisposable = null;
Logger.TryGet(LogEventLevel.Error, "DBUS")
- ?.Log(this, "Interface 'org.kde.StatusNotifierWatcher' is unavailable.");
+ ?.Log(this, "Interface 'org.kde.StatusNotifierWatcher' is unavailable.\n{Exception}", e);
}
}
diff --git a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
index 0a735f8f9e..109a43c1ae 100644
--- a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel;
using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls.Platform;
using Avalonia.Native.Interop;
using Avalonia.Platform;
using Avalonia.Platform.Storage;
@@ -17,13 +18,15 @@ namespace Avalonia.Native
{
((IApplicationPlatformEvents)Application.Current)?.RaiseUrlsOpened(urls.ToStringArray());
- if (AvaloniaLocator.Current.GetService() is ActivatableLifetimeBase lifetime)
+ if (AvaloniaLocator.Current.GetService() is ActivatableLifetimeBase lifetime
+ && AvaloniaLocator.Current.GetService() is StorageProviderApi storageApi)
{
var filePaths = urls.ToStringArray();
var files = new List(filePaths.Length);
foreach (var filePath in filePaths)
{
- if (StorageProviderHelpers.TryCreateBclStorageItem(filePath) is { } file)
+ if (StorageProviderHelpers.TryGetUriFromFilePath(filePath, false) is { } fileUri
+ && storageApi.TryGetStorageItem(fileUri) is { } file)
{
files.Add(file);
}
@@ -41,7 +44,8 @@ namespace Avalonia.Native
// Raise the urls opened event to be compatible with legacy behavior.
((IApplicationPlatformEvents)Application.Current)?.RaiseUrlsOpened(urls.ToStringArray());
- if (AvaloniaLocator.Current.GetService() is ActivatableLifetimeBase lifetime)
+ if (AvaloniaLocator.Current.GetService() is ActivatableLifetimeBase lifetime
+ && AvaloniaLocator.Current.GetService() is StorageProviderApi storageApi)
{
var files = new List();
var uris = new List();
@@ -51,7 +55,7 @@ namespace Avalonia.Native
{
if (uri.Scheme == Uri.UriSchemeFile)
{
- if (StorageProviderHelpers.TryCreateBclStorageItem(uri.LocalPath) is { } file)
+ if (storageApi.TryGetStorageItem(uri) is { } file)
{
files.Add(file);
}
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 157925e35a..241528a9ac 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -76,10 +76,14 @@ namespace Avalonia.Native
var dialog = new AboutAvaloniaDialog();
if (Application.Current is
- { ApplicationLifetime: IClassicDesktopStyleApplicationLifetime { MainWindow: { } mainWindow } })
+ { ApplicationLifetime: IClassicDesktopStyleApplicationLifetime { MainWindow: { IsVisible: true } mainWindow } })
{
await dialog.ShowDialog(mainWindow);
}
+ else
+ {
+ dialog.Show();
+ }
};
result.Add(aboutItem);
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index 1495c43b83..00b57350cd 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -107,9 +107,9 @@ namespace Avalonia.Native
}
AvaloniaLocator.CurrentMutable
- .Bind()
- .ToConstant(new DispatcherImpl(_factory.CreatePlatformThreadingInterface()))
+ .Bind().ToConstant(new DispatcherImpl(_factory.CreatePlatformThreadingInterface()))
.Bind().ToConstant(new CursorFactory(_factory.CreateCursorFactory()))
+ .Bind().ToConstant(new ScreenImpl(_factory.CreateScreens))
.Bind().ToSingleton()
.Bind().ToConstant(KeyboardDevice)
.Bind().ToConstant(new NativePlatformSettings(_factory.CreatePlatformSettings()))
@@ -120,7 +120,8 @@ namespace Avalonia.Native
.Bind().ToConstant(new AvaloniaNativeDragSource(_factory))
.Bind().ToConstant(applicationPlatform)
.Bind().ToConstant(new MacOSNativeMenuCommands(_factory.CreateApplicationCommands()))
- .Bind().ToSingleton();
+ .Bind().ToSingleton()
+ .Bind().ToConstant(new StorageProviderApi(_factory.CreateStorageProvider(), options.AppSandboxEnabled));
var hotkeys = new PlatformHotkeyConfiguration(KeyModifiers.Meta, wholeWordTextActionModifiers: KeyModifiers.Alt);
hotkeys.MoveCursorToTheStartOfLine.Add(new KeyGesture(Key.Left, hotkeys.CommandModifiers));
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
index 67da919a01..f8974865a7 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
@@ -80,6 +80,13 @@ namespace Avalonia
/// and make your Avalonia app run with it. The default value is null.
///
public string AvaloniaNativeLibraryPath { get; set; }
+
+ ///
+ /// If you distribute your app in App Store - it should be with sandbox enabled.
+ /// This parameter enables and related APIs,
+ /// as well as wrapping all storage related calls in secure context. The default value is true.
+ ///
+ public bool AppSandboxEnabled { get; set; } = true;
}
// ReSharper disable once InconsistentNaming
diff --git a/src/Avalonia.Native/ClipboardImpl.cs b/src/Avalonia.Native/ClipboardImpl.cs
index 5b9c3acaaf..0fc4d76224 100644
--- a/src/Avalonia.Native/ClipboardImpl.cs
+++ b/src/Avalonia.Native/ClipboardImpl.cs
@@ -2,18 +2,21 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using Avalonia.Controls.Platform;
using Avalonia.Input;
using Avalonia.Input.Platform;
using Avalonia.Logging;
using Avalonia.Native.Interop;
using Avalonia.Platform.Storage;
using Avalonia.Platform.Storage.FileIO;
+using MicroCom.Runtime;
namespace Avalonia.Native
{
class ClipboardImpl : IClipboard, IDisposable
{
private IAvnClipboard _native;
+
// TODO hide native types behind IAvnClipboard abstraction, so managed side won't depend on macOS.
private const string NSPasteboardTypeString = "public.utf8-plain-text";
private const string NSFilenamesPboardType = "NSFilenamesPboardType";
@@ -86,7 +89,13 @@ namespace Avalonia.Native
public IEnumerable GetFiles()
{
- return GetFileNames()?.Select(f => StorageProviderHelpers.TryCreateBclStorageItem(f)!)
+ var storageApi = (StorageProviderApi)AvaloniaLocator.Current.GetRequiredService();
+
+ // TODO: use non-deprecated AppKit API to get NSUri instead of file names.
+ return GetFileNames()?
+ .Select(f => StorageProviderHelpers.TryGetUriFromFilePath(f, false) is { } uri
+ ? storageApi.TryGetStorageItem(uri)
+ : null)
.Where(f => f is not null);
}
diff --git a/src/Avalonia.Native/EmbeddableTopLevelImpl.cs b/src/Avalonia.Native/EmbeddableTopLevelImpl.cs
index 34f955ca06..4d17761c66 100644
--- a/src/Avalonia.Native/EmbeddableTopLevelImpl.cs
+++ b/src/Avalonia.Native/EmbeddableTopLevelImpl.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Native
{
using (var e = new TopLevelEvents(this))
{
- Init(new MacOSTopLevelHandle(factory.CreateTopLevel(e)), factory.CreateScreens());
+ Init(new MacOSTopLevelHandle(factory.CreateTopLevel(e)));
}
}
}
diff --git a/src/Avalonia.Native/PopupImpl.cs b/src/Avalonia.Native/PopupImpl.cs
index e0d7a0a3eb..14383c93c8 100644
--- a/src/Avalonia.Native/PopupImpl.cs
+++ b/src/Avalonia.Native/PopupImpl.cs
@@ -8,8 +8,6 @@ namespace Avalonia.Native
class PopupImpl : WindowBaseImpl, IPopupImpl
{
private readonly ITopLevelImpl _parent;
- private readonly IAvnPopup _native;
- private readonly AvaloniaNativeTextInputMethod _inputMethod;
public PopupImpl(IAvaloniaNativeFactory factory,
ITopLevelImpl parent) : base(factory)
@@ -18,7 +16,7 @@ namespace Avalonia.Native
using (var e = new PopupEvents(this))
{
- Init(new MacOSTopLevelHandle(_native = factory.CreatePopup(e)), factory.CreateScreens());
+ Init(new MacOSTopLevelHandle(factory.CreatePopup(e)));
}
PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(parent, MoveResize));
@@ -28,16 +26,28 @@ namespace Avalonia.Native
parent = popupImpl._parent;
}
+ if (parent is WindowBaseImpl windowBaseImpl)
+ {
+ Native!.SetParent(windowBaseImpl.Native);
+ }
+
//Use the parent's input context to process events
if (parent is TopLevelImpl topLevelImpl)
{
- _inputMethod = topLevelImpl.InputMethod;
+ InputMethod = topLevelImpl.InputMethod;
}
}
- internal sealed override void Init(MacOSTopLevelHandle handle, IAvnScreens screens)
+ public override void Dispose()
+ {
+ Native!.SetParent(null);
+
+ base.Dispose();
+ }
+
+ internal sealed override void Init(MacOSTopLevelHandle handle)
{
- base.Init(handle, screens);
+ base.Init(handle);
}
private void MoveResize(PixelPoint position, Size size, double scaling)
@@ -71,16 +81,6 @@ namespace Avalonia.Native
}
}
- public override void Show(bool activate, bool isDialog)
- {
- var parent = _parent;
- while (parent is PopupImpl p)
- parent = p._parent;
- if (parent is WindowImpl w)
- w.Native.TakeFocusFromChildren();
- base.Show(false, isDialog);
- }
-
public override IPopupImpl CreatePopup() => new PopupImpl(Factory, this);
public void SetWindowManagerAddShadowHint(bool enabled)
diff --git a/src/Avalonia.Native/ScreenImpl.cs b/src/Avalonia.Native/ScreenImpl.cs
index c64d1378e8..65fa19dab5 100644
--- a/src/Avalonia.Native/ScreenImpl.cs
+++ b/src/Avalonia.Native/ScreenImpl.cs
@@ -2,66 +2,81 @@ using System;
using System.Collections.Generic;
using Avalonia.Native.Interop;
using Avalonia.Platform;
+using MicroCom.Runtime;
+
+#nullable enable
namespace Avalonia.Native
{
- internal class ScreenImpl : IScreenImpl, IDisposable
+ internal sealed class AvnScreen(uint displayId)
+ : PlatformScreen(new PlatformHandle(new IntPtr(displayId), "CGDirectDisplayID"))
+ {
+ public unsafe void Refresh(IAvnScreens native)
+ {
+ void* localizedName = null;
+ var screen = native.GetScreen(displayId, &localizedName);
+
+ IsPrimary = screen.IsPrimary.FromComBool();
+ Scaling = screen.Scaling;
+ Bounds = screen.Bounds.ToAvaloniaPixelRect();
+ WorkingArea = screen.WorkingArea.ToAvaloniaPixelRect();
+ CurrentOrientation = screen.Orientation switch
+ {
+ AvnScreenOrientation.UnknownOrientation => ScreenOrientation.None,
+ AvnScreenOrientation.Landscape => ScreenOrientation.Landscape,
+ AvnScreenOrientation.Portrait => ScreenOrientation.Portrait,
+ AvnScreenOrientation.LandscapeFlipped => ScreenOrientation.LandscapeFlipped,
+ AvnScreenOrientation.PortraitFlipped => ScreenOrientation.PortraitFlipped,
+ _ => throw new ArgumentOutOfRangeException()
+ };
+
+ using var avnString = MicroComRuntime.CreateProxyOrNullFor(localizedName, true);
+ DisplayName = avnString?.String;
+ }
+ }
+
+ internal class ScreenImpl : ScreensBase, IDisposable
{
private IAvnScreens _native;
- public ScreenImpl(IAvnScreens native)
+ public ScreenImpl(Func factory)
{
- _native = native;
+ using var events = new AvnScreenEvents(this);
+ _native = factory(events);
}
- public int ScreenCount => _native.ScreenCount;
+ protected override unsafe int GetScreenCount() => _native.GetScreenIds(null);
- public IReadOnlyList AllScreens
+ protected override unsafe IReadOnlyList GetAllScreenKeys()
{
- get
+ var screenCount = _native.GetScreenIds(null);
+ var displayIds = new uint[screenCount];
+ fixed (uint* displayIdsPtr = displayIds)
{
- if (_native != null)
- {
- var count = ScreenCount;
- var result = new Screen[count];
-
- for (int i = 0; i < count; i++)
- {
- var screen = _native.GetScreen(i);
-
- result[i] = new Screen(
- screen.Scaling,
- screen.Bounds.ToAvaloniaPixelRect(),
- screen.WorkingArea.ToAvaloniaPixelRect(),
- screen.IsPrimary.FromComBool());
- }
-
- return result;
- }
-
- return Array.Empty();
+ _native.GetScreenIds(displayIdsPtr);
}
- }
- public void Dispose ()
- {
- _native?.Dispose();
- _native = null;
+ return displayIds;
}
- public Screen ScreenFromPoint(PixelPoint point)
+ protected override AvnScreen CreateScreenFromKey(uint key) => new(key);
+ protected override void ScreenChanged(AvnScreen screen) => screen.Refresh(_native);
+
+ protected override Screen? ScreenFromTopLevelCore(ITopLevelImpl topLevel)
{
- return ScreenHelper.ScreenFromPoint(point, AllScreens);
+ var displayId = ((TopLevelImpl)topLevel).Native?.CurrentDisplayId;
+ return displayId is not null && TryGetScreen(displayId.Value, out var screen) ? screen : null;
}
- public Screen ScreenFromRect(PixelRect rect)
+ public void Dispose()
{
- return ScreenHelper.ScreenFromRect(rect, AllScreens);
+ _native?.Dispose();
+ _native = null!;
}
- public Screen ScreenFromWindow(IWindowBaseImpl window)
+ private class AvnScreenEvents(ScreenImpl screenImpl) : NativeCallbackBase, IAvnScreenEvents
{
- return ScreenHelper.ScreenFromWindow(window, AllScreens);
+ public void OnChanged() => screenImpl.OnChanged();
}
}
}
diff --git a/src/Avalonia.Native/StorageItem.cs b/src/Avalonia.Native/StorageItem.cs
new file mode 100644
index 0000000000..12e4cc0a5e
--- /dev/null
+++ b/src/Avalonia.Native/StorageItem.cs
@@ -0,0 +1,152 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+using Avalonia.Utilities;
+
+namespace Avalonia.Native;
+
+internal class StorageItem : IStorageBookmarkItem, IStorageItemWithFileSystemInfo
+{
+ private readonly StorageProviderApi _storageProviderApi;
+ private readonly FileSystemInfo _fileSystemInfo;
+
+ protected StorageItem(StorageProviderApi storageProviderApi, FileSystemInfo fileSystemInfo, Uri uri, Uri scopeOwnerUri)
+ {
+ _storageProviderApi = storageProviderApi;
+ Path = uri;
+ _fileSystemInfo = fileSystemInfo;
+ ScopeOwnerUri = scopeOwnerUri;
+ }
+
+ public string Name => _fileSystemInfo.Name;
+ public Uri Path { get; }
+ public Uri ScopeOwnerUri { get; }
+
+ public Task GetBasicPropertiesAsync()
+ {
+ using var scope = OpenScope();
+ return Task.FromResult(
+ BclStorageItem.GetBasicPropertiesAsyncCore(_fileSystemInfo));
+ }
+
+ public bool CanBookmark => true;
+ public FileSystemInfo FileSystemInfo => _fileSystemInfo;
+
+ protected IDisposable? OpenScope()
+ {
+ return _storageProviderApi.OpenSecurityScope(ScopeOwnerUri.AbsoluteUri);
+ }
+
+ public Task SaveBookmarkAsync()
+ {
+ using var scope = OpenScope();
+ return Task.FromResult(_storageProviderApi.SaveBookmark(Path));
+ }
+
+ public Task ReleaseBookmarkAsync()
+ {
+ _storageProviderApi.ReleaseBookmark(Path);
+ return Task.CompletedTask;
+ }
+
+ public Task GetParentAsync()
+ {
+ using var scope = OpenScope();
+ var parent = BclStorageItem.GetParentCore(_fileSystemInfo);
+ return Task.FromResult((IStorageFolder?)WrapFileSystemInfo(parent, null));
+ }
+
+ public Task DeleteAsync()
+ {
+ using var scope = OpenScope();
+ BclStorageItem.DeleteCore(_fileSystemInfo);
+ return Task.CompletedTask;
+ }
+
+ public Task MoveAsync(IStorageFolder destination)
+ {
+ using var destinationScope = (destination as StorageItem)?.OpenScope();
+ using var scope = OpenScope();
+ var item = WrapFileSystemInfo(BclStorageItem.MoveCore(_fileSystemInfo, destination), null);
+ return Task.FromResult(item);
+ }
+
+ [return: NotNullIfNotNull(nameof(fileSystemInfo))]
+ protected IStorageItem? WrapFileSystemInfo(FileSystemInfo? fileSystemInfo, Uri? scopedOwner)
+ {
+ if (fileSystemInfo is null) return null;
+
+ // It might not be always correct to assume NSUri from the file path, but that's the best we have here without using native API directly.
+ var fileUri = BclStorageItem.GetPathCore(fileSystemInfo);
+ return fileSystemInfo switch
+ {
+ DirectoryInfo directoryInfo => new StorageFolder(
+ _storageProviderApi, directoryInfo, fileUri, scopedOwner ?? fileUri),
+ FileInfo fileInfo => new StorageFile(
+ _storageProviderApi, fileInfo, fileUri, scopedOwner ?? fileUri),
+ _ => throw new ArgumentOutOfRangeException(nameof(fileSystemInfo), fileSystemInfo, null)
+ };
+ }
+
+ public void Dispose()
+ {
+ }
+}
+
+internal class StorageFile(
+ StorageProviderApi storageProviderApi, FileInfo fileInfo, Uri uri, Uri scopeOwnerUri)
+ : StorageItem(storageProviderApi, fileInfo, uri, scopeOwnerUri), IStorageBookmarkFile
+{
+ public Task OpenReadAsync()
+ {
+ var scope = OpenScope();
+ var innerStream = BclStorageItem.OpenReadCore(fileInfo);
+ return Task.FromResult(scope is not null ? new SecurityScopedStream(innerStream, scope) : innerStream);
+ }
+
+ public Task OpenWriteAsync()
+ {
+ var scope = OpenScope();
+ var innerStream = BclStorageItem.OpenWriteCore(fileInfo);
+ return Task.FromResult(scope is not null ? new SecurityScopedStream(innerStream, scope) : innerStream);
+ }
+}
+
+internal class StorageFolder(
+ StorageProviderApi storageProviderApi, DirectoryInfo directoryInfo, Uri uri, Uri scopeOwnerUri)
+ : StorageItem(storageProviderApi, directoryInfo, uri, scopeOwnerUri), IStorageBookmarkFolder
+{
+ public IAsyncEnumerable GetItemsAsync()
+ {
+ return GetItems().AsAsyncEnumerable();
+
+ IEnumerable GetItems()
+ {
+ using var scope = OpenScope();
+ foreach (var item in BclStorageItem.GetItemsCore(directoryInfo))
+ {
+ yield return WrapFileSystemInfo(item, ScopeOwnerUri);
+ }
+ }
+ }
+
+ public Task CreateFileAsync(string name)
+ {
+ using var scope = OpenScope();
+ var file = BclStorageItem.CreateFileCore(directoryInfo, name);
+ return Task.FromResult((IStorageFile?)WrapFileSystemInfo(file, ScopeOwnerUri));
+ }
+
+ public Task CreateFolderAsync(string name)
+ {
+ using var scope = OpenScope();
+ var folder = BclStorageItem.CreateFolderCore(directoryInfo, name);
+ return Task.FromResult((IStorageFolder?)WrapFileSystemInfo(folder, ScopeOwnerUri));
+ }
+}
diff --git a/src/Avalonia.Native/StorageProviderApi.cs b/src/Avalonia.Native/StorageProviderApi.cs
new file mode 100644
index 0000000000..4d326ee8c3
--- /dev/null
+++ b/src/Avalonia.Native/StorageProviderApi.cs
@@ -0,0 +1,289 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.Platform;
+using Avalonia.Logging;
+using Avalonia.Native.Interop;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+using Avalonia.Reactive;
+using MicroCom.Runtime;
+
+namespace Avalonia.Native;
+
+internal class StorageProviderApi(IAvnStorageProvider native, bool sandboxEnabled) : IStorageProviderFactory, IDisposable
+{
+ private readonly Dictionary _openScopes = new();
+ private readonly IAvnStorageProvider _native = native;
+
+ public IStorageProvider CreateProvider(TopLevel topLevel)
+ {
+ return new StorageProviderImpl((TopLevelImpl)topLevel.PlatformImpl!, this);
+ }
+
+ public IStorageItem? TryGetStorageItem(Uri? itemUri, bool create = false)
+ {
+ if (itemUri is not null && StorageProviderHelpers.TryGetPathFromFileUri(itemUri) is { } itemPath)
+ {
+ if (new FileInfo(itemPath) is { } fileInfo
+ && (create || fileInfo.Exists))
+ {
+ return sandboxEnabled
+ ? new StorageFile(this, fileInfo, itemUri, itemUri)
+ : new BclStorageFile(fileInfo);
+ }
+ if (new DirectoryInfo(itemPath) is { } directoryInfo
+ && (create || directoryInfo.Exists))
+ {
+ return sandboxEnabled
+ ? new StorageFolder(this, directoryInfo, itemUri, itemUri)
+ : new BclStorageFolder(directoryInfo);
+ }
+ }
+
+ return null;
+ }
+
+ public IDisposable? OpenSecurityScope(string uriString)
+ {
+ // Multiple entries are possible.
+ // For example, user might open OpenRead stream, and read file properties before closing the file.
+ // If we don't check for nested scopes, inner closing scope will break access of the outer scope.
+ if (AddUse(this, uriString) == 1)
+ {
+ using var nsUriString = new AvnString(uriString);
+ var scopeOpened = _native.OpenSecurityScope(nsUriString).FromComBool();
+ if (!scopeOpened)
+ {
+ RemoveUse(this, uriString);
+ Logger.TryGet(LogEventLevel.Information, LogArea.macOSPlatform)?
+ .Log(this, "OpenSecurityScope returned false for the {Uri}", uriString);
+ return null;
+ }
+ }
+
+ return Disposable.Create((api: this, uriString), static state =>
+ {
+ if (RemoveUse(state.api, state.uriString) == 0)
+ {
+ using var nsUriString = new AvnString(state.uriString);
+ state.api._native.CloseSecurityScope(nsUriString);
+ }
+ });
+
+ static int AddUse(StorageProviderApi api, string uriString)
+ {
+ lock (api)
+ {
+ api._openScopes.TryGetValue(uriString, out var useValue);
+ api._openScopes[uriString] = ++useValue;
+ return useValue;
+ }
+ }
+ static int RemoveUse(StorageProviderApi api, string uriString)
+ {
+ lock (api)
+ {
+ api._openScopes.TryGetValue(uriString, out var useValue);
+ useValue--;
+ if (useValue == 0)
+ api._openScopes.Remove(uriString);
+ else
+ api._openScopes[uriString] = useValue;
+ return useValue;
+ }
+ }
+ }
+
+ // Avalonia.Native technically can be used for more than just macOS,
+ // In which case we should provide different bookmark platform keys, and parse accordingly.
+ private static ReadOnlySpan MacOSKey => "macOS"u8;
+ public unsafe string? SaveBookmark(Uri uri)
+ {
+ void* error = null;
+ using var uriString = new AvnString(uri.AbsoluteUri);
+ using var bookmarkStr = _native.SaveBookmarkToBytes(uriString, &error);
+
+ if (error != null)
+ {
+ using var errorStr = MicroComRuntime.CreateProxyOrNullFor(error, true);
+ Logger.TryGet(LogEventLevel.Warning, LogArea.macOSPlatform)?
+ .Log(this, "SaveBookmark for {Uri} failed with an error\r\n{Error}", uri, errorStr.String);
+ return null;
+ }
+
+ return StorageBookmarkHelper.EncodeBookmark(MacOSKey, bookmarkStr?.Bytes);
+ }
+
+ // Support both kinds of bookmarks when reading.
+ // Since "save bookmark" implementation will be different depending on the configuration.
+ public unsafe Uri? ReadBookmark(string bookmark, bool isDirectory)
+ {
+ if (StorageBookmarkHelper.TryDecodeBookmark(MacOSKey, bookmark, out var bytes) == StorageBookmarkHelper.DecodeResult.Success)
+ {
+ fixed (byte* ptr = bytes)
+ {
+ using var uriString = _native.ReadBookmarkFromBytes(ptr, bytes.Length);
+ return uriString is not null && Uri.TryCreate(uriString.String, UriKind.Absolute, out var uri) ?
+ uri :
+ null;
+ }
+ }
+ if (StorageBookmarkHelper.TryDecodeBclBookmark(bookmark, out var path))
+ {
+ return StorageProviderHelpers.UriFromFilePath(path, isDirectory);
+ }
+
+ return null;
+ }
+
+ public void ReleaseBookmark(Uri uri)
+ {
+ using var uriString = new AvnString(uri.AbsoluteUri);
+ _native.ReleaseBookmark(uriString);
+ }
+
+ public void Dispose()
+ {
+ _native.Dispose();
+ }
+
+ public async Task> OpenFileDialog(TopLevelImpl? topLevel, FilePickerOpenOptions options)
+ {
+ using var fileTypes = new FilePickerFileTypesWrapper(options.FileTypeFilter, null);
+ var suggestedDirectory = options.SuggestedStartLocation?.Path.AbsoluteUri ?? string.Empty;
+
+ var results = await OpenDialogAsync(events =>
+ {
+ _native.OpenFileDialog((IAvnWindow?)topLevel?.Native,
+ events,
+ options.AllowMultiple.AsComBool(),
+ options.Title ?? string.Empty,
+ suggestedDirectory,
+ options.SuggestedFileName ?? string.Empty,
+ fileTypes);
+ });
+
+ return results.OfType().ToArray();
+ }
+
+ public async Task SaveFileDialog(TopLevelImpl? topLevel, FilePickerSaveOptions options)
+ {
+ using var fileTypes = new FilePickerFileTypesWrapper(options.FileTypeChoices, options.DefaultExtension);
+ var suggestedDirectory = options.SuggestedStartLocation?.Path.AbsoluteUri ?? string.Empty;
+
+ var results = await OpenDialogAsync(events =>
+ {
+ _native.SaveFileDialog((IAvnWindow?)topLevel?.Native,
+ events,
+ options.Title ?? string.Empty,
+ suggestedDirectory,
+ options.SuggestedFileName ?? string.Empty,
+ fileTypes);
+ }, create: true);
+
+ return results.OfType().FirstOrDefault();
+ }
+
+ public async Task> SelectFolderDialog(TopLevelImpl? topLevel, FolderPickerOpenOptions options)
+ {
+ var suggestedDirectory = options.SuggestedStartLocation?.Path.AbsoluteUri ?? string.Empty;
+
+ var results = await OpenDialogAsync(events =>
+ {
+ _native.SelectFolderDialog((IAvnWindow?)topLevel?.Native,
+ events,
+ options.AllowMultiple.AsComBool(),
+ options.Title ?? "",
+ suggestedDirectory);
+ });
+
+ return results.OfType().ToArray();
+ }
+
+ public async Task> OpenDialogAsync(Action runDialog, bool create = false)
+ {
+ using var events = new SystemDialogEvents();
+ runDialog(events);
+ var result = await events.Task.ConfigureAwait(false);
+ return (result?
+ .Select(f => Uri.TryCreate(f, UriKind.Absolute, out var uri) ? TryGetStorageItem(uri, create) : null)
+ .Where(f => f is not null) ?? [])!;
+ }
+
+ internal class FilePickerFileTypesWrapper(
+ IReadOnlyList? types,
+ string? defaultExtension)
+ : NativeCallbackBase, IAvnFilePickerFileTypes
+ {
+ private readonly List _disposables = new();
+
+ public int Count => types?.Count ?? 0;
+
+ public int IsDefaultType(int index) => (defaultExtension is not null &&
+ types![index].TryGetExtensions()?.Any(defaultExtension.EndsWith) == true).AsComBool();
+
+ public int IsAnyType(int index) =>
+ (types![index].Patterns?.Contains("*.*") == true || types[index].MimeTypes?.Contains("*.*") == true)
+ .AsComBool();
+
+ public IAvnString GetName(int index)
+ {
+ return EnsureDisposable(types![index].Name.ToAvnString());
+ }
+
+ public IAvnStringArray GetPatterns(int index)
+ {
+ return EnsureDisposable(new AvnStringArray(types![index].Patterns ?? Array.Empty()));
+ }
+
+ public IAvnStringArray GetExtensions(int index)
+ {
+ return EnsureDisposable(new AvnStringArray(types![index].TryGetExtensions() ?? Array.Empty()));
+ }
+
+ public IAvnStringArray GetMimeTypes(int index)
+ {
+ return EnsureDisposable(new AvnStringArray(types![index].MimeTypes ?? Array.Empty()));
+ }
+
+ public IAvnStringArray GetAppleUniformTypeIdentifiers(int index)
+ {
+ return EnsureDisposable(new AvnStringArray(types![index].AppleUniformTypeIdentifiers ?? Array.Empty()));
+ }
+
+ protected override void Destroyed()
+ {
+ foreach (var disposable in _disposables)
+ {
+ disposable.Dispose();
+ }
+ }
+
+ private T EnsureDisposable(T input) where T : IDisposable
+ {
+ _disposables.Add(input);
+ return input;
+ }
+ }
+
+ internal class SystemDialogEvents : NativeCallbackBase, IAvnSystemDialogEvents
+ {
+ private readonly TaskCompletionSource _tcs = new();
+
+ public Task Task => _tcs.Task;
+
+ public void OnCompleted(IAvnStringArray? ppv)
+ {
+ using (ppv)
+ {
+ _tcs.SetResult(ppv?.ToStringArray() ?? []);
+ }
+ }
+ }
+}
diff --git a/src/Avalonia.Native/StorageProviderImpl.cs b/src/Avalonia.Native/StorageProviderImpl.cs
new file mode 100644
index 0000000000..2773eddf24
--- /dev/null
+++ b/src/Avalonia.Native/StorageProviderImpl.cs
@@ -0,0 +1,63 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+
+namespace Avalonia.Native;
+
+internal sealed class StorageProviderImpl(TopLevelImpl topLevel, StorageProviderApi native) : IStorageProvider
+{
+ public bool CanOpen => true;
+
+ public bool CanSave => true;
+
+ public bool CanPickFolder => true;
+
+ public Task> OpenFilePickerAsync(FilePickerOpenOptions options)
+ {
+ return native.OpenFileDialog(topLevel, options);
+ }
+
+ public Task SaveFilePickerAsync(FilePickerSaveOptions options)
+ {
+ return native.SaveFileDialog(topLevel, options);
+ }
+
+ public Task> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+ {
+ return native.SelectFolderDialog(topLevel, options);
+ }
+
+ public Task OpenFileBookmarkAsync(string bookmark)
+ {
+ return Task.FromResult(native.TryGetStorageItem(native.ReadBookmark(bookmark, false)) as IStorageBookmarkFile);
+ }
+
+ public Task OpenFolderBookmarkAsync(string bookmark)
+ {
+ return Task.FromResult(native.TryGetStorageItem(native.ReadBookmark(bookmark, true)) as IStorageBookmarkFolder);
+ }
+
+ public Task TryGetFileFromPathAsync(Uri fileUri)
+ {
+ return Task.FromResult(native.TryGetStorageItem(fileUri) as IStorageFile);
+ }
+
+ public Task TryGetFolderFromPathAsync(Uri folderPath)
+ {
+ return Task.FromResult(native.TryGetStorageItem(folderPath) as IStorageFolder);
+ }
+
+ public Task TryGetWellKnownFolderAsync(WellKnownFolder wellKnownFolder)
+ {
+ if (BclStorageProvider.TryGetWellKnownFolderCore(wellKnownFolder) is { } directoryInfo)
+ {
+ return Task.FromResult(new BclStorageFolder(directoryInfo));
+ }
+
+ return Task.FromResult(null);
+ }
+}
diff --git a/src/Avalonia.Native/SystemDialogs.cs b/src/Avalonia.Native/SystemDialogs.cs
deleted file mode 100644
index bf89817881..0000000000
--- a/src/Avalonia.Native/SystemDialogs.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Avalonia.Native.Interop;
-using Avalonia.Platform.Storage;
-using Avalonia.Platform.Storage.FileIO;
-
-namespace Avalonia.Native
-{
- internal class SystemDialogs : BclStorageProvider
- {
- private readonly TopLevelImpl _topLevel;
- private readonly IAvnSystemDialogs _native;
-
- public SystemDialogs(TopLevelImpl topLevel, IAvnSystemDialogs native)
- {
- _topLevel = topLevel;
- _native = native;
- }
-
- public override bool CanOpen => true;
-
- public override bool CanSave => true;
-
- public override bool CanPickFolder => true;
-
- public override async Task> OpenFilePickerAsync(FilePickerOpenOptions options)
- {
- using var events = new SystemDialogEvents();
- using var fileTypes = new FilePickerFileTypesWrapper(options.FileTypeFilter, null);
-
- var suggestedDirectory = options.SuggestedStartLocation?.TryGetLocalPath() ?? string.Empty;
-
- _native.OpenFileDialog((IAvnWindow)_topLevel.Native,
- events,
- options.AllowMultiple.AsComBool(),
- options.Title ?? string.Empty,
- suggestedDirectory,
- options.SuggestedFileName ?? string.Empty,
- fileTypes);
-
- var result = await events.Task.ConfigureAwait(false);
-
- return result?.Select(f => new BclStorageFile(new FileInfo(f))).ToArray()
- ?? Array.Empty();
- }
-
- public override async Task SaveFilePickerAsync(FilePickerSaveOptions options)
- {
- using var events = new SystemDialogEvents();
- using var fileTypes = new FilePickerFileTypesWrapper(options.FileTypeChoices, options.DefaultExtension);
-
- var suggestedDirectory = options.SuggestedStartLocation?.TryGetLocalPath() ?? string.Empty;
-
- _native.SaveFileDialog((IAvnWindow)_topLevel.Native,
- events,
- options.Title ?? string.Empty,
- suggestedDirectory,
- options.SuggestedFileName ?? string.Empty,
- fileTypes);
-
- var result = await events.Task.ConfigureAwait(false);
- return result.FirstOrDefault() is string file
- ? new BclStorageFile(new FileInfo(file))
- : null;
- }
-
- public override async Task> OpenFolderPickerAsync(FolderPickerOpenOptions options)
- {
- using var events = new SystemDialogEvents();
-
- var suggestedDirectory = options.SuggestedStartLocation?.TryGetLocalPath() ?? string.Empty;
-
- _native.SelectFolderDialog((IAvnWindow)_topLevel.Native, events, options.AllowMultiple.AsComBool(), options.Title ?? "", suggestedDirectory);
-
- var result = await events.Task.ConfigureAwait(false);
- return result?.Select(f => new BclStorageFolder(new DirectoryInfo(f))).ToArray()
- ?? Array.Empty();
- }
- }
-
- internal class FilePickerFileTypesWrapper : NativeCallbackBase, IAvnFilePickerFileTypes
- {
- private readonly IReadOnlyList? _types;
- private readonly string? _defaultExtension;
- private readonly List _disposables;
-
- public FilePickerFileTypesWrapper(
- IReadOnlyList? types,
- string? defaultExtension)
- {
- _types = types;
- _defaultExtension = defaultExtension;
- _disposables = new List();
- }
-
- public int Count => _types?.Count ?? 0;
-
- public int IsDefaultType(int index) => (_defaultExtension is not null &&
- _types![index].TryGetExtensions()?.Any(ext => _defaultExtension.EndsWith(ext)) == true).AsComBool();
-
- public int IsAnyType(int index) =>
- (_types![index].Patterns?.Contains("*.*") == true || _types[index].MimeTypes?.Contains("*.*") == true)
- .AsComBool();
-
- public IAvnString GetName(int index)
- {
- return EnsureDisposable(_types![index].Name.ToAvnString());
- }
-
- public IAvnStringArray GetPatterns(int index)
- {
- return EnsureDisposable(new AvnStringArray(_types![index].Patterns ?? Array.Empty()));
- }
-
- public IAvnStringArray GetExtensions(int index)
- {
- return EnsureDisposable(new AvnStringArray(_types![index].TryGetExtensions() ?? Array.Empty()));
- }
-
- public IAvnStringArray GetMimeTypes(int index)
- {
- return EnsureDisposable(new AvnStringArray(_types![index].MimeTypes ?? Array.Empty()));
- }
-
- public IAvnStringArray GetAppleUniformTypeIdentifiers(int index)
- {
- return EnsureDisposable(new AvnStringArray(_types![index].AppleUniformTypeIdentifiers ?? Array.Empty()));
- }
-
- protected override void Destroyed()
- {
- foreach (var disposable in _disposables)
- {
- disposable.Dispose();
- }
- }
-
- private T EnsureDisposable(T input) where T : IDisposable
- {
- _disposables.Add(input);
- return input;
- }
- }
-
- internal unsafe class SystemDialogEvents : NativeCallbackBase, IAvnSystemDialogEvents
- {
- private readonly TaskCompletionSource _tcs;
-
- public SystemDialogEvents()
- {
- _tcs = new TaskCompletionSource();
- }
-
- public Task Task => _tcs.Task;
-
- public void OnCompleted(int numResults, void* trFirstResultRef)
- {
- string[] results = new string[numResults];
-
- unsafe
- {
- var ptr = (IntPtr*)trFirstResultRef;
-
- for (int i = 0; i < numResults; i++)
- {
- results[i] = Marshal.PtrToStringAnsi(*ptr) ?? string.Empty;
-
- ptr++;
- }
- }
-
- _tcs.SetResult(results);
- }
- }
-}
diff --git a/src/Avalonia.Native/TopLevelImpl.cs b/src/Avalonia.Native/TopLevelImpl.cs
index 7d19906d29..1e434d2854 100644
--- a/src/Avalonia.Native/TopLevelImpl.cs
+++ b/src/Avalonia.Native/TopLevelImpl.cs
@@ -65,7 +65,6 @@ internal class TopLevelImpl : ITopLevelImpl, IFramebufferPlatformSurface
{
protected IInputRoot? _inputRoot;
private NativeControlHostImpl? _nativeControlHost;
- private IStorageProvider? _storageProvider;
private PlatformBehaviorInhibition? _platformBehaviorInhibition;
private readonly MouseDevice? _mouse;
@@ -92,17 +91,14 @@ internal class TopLevelImpl : ITopLevelImpl, IFramebufferPlatformSurface
_cursorFactory = AvaloniaLocator.Current.GetService();
}
- internal virtual void Init(MacOSTopLevelHandle handle, IAvnScreens screens)
+ internal virtual void Init(MacOSTopLevelHandle handle)
{
_handle = handle;
_savedLogicalSize = ClientSize;
_savedScaling = RenderScaling;
_nativeControlHost = new NativeControlHostImpl(Native!.CreateNativeControlHost());
- _storageProvider = new SystemDialogs(this, Factory.CreateSystemDialogs());
_platformBehaviorInhibition = new PlatformBehaviorInhibition(Factory.CreatePlatformBehaviorInhibition());
_surfaces = new object[] { new GlPlatformSurface(Native), new MetalPlatformSurface(Native), this };
-
- Screen = new ScreenImpl(screens);
InputMethod = new AvaloniaNativeTextInputMethod(Native);
}
@@ -110,7 +106,7 @@ internal class TopLevelImpl : ITopLevelImpl, IFramebufferPlatformSurface
public IAvnTopLevel? Native => _handle?.Native;
public IPlatformHandle? Handle => _handle;
- public AvaloniaNativeTextInputMethod? InputMethod { get; private set; }
+ public AvaloniaNativeTextInputMethod? InputMethod { get; protected set; }
public Size ClientSize
{
get
@@ -159,8 +155,6 @@ internal class TopLevelImpl : ITopLevelImpl, IFramebufferPlatformSurface
public INativeControlHostImpl? NativeControlHost => _nativeControlHost;
- public IScreenImpl? Screen { get; private set; }
-
public AutomationPeer? GetAutomationPeer()
{
return _inputRoot is Control c ? ControlAutomationPeer.CreatePeerForElement(c) : null;
@@ -342,11 +336,6 @@ internal class TopLevelImpl : ITopLevelImpl, IFramebufferPlatformSurface
return _nativeControlHost;
}
- if (featureType == typeof(IStorageProvider))
- {
- return _storageProvider;
- }
-
if (featureType == typeof(IPlatformBehaviorInhibition))
{
return _platformBehaviorInhibition;
@@ -357,6 +346,11 @@ internal class TopLevelImpl : ITopLevelImpl, IFramebufferPlatformSurface
return AvaloniaLocator.Current.GetRequiredService();
}
+ if (featureType == typeof(IScreenImpl))
+ {
+ return AvaloniaLocator.Current.GetRequiredService();
+ }
+
if (featureType == typeof(ILauncher))
{
return new BclLauncher();
@@ -373,7 +367,6 @@ internal class TopLevelImpl : ITopLevelImpl, IFramebufferPlatformSurface
_nativeControlHost?.Dispose();
_nativeControlHost = null;
- (Screen as ScreenImpl)?.Dispose();
_mouse?.Dispose();
}
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index b18f2e196b..a278bda67e 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -6,6 +6,7 @@ using Avalonia.Input.Raw;
using Avalonia.Input.TextInput;
using Avalonia.Native.Interop;
using Avalonia.Platform;
+using MicroCom.Runtime;
namespace Avalonia.Native
{
@@ -25,15 +26,15 @@ namespace Avalonia.Native
using (var e = new WindowEvents(this))
{
- Init(new MacOSTopLevelHandle(_native = factory.CreateWindow(e)), factory.CreateScreens());
+ Init(new MacOSTopLevelHandle(_native = factory.CreateWindow(e)));
}
_nativeMenuExporter = new AvaloniaNativeMenuExporter(_native, factory);
}
- internal sealed override void Init(MacOSTopLevelHandle handle, IAvnScreens screens)
+ internal sealed override void Init(MacOSTopLevelHandle handle)
{
- base.Init(handle, screens);
+ base.Init(handle);
}
class WindowEvents : WindowBaseEvents, IAvnWindowEvents
@@ -156,6 +157,9 @@ namespace Avalonia.Native
private void InvalidateExtendedMargins()
{
+ if(_native is MicroComProxyBase pb && pb.IsDisposed)
+ return;
+
if (WindowState == WindowState.FullScreen)
{
ExtendedMargins = new Thickness();
@@ -225,6 +229,13 @@ namespace Avalonia.Native
public void SetEnabled(bool enable)
{
_native.SetEnabled(enable.AsComBool());
+
+ // Showing a dialog should result in mouse capture being lost. macOS doesn't have the concept of mouse
+ // capture, so no we have no OS-level event to hook into. Instead, release the mouse capture when the
+ // owner window is disabled. This behavior matches win32, which sends a WM_CANCELMODE message when
+ // EnableWindow(hWnd, false) is called from SetEnabled.
+ if (!enable && MouseDevice is MouseDevice mouse)
+ mouse.PlatformCaptureLost();
}
public override object TryGetFeature(Type featureType)
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 1271c84295..29f6547c9f 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -47,14 +47,15 @@ namespace Avalonia.Native
}
}
- internal override void Init(MacOSTopLevelHandle handle, IAvnScreens screens)
+ internal override void Init(MacOSTopLevelHandle handle)
{
_handle = handle;
- base.Init(handle, screens);
+ base.Init(handle);
- var monitor = Screen!.AllScreens.OrderBy(x => x.Scaling)
- .FirstOrDefault(m => m.Bounds.Contains(Position));
+ var monitor = this.TryGetFeature()!.AllScreens
+ .OrderBy(x => x.Scaling)
+ .First(m => m.Bounds.Contains(Position));
Resize(new Size(monitor!.WorkingArea.Width * 0.75d, monitor.WorkingArea.Height * 0.7d), WindowResizeReason.Layout);
}
@@ -96,7 +97,8 @@ namespace Avalonia.Native
Native?.BeginMoveDrag();
}
- public Size MaxAutoSizeHint => Screen!.AllScreens.Select(s => s.Bounds.Size.ToSize(1))
+ public Size MaxAutoSizeHint => this.TryGetFeature()!.AllScreens
+ .Select(s => s.Bounds.Size.ToSize(1))
.OrderByDescending(x => x.Width + x.Height).FirstOrDefault();
public void SetTopmost(bool value)
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 04e42c2bf7..aa2e52449d 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -428,12 +428,22 @@ struct AvnPoint
double X, Y;
}
+enum AvnScreenOrientation
+{
+ UnknownOrientation,
+ Landscape,
+ Portrait,
+ LandscapeFlipped,
+ PortraitFlipped
+}
+
struct AvnScreen
{
AvnRect Bounds;
AvnRect WorkingArea;
float Scaling;
bool IsPrimary;
+ AvnScreenOrientation Orientation;
}
enum AvnPixelFormat
@@ -667,8 +677,8 @@ interface IAvaloniaNativeFactory : IUnknown
HRESULT CreateWindow(IAvnWindowEvents* cb, IAvnWindow** ppv);
HRESULT CreatePopup(IAvnWindowEvents* cb, IAvnPopup** ppv);
HRESULT CreatePlatformThreadingInterface(IAvnPlatformThreadingInterface** ppv);
- HRESULT CreateSystemDialogs(IAvnSystemDialogs** ppv);
- HRESULT CreateScreens(IAvnScreens** ppv);
+ HRESULT CreateStorageProvider(IAvnStorageProvider** ppv);
+ HRESULT CreateScreens(IAvnScreenEvents* cb, IAvnScreens** ppv);
HRESULT CreateClipboard(IAvnClipboard** ppv);
HRESULT CreateDndClipboard(IAvnClipboard** ppv);
HRESULT CreateCursorFactory(IAvnCursorFactory** ppv);
@@ -716,6 +726,8 @@ interface IAvnTopLevel : IUnknown
HRESULT GetInputMethod(IAvnTextInputMethod **ppv);
HRESULT SetTransparencyMode(AvnWindowTransparencyMode mode);
+
+ HRESULT GetCurrentDisplayId(uint* ret);
}
[uuid(e5aca675-02b7-4129-aa79-d6e417210bda), cpp-virtual-inherits]
@@ -876,18 +888,18 @@ interface IAvnPlatformThreadingInterface : IUnknown
[uuid(6c621a6e-e4c1-4ae3-9749-83eeeffa09b6)]
interface IAvnSystemDialogEvents : IUnknown
{
- void OnCompleted(int numResults, void* ptrFirstResult);
+ void OnCompleted(IAvnStringArray*array);
}
[uuid(4d7a47db-a944-4061-abe7-62cb6aa0ffd5)]
-interface IAvnSystemDialogs : IUnknown
+interface IAvnStorageProvider : IUnknown
{
void SelectFolderDialog(IAvnWindow* parentWindowHandle,
IAvnSystemDialogEvents* events,
bool allowMultiple,
[const] char* title,
[const] char* initialPath);
-
+
void OpenFileDialog(IAvnWindow* parentWindowHandle,
IAvnSystemDialogEvents* events,
bool allowMultiple,
@@ -895,13 +907,21 @@ interface IAvnSystemDialogs : IUnknown
[const] char* initialDirectory,
[const] char* initialFile,
IAvnFilePickerFileTypes* filters);
-
+
void SaveFileDialog(IAvnWindow* parentWindowHandle,
IAvnSystemDialogEvents* events,
[const] char* title,
[const] char* initialDirectory,
[const] char* initialFile,
IAvnFilePickerFileTypes* filters);
+
+ HRESULT SaveBookmarkToBytes(IAvnString*fileUri, void**err, IAvnString**ppv);
+ HRESULT ReadBookmarkFromBytes(void* ptr, int len, IAvnString**ppv);
+
+ void ReleaseBookmark(IAvnString*fileUri);
+
+ bool OpenSecurityScope(IAvnString*fileUri);
+ void CloseSecurityScope(IAvnString*fileUri);
}
[uuid(4d7ab7db-a111-406f-abeb-11cb6aa033d5)]
@@ -917,11 +937,17 @@ interface IAvnFilePickerFileTypes : IUnknown
HRESULT GetAppleUniformTypeIdentifiers(int index, IAvnStringArray**ppv);
}
+[uuid(424b1bd4-a111-4987-bfd0-9d642154b1b3)]
+interface IAvnScreenEvents : IUnknown
+{
+ HRESULT OnChanged();
+}
+
[uuid(9a52bc7a-d8c7-4230-8d34-704a0b70a933)]
interface IAvnScreens : IUnknown
{
- HRESULT GetScreenCount(int* ret);
- HRESULT GetScreen(int index, AvnScreen* ret);
+ HRESULT GetScreenIds(uint* ptrFirstResult, int* ret);
+ HRESULT GetScreen(uint screenId, void** localizedName, AvnScreen* ret);
}
[uuid(792b1bd4-76cc-46ea-bfd0-9d642154b1b3)]
diff --git a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt b/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt
deleted file mode 100644
index fcc74cf864..0000000000
--- a/src/Avalonia.Remote.Protocol/ApiCompatBaseline.txt
+++ /dev/null
@@ -1 +0,0 @@
-Total Issues: 0
diff --git a/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
deleted file mode 100644
index fcc74cf864..0000000000
--- a/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
+++ /dev/null
@@ -1 +0,0 @@
-Total Issues: 0
diff --git a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
index b94ef9b5d9..0ac46d00b2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
@@ -8,6 +8,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
+ BringIntoViewOnFocusChange="False"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Hidden">
+
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 64ac30128d..7eaa4bb307 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -128,11 +128,27 @@
HorizontalAlignment="Center"
Width="{DynamicResource TimePickerSpacerThemeWidth}"
Grid.Column="3" />
-
+
+
+
+
+
+
+
@@ -209,8 +225,20 @@
+
+
+
+
+
+
+
+
-
+
+
hour
minute
+ second
Cut
Copy
diff --git a/src/Avalonia.Themes.Simple/ApiCompatBaseline.txt b/src/Avalonia.Themes.Simple/ApiCompatBaseline.txt
deleted file mode 100644
index fcc74cf864..0000000000
--- a/src/Avalonia.Themes.Simple/ApiCompatBaseline.txt
+++ /dev/null
@@ -1 +0,0 @@
-Total Issues: 0
diff --git a/src/Avalonia.Themes.Simple/Controls/Carousel.xaml b/src/Avalonia.Themes.Simple/Controls/Carousel.xaml
index b94ef9b5d9..0ac46d00b2 100644
--- a/src/Avalonia.Themes.Simple/Controls/Carousel.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/Carousel.xaml
@@ -8,6 +8,7 @@
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
+ BringIntoViewOnFocusChange="False"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Hidden">
+ PlacementTarget="{TemplateBinding}"
+ InheritsTransform="True">
diff --git a/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
index 215f4eec5a..5c8f799f94 100644
--- a/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ContextMenu.xaml
@@ -6,6 +6,7 @@
+
diff --git a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
index 61e3a1d2fc..3a74278ebd 100644
--- a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
@@ -142,11 +142,30 @@
Width="{DynamicResource TimePickerSpacerThemeWidth}"
HorizontalAlignment="Center"
Fill="{DynamicResource TimePickerSpacerFill}" />
-
+
+
+
+
+
+
+
+
+
