diff --git a/.gitmodules b/.gitmodules index 22a241f120..10c780c09f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github"] - path = src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github - url = https://github.com/AvaloniaUI/Portable.Xaml.git [submodule "nukebuild/Numerge"] path = nukebuild/Numerge url = https://github.com/kekekeks/Numerge.git diff --git a/Avalonia.sln b/Avalonia.sln index 484d7a4cde..f86c18ba1e 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -146,7 +146,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1 build\Serilog.props = build\Serilog.props build\SharpDX.props = build\SharpDX.props build\SkiaSharp.props = build\SkiaSharp.props - build\Splat.props = build\Splat.props build\System.Memory.props = build\System.Memory.props build\XUnit.props = build\XUnit.props EndProjectSection diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml index 0c0a4d705b..64118a00b4 100644 --- a/samples/ControlCatalog/Pages/TextBoxPage.xaml +++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml @@ -26,6 +26,10 @@ + + diff --git a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs index 038f3574cc..88b1bf0b6b 100644 --- a/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs +++ b/samples/ControlCatalog/ViewModels/MenuPageViewModel.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Reactive; +using System.Reactive.Linq; using System.Threading.Tasks; using Avalonia.Controls; using ReactiveUI; @@ -11,7 +12,7 @@ namespace ControlCatalog.ViewModels public MenuPageViewModel() { OpenCommand = ReactiveCommand.CreateFromTask(Open); - SaveCommand = ReactiveCommand.Create(Save); + SaveCommand = ReactiveCommand.Create(Save, Observable.Return(false)); OpenRecentCommand = ReactiveCommand.Create(OpenRecent); MenuItems = new[] diff --git a/samples/VirtualizationDemo/MainWindow.xaml b/samples/VirtualizationDemo/MainWindow.xaml index 58970eff01..12137cd03d 100644 --- a/samples/VirtualizationDemo/MainWindow.xaml +++ b/samples/VirtualizationDemo/MainWindow.xaml @@ -39,6 +39,8 @@ + + - + diff --git a/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs index e883cdfeb9..4401a2dfeb 100644 --- a/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs +++ b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs @@ -10,6 +10,7 @@ namespace VirtualizationDemo.ViewModels { private string _prefix; private int _index; + private double _height = double.NaN; public ItemViewModel(int index, string prefix = "Item") { @@ -18,5 +19,11 @@ namespace VirtualizationDemo.ViewModels } public string Header => $"{_prefix} {_index}"; + + public double Height + { + get => _height; + set => this.RaiseAndSetIfChanged(ref _height, value); + } } } diff --git a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs index eba17f92e4..80e0fb2586 100644 --- a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs +++ b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs @@ -98,6 +98,24 @@ namespace VirtualizationDemo.ViewModels public ReactiveCommand SelectFirstCommand { get; private set; } public ReactiveCommand SelectLastCommand { get; private set; } + public void RandomizeSize() + { + var random = new Random(); + + foreach (var i in Items) + { + i.Height = random.Next(240) + 10; + } + } + + public void ResetSize() + { + foreach (var i in Items) + { + i.Height = double.NaN; + } + } + private void ResizeItems(int count) { if (Items == null) diff --git a/src/Avalonia.Build.Tasks/Program.cs b/src/Avalonia.Build.Tasks/Program.cs index c2d0950264..d356b15408 100644 --- a/src/Avalonia.Build.Tasks/Program.cs +++ b/src/Avalonia.Build.Tasks/Program.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.IO; +using System.Linq; using Microsoft.Build.Framework; namespace Avalonia.Build.Tasks @@ -11,8 +12,14 @@ namespace Avalonia.Build.Tasks { if (args.Length != 3) { - Console.Error.WriteLine("input references output"); - return 1; + if (args.Length == 1) + args = new[] {"original.dll", "references", "out.dll"} + .Select(x => Path.Combine(args[0], x)).ToArray(); + else + { + Console.Error.WriteLine("input references output"); + return 1; + } } return new CompileAvaloniaXamlTask() diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs index 70f26288af..b09d3bddff 100644 --- a/src/Avalonia.Controls/Button.cs +++ b/src/Avalonia.Controls/Button.cs @@ -33,8 +33,6 @@ namespace Avalonia.Controls /// public class Button : ContentControl { - private ICommand _command; - /// /// Defines the property. /// @@ -75,6 +73,9 @@ namespace Avalonia.Controls public static readonly StyledProperty IsPressedProperty = AvaloniaProperty.Register(nameof(IsPressed)); + private ICommand _command; + private bool _commandCanExecute = true; + /// /// Initializes static members of the class. /// @@ -147,6 +148,8 @@ namespace Avalonia.Controls private set { SetValue(IsPressedProperty, value); } } + protected override bool IsEnabledCore => base.IsEnabledCore && _commandCanExecute; + /// protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) { @@ -292,7 +295,11 @@ namespace Avalonia.Controls { if (status?.ErrorType == BindingErrorType.Error) { - IsEnabled = false; + if (_commandCanExecute) + { + _commandCanExecute = false; + UpdateIsEffectivelyEnabled(); + } } } } @@ -351,9 +358,13 @@ namespace Avalonia.Controls /// The event args. private void CanExecuteChanged(object sender, EventArgs e) { - // HACK: Just set the IsEnabled property for the moment. This needs to be changed to - // use IsEnabledCore etc. but it will do for now. - IsEnabled = Command == null || Command.CanExecute(CommandParameter); + var canExecute = Command == null || Command.CanExecute(CommandParameter); + + if (canExecute != _commandCanExecute) + { + _commandCanExecute = canExecute; + UpdateIsEffectivelyEnabled(); + } } /// diff --git a/src/Avalonia.Controls/ColumnDefinitions.cs b/src/Avalonia.Controls/ColumnDefinitions.cs index 4f5bbf3bc3..d4fc2ee0a1 100644 --- a/src/Avalonia.Controls/ColumnDefinitions.cs +++ b/src/Avalonia.Controls/ColumnDefinitions.cs @@ -16,10 +16,8 @@ namespace Avalonia.Controls /// /// Initializes a new instance of the class. /// - public ColumnDefinitions() + public ColumnDefinitions() : base () { - ResetBehavior = ResetBehavior.Remove; - CollectionChanged += OnCollectionChanged; } /// diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs index bf79e192c5..5d427df5a6 100644 --- a/src/Avalonia.Controls/ComboBox.cs +++ b/src/Avalonia.Controls/ComboBox.cs @@ -302,7 +302,7 @@ namespace Avalonia.Controls } } - private bool CanFocus(IControl control) => control.Focusable && control.IsEnabledCore && control.IsVisible; + private bool CanFocus(IControl control) => control.Focusable && control.IsEffectivelyEnabled && control.IsVisible; private void UpdateSelectionBoxItem(object item) { diff --git a/src/Avalonia.Controls/DefinitionBase.cs b/src/Avalonia.Controls/DefinitionBase.cs index 8899c38bf9..a68fe1265f 100644 --- a/src/Avalonia.Controls/DefinitionBase.cs +++ b/src/Avalonia.Controls/DefinitionBase.cs @@ -20,49 +20,15 @@ namespace Avalonia.Controls /// public abstract class DefinitionBase : AvaloniaObject { - //------------------------------------------------------ - // - // Constructors - // - //------------------------------------------------------ - - #region Constructors - - /* internal DefinitionBase(bool isColumnDefinition) - { - _isColumnDefinition = isColumnDefinition; - _parentIndex = -1; - }*/ - - #endregion Constructors - - //------------------------------------------------------ - // - // Public Properties - // - //------------------------------------------------------ - - #region Public Properties - /// /// SharedSizeGroup property. /// public string SharedSizeGroup { - get { return (string) GetValue(SharedSizeGroupProperty); } + get { return (string)GetValue(SharedSizeGroupProperty); } set { SetValue(SharedSizeGroupProperty, value); } } - #endregion Public Properties - - //------------------------------------------------------ - // - // Internal Methods - // - //------------------------------------------------------ - - #region Internal Methods - /// /// Callback to notify about entering model tree. /// @@ -86,15 +52,6 @@ namespace Avalonia.Controls } } - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e) - { - if (e.Property.PropertyType == typeof(GridLength) - || e.Property.PropertyType == typeof(double)) - OnUserSizePropertyChanged(e); - - base.OnPropertyChanged(e); - } - /// /// Callback to notify about exitting model tree. /// @@ -139,119 +96,14 @@ namespace Avalonia.Controls _minSize = minSize; } - /// - /// - /// - /// - /// This method needs to be internal to be accessable from derived classes. - /// - internal void OnUserSizePropertyChanged(AvaloniaPropertyChangedEventArgs e) - { - if (InParentLogicalTree) - { - if (_sharedState != null) - { - _sharedState.Invalidate(); - } - else - { - if (((GridLength)e.OldValue).GridUnitType != ((GridLength)e.NewValue).GridUnitType) - { - Parent.Invalidate(); - } - else - { - Parent.InvalidateMeasure(); - } - } - } - } - /// - /// - /// - /// - /// This method needs to be internal to be accessable from derived classes. - /// - internal static bool IsUserSizePropertyValueValid(object value) - { - return (((GridLength)value).Value >= 0); - } - - /// - /// - /// - /// - /// This method needs to be internal to be accessable from derived classes. - /// - internal static void OnUserMinSizePropertyChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e) - { - DefinitionBase definition = (DefinitionBase) d; - - if (definition.InParentLogicalTree) - { - Grid parentGrid = (Grid) definition.Parent; - parentGrid.InvalidateMeasure(); - } - } - - /// - /// - /// - /// - /// This method needs to be internal to be accessable from derived classes. - /// - internal static bool IsUserMinSizePropertyValueValid(object value) - { - double v = (double)value; - return (!double.IsNaN(v) && v >= 0.0d && !Double.IsPositiveInfinity(v)); - } - - /// - /// - /// - /// - /// This method needs to be internal to be accessable from derived classes. - /// - internal static void OnUserMaxSizePropertyChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e) - { - DefinitionBase definition = (DefinitionBase) d; - - if (definition.InParentLogicalTree) - { - Grid parentGrid = (Grid) definition.Parent; - parentGrid.InvalidateMeasure(); - } - } - - /// - /// - /// - /// - /// This method needs to be internal to be accessable from derived classes. - /// - internal static bool IsUserMaxSizePropertyValueValid(object value) - { - double v = (double)value; - return (!double.IsNaN(v) && v >= 0.0d); - } - - /// - /// - /// /// /// This method reflects Grid.SharedScopeProperty state by setting / clearing /// dynamic property PrivateSharedSizeScopeProperty. Value of PrivateSharedSizeScopeProperty /// is a collection of SharedSizeState objects for the scope. - /// Also PrivateSharedSizeScopeProperty is FrameworkPropertyMetadataOptions.Inherits property. So that all children - /// elements belonging to a certain scope can easily access SharedSizeState collection. As well - /// as been norified about enter / exit a scope. /// internal static void OnIsSharedSizeScopePropertyChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e) { - // is it possible to optimize here something like this: - // if ((bool)d.GetValue(Grid.IsSharedSizeScopeProperty) == (d.GetLocalValue(PrivateSharedSizeScopeProperty) != null) - // { /* do nothing */ } - if ((bool) e.NewValue) + if ((bool)e.NewValue) { SharedSizeScope sharedStatesCollection = new SharedSizeScope(); d.SetValue(PrivateSharedSizeScopeProperty, sharedStatesCollection); @@ -262,16 +114,6 @@ namespace Avalonia.Controls } } - #endregion Internal Methods - - //------------------------------------------------------ - // - // Internal Properties - // - //------------------------------------------------------ - - #region Internal Properties - /// /// Returns true if this definition is a part of shared group. /// @@ -349,8 +191,8 @@ namespace Avalonia.Controls get { double preferredSize = MinSize; - if ( _sizeType != Grid.LayoutTimeSizeType.Auto - && preferredSize < _measureSize ) + if (_sizeType != Grid.LayoutTimeSizeType.Auto + && preferredSize < _measureSize) { preferredSize = _measureSize; } @@ -375,9 +217,9 @@ namespace Avalonia.Controls get { double minSize = _minSize; - if ( UseSharedMinimum - && _sharedState != null - && minSize < _sharedState.MinSize ) + if (UseSharedMinimum + && _sharedState != null + && minSize < _sharedState.MinSize) { minSize = _sharedState.MinSize; } @@ -393,9 +235,9 @@ namespace Avalonia.Controls get { double minSize = _minSize; - if ( _sharedState != null - && (UseSharedMinimum || !LayoutWasUpdated) - && minSize < _sharedState.MinSize ) + if (_sharedState != null + && (UseSharedMinimum || !LayoutWasUpdated) + && minSize < _sharedState.MinSize) { minSize = _sharedState.MinSize; } @@ -426,27 +268,9 @@ namespace Avalonia.Controls /// Internal helper to access up-to-date UserMaxSize property value. /// internal abstract double UserMaxSizeValueCache { get; } - - /// - /// Protected. Returns true if this DefinitionBase instance is in parent's logical tree. - /// - internal bool InParentLogicalTree - { - get { return (_parentIndex != -1); } - } internal Grid Parent { get; set; } - #endregion Internal Properties - - //------------------------------------------------------ - // - // Private Methods - // - //------------------------------------------------------ - - #region Private Methods - /// /// SetFlags is used to set or unset one or multiple /// flags on the object. @@ -465,16 +289,13 @@ namespace Avalonia.Controls return ((_flags & flags) == flags); } - /// - /// - /// private static void OnSharedSizeGroupPropertyChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e) { - DefinitionBase definition = (DefinitionBase) d; - - if (definition.InParentLogicalTree) + DefinitionBase definition = (DefinitionBase)d; + + if (definition.Parent != null) { - string sharedSizeGroupId = (string) e.NewValue; + string sharedSizeGroupId = (string)e.NewValue; if (definition._sharedState != null) { @@ -483,7 +304,7 @@ namespace Avalonia.Controls definition._sharedState.RemoveMember(definition); definition._sharedState = null; } - + if ((definition._sharedState == null) && (sharedSizeGroupId != null)) { SharedSizeScope privateSharedSizeScope = definition.PrivateSharedSizeScope; @@ -498,9 +319,6 @@ namespace Avalonia.Controls } } - /// - /// - /// /// /// Verifies that Shared Size Group Property string /// a) not empty. @@ -520,10 +338,10 @@ namespace Avalonia.Controls { bool isDigit = Char.IsDigit(id[i]); - if ( (i == 0 && isDigit) - || !( isDigit - || Char.IsLetter(id[i]) - || '_' == id[i] ) ) + if ((i == 0 && isDigit) + || !(isDigit + || Char.IsLetter(id[i]) + || '_' == id[i])) { break; } @@ -535,12 +353,9 @@ namespace Avalonia.Controls } } - throw new ArgumentException("Invalid SharedSizeGroup string."); + throw new ArgumentException("Invalid SharedSizeGroup string."); } - /// - /// - /// /// /// OnPrivateSharedSizeScopePropertyChanged is called when new scope enters or /// existing scope just left. In both cases if the DefinitionBase object is already registered @@ -550,9 +365,9 @@ namespace Avalonia.Controls { DefinitionBase definition = (DefinitionBase)d; - if (definition.InParentLogicalTree) + if (definition.Parent != null) { - SharedSizeScope privateSharedSizeScope = (SharedSizeScope) e.NewValue; + SharedSizeScope privateSharedSizeScope = (SharedSizeScope)e.NewValue; if (definition._sharedState != null) { @@ -576,22 +391,12 @@ namespace Avalonia.Controls } } - #endregion Private Methods - - //------------------------------------------------------ - // - // Private Properties - // - //------------------------------------------------------ - - #region Private Properties - /// /// Private getter of shared state collection dynamic property. /// private SharedSizeScope PrivateSharedSizeScope { - get { return (SharedSizeScope) GetValue(PrivateSharedSizeScopeProperty); } + get { return (SharedSizeScope)GetValue(PrivateSharedSizeScopeProperty); } } /// @@ -612,16 +417,6 @@ namespace Avalonia.Controls set { SetFlags(value, Flags.LayoutWasUpdated); } } - #endregion Private Properties - - //------------------------------------------------------ - // - // Private Fields - // - //------------------------------------------------------ - - #region Private Fields - private readonly bool _isColumnDefinition; // when "true", this is a ColumnDefinition; when "false" this is a RowDefinition (faster than a type check) private Flags _flags; // flags reflecting various aspects of internal state internal int _parentIndex = -1; // this instance's index in parent's children collection @@ -633,19 +428,6 @@ namespace Avalonia.Controls private double _offset; // offset of the DefinitionBase from left / top corner (assuming LTR case) private SharedSizeState _sharedState; // reference to shared state object this instance is registered with - - internal const bool ThisIsColumnDefinition = true; - internal const bool ThisIsRowDefinition = false; - - #endregion Private Fields - - //------------------------------------------------------ - // - // Private Structures / Classes - // - //------------------------------------------------------ - - #region Private Structures Classes [System.Flags] private enum Flags : byte @@ -653,8 +435,8 @@ namespace Avalonia.Controls // // bool flags // - UseSharedMinimum = 0x00000020, // when "1", definition will take into account shared state's minimum - LayoutWasUpdated = 0x00000040, // set to "1" every time the parent grid is measured + UseSharedMinimum = 0x00000020, // when "1", definition will take into account shared state's minimum + LayoutWasUpdated = 0x00000040, // set to "1" every time the parent grid is measured } /// @@ -799,8 +581,8 @@ namespace Avalonia.Controls for (int i = 0, count = _registry.Count; i < count; ++i) { - Debug.Assert( _userSize.GridUnitType == GridUnitType.Auto - || _userSize.GridUnitType == GridUnitType.Pixel ); + Debug.Assert(_userSize.GridUnitType == GridUnitType.Auto + || _userSize.GridUnitType == GridUnitType.Pixel); GridLength currentGridLength = _registry[i].UserSizeValueCache; if (currentGridLength.GridUnitType == GridUnitType.Pixel) @@ -845,7 +627,7 @@ namespace Avalonia.Controls { DefinitionBase definitionBase = _registry[i]; - if (sharedMinSizeChanged || definitionBase.LayoutWasUpdated) + if (sharedMinSizeChanged || definitionBase.LayoutWasUpdated) { // if definition's min size is different, then need to re-measure if (!MathUtilities.AreClose(sharedMinSize, definitionBase.MinSize)) @@ -857,7 +639,7 @@ namespace Avalonia.Controls else { definitionBase.UseSharedMinimum = false; - + // if measure is valid then also need to check arrange. // Note: definitionBase.SizeCache is volatile but at this point // it contains up-to-date final size @@ -879,27 +661,34 @@ namespace Avalonia.Controls _broadcastInvalidation = true; } - - private readonly SharedSizeScope _sharedSizeScope; // the scope this state belongs to - private readonly string _sharedSizeGroupId; // Id of the shared size group this object is servicing - private readonly List _registry; // registry of participating definitions - private readonly EventHandler _layoutUpdated; // instance event handler for layout updated event - private Control _layoutUpdatedHost; // Control for which layout updated event handler is registered - private bool _broadcastInvalidation; // "true" when broadcasting of invalidation is needed - private bool _userSizeValid; // "true" when _userSize is up to date - private GridLength _userSize; // shared state - private double _minSize; // shared state - } - #endregion Private Structures Classes + // the scope this state belongs to + private readonly SharedSizeScope _sharedSizeScope; + + // Id of the shared size group this object is servicing + private readonly string _sharedSizeGroupId; + + // Registry of participating definitions + private readonly List _registry; - //------------------------------------------------------ - // - // Properties - // - //------------------------------------------------------ + // Instance event handler for layout updated event + private readonly EventHandler _layoutUpdated; - #region Properties + // Control for which layout updated event handler is registered + private Control _layoutUpdatedHost; + + // "true" when broadcasting of invalidation is needed + private bool _broadcastInvalidation; + + // "true" when _userSize is up to date + private bool _userSizeValid; + + // shared state + private GridLength _userSize; + + // shared state + private double _minSize; + } /// /// Private shared size scope property holds a collection of shared state objects for the a given shared size scope. @@ -931,7 +720,7 @@ namespace Avalonia.Controls public static readonly AttachedProperty SharedSizeGroupProperty = AvaloniaProperty.RegisterAttached( "SharedSizeGroup", - validate:SharedSizeGroupPropertyValueValid); + validate: SharedSizeGroupPropertyValueValid); /// /// Static ctor. Used for static registration of properties. @@ -941,7 +730,5 @@ namespace Avalonia.Controls SharedSizeGroupProperty.Changed.AddClassHandler(OnSharedSizeGroupPropertyChanged); PrivateSharedSizeScopeProperty.Changed.AddClassHandler(OnPrivateSharedSizeScopePropertyChanged); } - - #endregion Properties } } diff --git a/src/Avalonia.Controls/DefinitionList.cs b/src/Avalonia.Controls/DefinitionList.cs index b36ca9ce8a..97d92bdcb7 100644 --- a/src/Avalonia.Controls/DefinitionList.cs +++ b/src/Avalonia.Controls/DefinitionList.cs @@ -10,6 +10,12 @@ namespace Avalonia.Controls { public abstract class DefinitionList : AvaloniaList where T : DefinitionBase { + public DefinitionList() + { + ResetBehavior = ResetBehavior.Remove; + CollectionChanged += OnCollectionChanged; + } + internal bool IsDirty = true; private Grid _parent; @@ -19,7 +25,6 @@ namespace Avalonia.Controls set => SetParent(value); } - private void SetParent(Grid value) { _parent = value; diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs index 6d3b9f37cf..4f41b0bf1e 100644 --- a/src/Avalonia.Controls/Grid.cs +++ b/src/Avalonia.Controls/Grid.cs @@ -22,12 +22,6 @@ namespace Avalonia.Controls /// public class Grid : Panel { - //------------------------------------------------------ - // - // Constructors - // - //------------------------------------------------------ - static Grid() { IsSharedSizeScopeProperty.Changed.AddClassHandler(DefinitionBase.OnIsSharedSizeScopePropertyChanged); @@ -47,42 +41,6 @@ namespace Avalonia.Controls { } - //------------------------------------------------------ - // - // Public Methods - // - //------------------------------------------------------ - - - /// - /// - /// - /* protected internal override IEnumerator LogicalChildren - { - get - { - // empty panel or a panel being used as the items - // host has *no* logical children; give empty enumerator - bool noChildren = (base.VisualChildrenCount == 0) || IsItemsHost; - - if (noChildren) - { - ExtendedData extData = ExtData; - - if ( extData == null - || ( (extData.ColumnDefinitions == null || extData.ColumnDefinitions.Count == 0) - && (extData.RowDefinitions == null || extData.RowDefinitions.Count == 0) ) - ) - { - // grid is empty - return EmptyEnumerator.Instance; - } - } - - return (new GridChildrenCollectionEnumeratorSimple(this, !noChildren)); - } - } */ - /// /// Helper for setting Column property on a Control. /// @@ -193,12 +151,6 @@ namespace Avalonia.Controls return element.GetValue(IsSharedSizeScopeProperty); } - //------------------------------------------------------ - // - // Public Properties - // - //------------------------------------------------------ - /// /// ShowGridLines property. /// @@ -248,52 +200,6 @@ namespace Avalonia.Controls } } - //------------------------------------------------------ - // - // Protected Methods - // - //------------------------------------------------------ - - /* /// - /// Derived class must implement to support Visual children. The method must return - /// the child at the specified index. Index must be between 0 and GetVisualChildrenCount-1. - /// - /// By default a Visual does not have any children. - /// - /// Remark: - /// During this virtual call it is not valid to modify the Visual tree. - /// - protected override Visual GetVisualChild(int index) - { - // because "base.Count + 1" for GridLinesRenderer - // argument checking done at the base class - if(index == base.VisualChildrenCount) - { - if (_gridLinesRenderer == null) - { - throw new ArgumentOutOfRangeException("index", index, SR.Get(SRID.Visual_ArgumentOutOfRange)); - } - return _gridLinesRenderer; - } - else return base.GetVisualChild(index); - } - - /// - /// Derived classes override this property to enable the Visual code to enumerate - /// the Visual children. Derived classes need to return the number of children - /// from this method. - /// - /// By default a Visual does not have any children. - /// - /// Remark: During this virtual method the Visual tree must not be modified. - /// - protected override int VisualChildrenCount - { - //since GridLinesRenderer has not been added as a child, so we do not subtract - get { return base.VisualChildrenCount + (_gridLinesRenderer != null ? 1 : 0); } - }*/ - - /// /// Content measurement. /// @@ -306,8 +212,6 @@ namespace Avalonia.Controls try { - - ListenToNotifications = true; MeasureOverrideInProgress = true; @@ -550,7 +454,7 @@ namespace Avalonia.Controls // also use a count heuristic to break a loop in case of one. bool hasDesiredSizeUChanged = false; - int cnt=0; + int cnt = 0; // Cache Group2MinWidths & Group3MinHeights double[] group2MinSizes = CacheMinSizes(extData.CellGroup2, false); @@ -582,17 +486,14 @@ namespace Avalonia.Controls MeasureCellsGroup(extData.CellGroup4, constraint, false, false); - gridDesiredSize = new Size( CalculateDesiredSize(DefinitionsU), CalculateDesiredSize(DefinitionsV)); - } } finally { MeasureOverrideInProgress = false; - } return (gridDesiredSize); @@ -606,8 +507,6 @@ namespace Avalonia.Controls { try { - - ArrangeOverrideInProgress = true; if (_data == null) @@ -627,13 +526,9 @@ namespace Avalonia.Controls { Debug.Assert(DefinitionsU.Count > 0 && DefinitionsV.Count > 0); - - SetFinalSize(DefinitionsU, arrangeSize.Width, true); SetFinalSize(DefinitionsV, arrangeSize.Height, false); - - var children = this.Children; for (int currentCell = 0; currentCell < PrivateCells.Length; ++currentCell) @@ -653,11 +548,11 @@ namespace Avalonia.Controls columnIndex == 0 ? 0.0 : DefinitionsU[columnIndex].FinalOffset, rowIndex == 0 ? 0.0 : DefinitionsV[rowIndex].FinalOffset, GetFinalSizeForRange(DefinitionsU, columnIndex, columnSpan), - GetFinalSizeForRange(DefinitionsV, rowIndex, rowSpan) ); + GetFinalSizeForRange(DefinitionsV, rowIndex, rowSpan)); + - cell.Arrange(cellRect); - + } // update render bound on grid lines renderer visual @@ -669,31 +564,12 @@ namespace Avalonia.Controls { SetValid(); ArrangeOverrideInProgress = false; - } return (arrangeSize); } /// - /// - /// - /*protected internal override void OnVisualChildrenChanged( - AvaloniaObject visualAdded, - AvaloniaObject visualRemoved) - { - CellsStructureDirty = true; - - base.OnVisualChildrenChanged(visualAdded, visualRemoved); - }*/ - - //------------------------------------------------------ - // - // Internal Methods - // - //------------------------------------------------------ - - /// - /// Invalidates grid caches and makes the grid dirty for measure. + /// Invalidates grid caches and makes the grid dirty for measure. /// internal void Invalidate() { @@ -702,10 +578,10 @@ namespace Avalonia.Controls } /// - /// Returns final width for a column. + /// Returns final width for a column. /// /// - /// Used from public ColumnDefinition ActualWidth. Calculates final width using offset data. + /// Used from public ColumnDefinition ActualWidth. Calculates final width using offset data. /// internal double GetFinalColumnDefinitionWidth(int columnIndex) { @@ -724,10 +600,10 @@ namespace Avalonia.Controls } /// - /// Returns final height for a row. + /// Returns final height for a row. /// /// - /// Used from public RowDefinition ActualHeight. Calculates final height using offset data. + /// Used from public RowDefinition ActualHeight. Calculates final height using offset data. /// internal double GetFinalRowDefinitionHeight(int rowIndex) { @@ -745,12 +621,6 @@ namespace Avalonia.Controls return (value); } - //------------------------------------------------------ - // - // Internal Properties - // - //------------------------------------------------------ - /// /// Convenience accessor to MeasureOverrideInProgress bit flag. /// @@ -781,32 +651,22 @@ namespace Avalonia.Controls /// /// Convenience accessor to ValidDefinitionsVStructure bit flag. /// - internal bool RowDefinitionsDirty + internal bool RowDefinitionsDirty { get => RowDefinitions?.IsDirty ?? false; set => RowDefinitions.IsDirty = value; } - //------------------------------------------------------ - // - // Private Methods - // - //------------------------------------------------------ - /// /// Lays out cells according to rows and columns, and creates lookup grids. /// private void ValidateCells() { - - if (CellsStructureDirty) { ValidateCellsCore(); CellsStructureDirty = false; } - - } /// @@ -837,11 +697,8 @@ namespace Avalonia.Controls CellCache cell = new CellCache(); - // - // read and cache child positioning properties - // - // read indices from the corresponding properties + // Read indices from the corresponding properties: // clamp to value < number_of_columns // column >= 0 is guaranteed by property value validation callback cell.ColumnIndex = Math.Min(GetColumn((Control)child), DefinitionsU.Count - 1); @@ -849,7 +706,7 @@ namespace Avalonia.Controls // row >= 0 is guaranteed by property value validation callback cell.RowIndex = Math.Min(GetRow((Control)child), DefinitionsV.Count - 1); - // read span properties + // Read span properties: // clamp to not exceed beyond right side of the grid // column_span > 0 is guaranteed by property value validation callback cell.ColumnSpan = Math.Min(GetColumnSpan((Control)child), DefinitionsU.Count - cell.ColumnIndex); @@ -861,9 +718,7 @@ namespace Avalonia.Controls Debug.Assert(0 <= cell.ColumnIndex && cell.ColumnIndex < DefinitionsU.Count); Debug.Assert(0 <= cell.RowIndex && cell.RowIndex < DefinitionsV.Count); - // - // calculate and cache length types for the child - // + // Calculate and cache length types for the child. cell.SizeTypeU = GetLengthTypeForRange(DefinitionsU, cell.ColumnIndex, cell.ColumnSpan); cell.SizeTypeV = GetLengthTypeForRange(DefinitionsV, cell.RowIndex, cell.RowSpan); @@ -871,9 +726,7 @@ namespace Avalonia.Controls hasStarCellsU |= cell.IsStarU; hasStarCellsV |= cell.IsStarV; - // - // distribute cells into four groups. - // + // Distribute cells into four groups. if (!cell.IsStarV) { @@ -887,15 +740,15 @@ namespace Avalonia.Controls cell.Next = extData.CellGroup3; extData.CellGroup3 = i; - // remember if this cell belongs to auto row + // Remember if this cell belongs to auto row hasGroup3CellsInAutoRows |= cell.IsAutoV; } } else { - if ( cell.IsAutoU - // note below: if spans through Star column it is NOT Auto - && !cell.IsStarU ) + if (cell.IsAutoU + // Note below: if spans through Star column it is NOT Auto + && !cell.IsStarU) { cell.Next = extData.CellGroup2; extData.CellGroup2 = i; @@ -986,7 +839,7 @@ namespace Avalonia.Controls extData.DefinitionsV = new DefinitionBase[] { new RowDefinition() { Parent = this } }; } else - { + { extData.DefinitionsV = extData.RowDefinitions; } } @@ -1053,7 +906,7 @@ namespace Avalonia.Controls { double[] minSizes = isRows ? new double[DefinitionsV.Count] : new double[DefinitionsU.Count]; - for (int j=0; j (double)o ) + if (o == null + || value > (double)o) { store[key] = value; } @@ -1235,13 +1088,13 @@ namespace Avalonia.Controls int cell, bool forceInfinityV) { - + double cellMeasureWidth; double cellMeasureHeight; - if ( PrivateCells[cell].IsAutoU - && !PrivateCells[cell].IsStarU ) + if (PrivateCells[cell].IsAutoU + && !PrivateCells[cell].IsStarU) { // if cell belongs to at least one Auto column and not a single Star column // then it should be calculated "to content", thus it is possible to "shortcut" @@ -1261,8 +1114,8 @@ namespace Avalonia.Controls { cellMeasureHeight = double.PositiveInfinity; } - else if ( PrivateCells[cell].IsAutoV - && !PrivateCells[cell].IsStarV ) + else if (PrivateCells[cell].IsAutoV + && !PrivateCells[cell].IsStarV) { // if cell belongs to at least one Auto row and not a single Star row // then it should be calculated "to content", thus it is possible to "shortcut" @@ -1277,19 +1130,18 @@ namespace Avalonia.Controls PrivateCells[cell].RowSpan); } - + var child = this.Children[cell]; if (child != null) { Size childConstraint = new Size(cellMeasureWidth, cellMeasureHeight); child.Measure(childConstraint); } - - - } + } + /// /// Calculates one dimensional measure size for given definitions' range. /// @@ -1393,12 +1245,12 @@ namespace Avalonia.Controls // sanity check: no matter what, but min size must always be the smaller; // max size must be the biggest; and preferred should be in between - Debug.Assert( minSize <= preferredSize - && preferredSize <= maxSize - && rangeMinSize <= rangePreferredSize - && rangePreferredSize <= rangeMaxSize ); + Debug.Assert(minSize <= preferredSize + && preferredSize <= maxSize + && rangeMinSize <= rangePreferredSize + && rangePreferredSize <= rangeMaxSize); - if (maxMaxSize < maxSize) maxMaxSize = maxSize; + if (maxMaxSize < maxSize) maxMaxSize = maxSize; if (definitions[i].UserSize.IsAuto) autoDefinitionsCount++; tempDefinitions[i - start] = definitions[i]; } @@ -1492,8 +1344,8 @@ namespace Avalonia.Controls // double equalSize = requestedSize / count; - if ( equalSize < maxMaxSize - && !_AreClose(equalSize, maxMaxSize) ) + if (equalSize < maxMaxSize + && !_AreClose(equalSize, maxMaxSize)) { // equi-size is less than maximum of maxSizes. // in this case distribute so that smaller definitions grow faster than @@ -1502,12 +1354,12 @@ namespace Avalonia.Controls double sizeToDistribute = requestedSize - rangeMaxSize; // sanity check: totalRemainingSize and sizeToDistribute must be real positive numbers - Debug.Assert( !double.IsInfinity(totalRemainingSize) - && !double.IsNaN(totalRemainingSize) - && totalRemainingSize > 0 - && !double.IsInfinity(sizeToDistribute) - && !double.IsNaN(sizeToDistribute) - && sizeToDistribute > 0 ); + Debug.Assert(!double.IsInfinity(totalRemainingSize) + && !double.IsNaN(totalRemainingSize) + && totalRemainingSize > 0 + && !double.IsInfinity(sizeToDistribute) + && !double.IsNaN(sizeToDistribute) + && sizeToDistribute > 0); for (int i = 0; i < count; ++i) { @@ -1543,105 +1395,10 @@ namespace Avalonia.Controls IReadOnlyList definitions, double availableSize) { - // if (FrameworkAppContextSwitches.GridStarDefinitionsCanExceedAvailableSpace) - // { - // ResolveStarLegacy(definitions, availableSize); - // } - // else - // { - ResolveStarMaxDiscrepancy(definitions, availableSize); - // } - } - - // original implementation, used from 3.0 through 4.6.2 - private void ResolveStarLegacy( - IReadOnlyList definitions, - double availableSize) - { - DefinitionBase[] tempDefinitions = TempDefinitions; - int starDefinitionsCount = 0; - double takenSize = 0; - - for (int i = 0; i < definitions.Count; ++i) - { - switch (definitions[i].SizeType) - { - case (LayoutTimeSizeType.Auto): - takenSize += definitions[i].MinSize; - break; - case (LayoutTimeSizeType.Pixel): - takenSize += definitions[i].MeasureSize; - break; - case (LayoutTimeSizeType.Star): - { - tempDefinitions[starDefinitionsCount++] = definitions[i]; - - double starValue = definitions[i].UserSize.Value; - - if (_IsZero(starValue)) - { - definitions[i].MeasureSize = 0; - definitions[i].SizeCache = 0; - } - else - { - // clipping by c_starClip guarantees that sum of even a very big number of max'ed out star values - // can be summed up without overflow - starValue = Math.Min(starValue, c_starClip); - - // Note: normalized star value is temporary cached into MeasureSize - definitions[i].MeasureSize = starValue; - double maxSize = Math.Max(definitions[i].MinSize, definitions[i].UserMaxSize); - maxSize = Math.Min(maxSize, c_starClip); - definitions[i].SizeCache = maxSize / starValue; - } - } - break; - } - } - - if (starDefinitionsCount > 0) - { - Array.Sort(tempDefinitions, 0, starDefinitionsCount, s_starDistributionOrderComparer); - - // the 'do {} while' loop below calculates sum of star weights in order to avoid fp overflow... - // partial sum value is stored in each definition's SizeCache member. - // this way the algorithm guarantees (starValue <= definition.SizeCache) and thus - // (starValue / definition.SizeCache) will never overflow due to sum of star weights becoming zero. - // this is an important change from previous implementation where the following was possible: - // ((BigValueStar + SmallValueStar) - BigValueStar) resulting in 0... - double allStarWeights = 0; - int i = starDefinitionsCount - 1; - do - { - allStarWeights += tempDefinitions[i].MeasureSize; - tempDefinitions[i].SizeCache = allStarWeights; - } while (--i >= 0); - - i = 0; - do - { - double resolvedSize; - double starValue = tempDefinitions[i].MeasureSize; - - if (_IsZero(starValue)) - { - resolvedSize = tempDefinitions[i].MinSize; - } - else - { - double userSize = Math.Max(availableSize - takenSize, 0.0) * (starValue / tempDefinitions[i].SizeCache); - resolvedSize = Math.Min(userSize, tempDefinitions[i].UserMaxSize); - resolvedSize = Math.Max(tempDefinitions[i].MinSize, resolvedSize); - } - - tempDefinitions[i].MeasureSize = resolvedSize; - takenSize += resolvedSize; - } while (++i < starDefinitionsCount); - } + ResolveStarMaxDiscrepancy(definitions, availableSize); } - // new implementation as of 4.7. Several improvements: + // New implementation as of 4.7. Several improvements: // 1. Allocate to *-defs hitting their min or max constraints, before allocating // to other *-defs. A def that hits its min uses more space than its // proportional share, reducing the space available to everyone else. @@ -1668,7 +1425,7 @@ namespace Avalonia.Controls // Phase 1. Determine the maximum *-weight and prepare to adjust *-weights double maxStar = 0.0; - for (int i=0; i definitions, - double finalSize, - bool columns) - { - int starDefinitionsCount = 0; // traverses form the first entry up - int nonStarIndex = definitions.Count; // traverses from the last entry down - double allPreferredArrangeSize = 0; - bool useLayoutRounding = this.UseLayoutRounding; - int[] definitionIndices = DefinitionIndices; - double[] roundingErrors = null; - - // If using layout rounding, check whether rounding needs to compensate for high DPI - double dpi = 1.0; - - if (useLayoutRounding) - { - // DpiScale dpiScale = GetDpi(); - // dpi = columns ? dpiScale.DpiScaleX : dpiScale.DpiScaleY; - dpi = (VisualRoot as Layout.ILayoutRoot)?.LayoutScaling ?? 1.0; - roundingErrors = RoundingErrors; - } - - for (int i = 0; i < definitions.Count; ++i) - { - // if definition is shared then is cannot be star - Debug.Assert(!definitions[i].IsShared || !definitions[i].UserSize.IsStar); - - if (definitions[i].UserSize.IsStar) - { - double starValue = definitions[i].UserSize.Value; - - if (_IsZero(starValue)) - { - // cach normilized star value temporary into MeasureSize - definitions[i].MeasureSize = 0; - definitions[i].SizeCache = 0; - } - else - { - // clipping by c_starClip guarantees that sum of even a very big number of max'ed out star values - // can be summed up without overflow - starValue = Math.Min(starValue, c_starClip); - - // Note: normalized star value is temporary cached into MeasureSize - definitions[i].MeasureSize = starValue; - double maxSize = Math.Max(definitions[i].MinSizeForArrange, definitions[i].UserMaxSize); - maxSize = Math.Min(maxSize, c_starClip); - definitions[i].SizeCache = maxSize / starValue; - if (useLayoutRounding) - { - roundingErrors[i] = definitions[i].SizeCache; - definitions[i].SizeCache = MathUtilities.RoundLayoutValue(definitions[i].SizeCache, dpi); - } - } - definitionIndices[starDefinitionsCount++] = i; - } - else - { - double userSize = 0; - - switch (definitions[i].UserSize.GridUnitType) - { - case (GridUnitType.Pixel): - userSize = definitions[i].UserSize.Value; - break; - - case (GridUnitType.Auto): - userSize = definitions[i].MinSizeForArrange; - break; - } - - double userMaxSize; - - if (definitions[i].IsShared) - { - // overriding userMaxSize effectively prevents squishy-ness. - // this is a "solution" to avoid shared definitions from been sized to - // different final size at arrange time, if / when different grids receive - // different final sizes. - userMaxSize = userSize; - } - else - { - userMaxSize = definitions[i].UserMaxSize; - } - - definitions[i].SizeCache = Math.Max(definitions[i].MinSizeForArrange, Math.Min(userSize, userMaxSize)); - if (useLayoutRounding) - { - roundingErrors[i] = definitions[i].SizeCache; - definitions[i].SizeCache = MathUtilities.RoundLayoutValue(definitions[i].SizeCache, dpi); - } - - allPreferredArrangeSize += definitions[i].SizeCache; - definitionIndices[--nonStarIndex] = i; - } - } - - // indices should meet - Debug.Assert(nonStarIndex == starDefinitionsCount); - - if (starDefinitionsCount > 0) - { - StarDistributionOrderIndexComparer starDistributionOrderIndexComparer = new StarDistributionOrderIndexComparer(definitions); - Array.Sort(definitionIndices, 0, starDefinitionsCount, starDistributionOrderIndexComparer); - - // the 'do {} while' loop below calculates sum of star weights in order to avoid fp overflow... - // partial sum value is stored in each definition's SizeCache member. - // this way the algorithm guarantees (starValue <= definition.SizeCache) and thus - // (starValue / definition.SizeCache) will never overflow due to sum of star weights becoming zero. - // this is an important change from previous implementation where the following was possible: - // ((BigValueStar + SmallValueStar) - BigValueStar) resulting in 0... - double allStarWeights = 0; - int i = starDefinitionsCount - 1; - do - { - allStarWeights += definitions[definitionIndices[i]].MeasureSize; - definitions[definitionIndices[i]].SizeCache = allStarWeights; - } while (--i >= 0); - - i = 0; - do - { - double resolvedSize; - double starValue = definitions[definitionIndices[i]].MeasureSize; - - if (_IsZero(starValue)) - { - resolvedSize = definitions[definitionIndices[i]].MinSizeForArrange; - } - else - { - double userSize = Math.Max(finalSize - allPreferredArrangeSize, 0.0) * (starValue / definitions[definitionIndices[i]].SizeCache); - resolvedSize = Math.Min(userSize, definitions[definitionIndices[i]].UserMaxSize); - resolvedSize = Math.Max(definitions[definitionIndices[i]].MinSizeForArrange, resolvedSize); - } - - definitions[definitionIndices[i]].SizeCache = resolvedSize; - if (useLayoutRounding) - { - roundingErrors[definitionIndices[i]] = definitions[definitionIndices[i]].SizeCache; - definitions[definitionIndices[i]].SizeCache = MathUtilities.RoundLayoutValue(definitions[definitionIndices[i]].SizeCache, dpi); - } - - allPreferredArrangeSize += definitions[definitionIndices[i]].SizeCache; - } while (++i < starDefinitionsCount); - } - - if ( allPreferredArrangeSize > finalSize - && !_AreClose(allPreferredArrangeSize, finalSize) ) - { - DistributionOrderIndexComparer distributionOrderIndexComparer = new DistributionOrderIndexComparer(definitions); - Array.Sort(definitionIndices, 0, definitions.Count, distributionOrderIndexComparer); - double sizeToDistribute = finalSize - allPreferredArrangeSize; - - for (int i = 0; i < definitions.Count; ++i) - { - int definitionIndex = definitionIndices[i]; - double final = definitions[definitionIndex].SizeCache + (sizeToDistribute / (definitions.Count - i)); - double finalOld = final; - final = Math.Max(final, definitions[definitionIndex].MinSizeForArrange); - final = Math.Min(final, definitions[definitionIndex].SizeCache); - - if (useLayoutRounding) - { - roundingErrors[definitionIndex] = final; - final = MathUtilities.RoundLayoutValue(finalOld, dpi); - final = Math.Max(final, definitions[definitionIndex].MinSizeForArrange); - final = Math.Min(final, definitions[definitionIndex].SizeCache); - } - - sizeToDistribute -= (final - definitions[definitionIndex].SizeCache); - definitions[definitionIndex].SizeCache = final; - } - - allPreferredArrangeSize = finalSize - sizeToDistribute; - } - - if (useLayoutRounding) - { - if (!_AreClose(allPreferredArrangeSize, finalSize)) - { - // Compute deltas - for (int i = 0; i < definitions.Count; ++i) - { - roundingErrors[i] = roundingErrors[i] - definitions[i].SizeCache; - definitionIndices[i] = i; - } - - // Sort rounding errors - RoundingErrorIndexComparer roundingErrorIndexComparer = new RoundingErrorIndexComparer(roundingErrors); - Array.Sort(definitionIndices, 0, definitions.Count, roundingErrorIndexComparer); - double adjustedSize = allPreferredArrangeSize; - double dpiIncrement = MathUtilities.RoundLayoutValue(1.0, dpi); - - if (allPreferredArrangeSize > finalSize) - { - int i = definitions.Count - 1; - while ((adjustedSize > finalSize && !_AreClose(adjustedSize, finalSize)) && i >= 0) - { - DefinitionBase definition = definitions[definitionIndices[i]]; - double final = definition.SizeCache - dpiIncrement; - final = Math.Max(final, definition.MinSizeForArrange); - if (final < definition.SizeCache) - { - adjustedSize -= dpiIncrement; - } - definition.SizeCache = final; - i--; - } - } - else if (allPreferredArrangeSize < finalSize) - { - int i = 0; - while ((adjustedSize < finalSize && !_AreClose(adjustedSize, finalSize)) && i < definitions.Count) - { - DefinitionBase definition = definitions[definitionIndices[i]]; - double final = definition.SizeCache + dpiIncrement; - final = Math.Max(final, definition.MinSizeForArrange); - if (final > definition.SizeCache) - { - adjustedSize += dpiIncrement; - } - definition.SizeCache = final; - i++; - } - } - } - } - - definitions[0].FinalOffset = 0.0; - for (int i = 0; i < definitions.Count; ++i) - { - definitions[(i + 1) % definitions.Count].FinalOffset = definitions[i].FinalOffset + definitions[i].SizeCache; - } + SetFinalSizeMaxDiscrepancy(definitions, finalSize, columns); } // new implementation, as of 4.7. This incorporates the same algorithm @@ -2251,7 +1762,7 @@ namespace Avalonia.Controls // Phase 1. Determine the maximum *-weight and prepare to adjust *-weights double maxStar = 0.0; - for (int i=0; i finalSize) { @@ -2694,7 +2204,7 @@ namespace Avalonia.Controls /// if the max constraint has higher discrepancy /// null if proportion doesn't fail a min or max constraint /// The discrepancy is the ratio of the proportion to the max- or min-ratio. - /// When both ratios hit the constraint, minRatio < proportion > maxRatio, + /// When both ratios hit the constraint, minRatio < proportion < maxRatio, /// and the minRatio has higher discrepancy if /// (proportion / minRatio) > (maxRatio / proportion) /// @@ -2782,8 +2292,8 @@ namespace Avalonia.Controls ExtendedData extData = ExtData; if (extData != null) { -// for (int i = 0; i < PrivateColumnCount; ++i) DefinitionsU[i].SetValid (); -// for (int i = 0; i < PrivateRowCount; ++i) DefinitionsV[i].SetValid (); + // for (int i = 0; i < PrivateColumnCount; ++i) DefinitionsU[i].SetValid (); + // for (int i = 0; i < PrivateRowCount; ++i) DefinitionsV[i].SetValid (); if (extData.TempDefinitions != null) { @@ -2793,29 +2303,7 @@ namespace Avalonia.Controls } } } - - /// - /// Returns true if ColumnDefinitions collection is not empty - /// - public bool ShouldSerializeColumnDefinitions() - { - ExtendedData extData = ExtData; - return ( extData != null - && extData.ColumnDefinitions != null - && extData.ColumnDefinitions.Count > 0 ); - } - - /// - /// Returns true if RowDefinitions collection is not empty - /// - public bool ShouldSerializeRowDefinitions() - { - ExtendedData extData = ExtData; - return ( extData != null - && extData.RowDefinitions != null - && extData.RowDefinitions.Count > 0 ); - } - + /// /// Synchronized ShowGridLines property with the state of the grid's visual collection /// by adding / removing GridLinesRenderer visual. @@ -2872,25 +2360,19 @@ namespace Avalonia.Controls return (flags == 0 || (_flags & flags) != 0); } - /// - /// - /// private static void OnShowGridLinesPropertyChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e) { Grid grid = (Grid)d; - if ( grid.ExtData != null // trivial grid is 1 by 1. there is no grid lines anyway - && grid.ListenToNotifications) + if (grid.ExtData != null // trivial grid is 1 by 1. there is no grid lines anyway + && grid.ListenToNotifications) { grid.InvalidateVisual(); } - grid.SetFlags((bool) e.NewValue, Flags.ShowGridLinesPropertyValue); + grid.SetFlags((bool)e.NewValue, Flags.ShowGridLinesPropertyValue); } - /// - /// - /// private static void OnCellAttachedPropertyChanged(AvaloniaObject d, AvaloniaPropertyChangedEventArgs e) { Visual child = d as Visual; @@ -2898,36 +2380,20 @@ namespace Avalonia.Controls if (child != null) { Grid grid = child.GetVisualParent(); - if ( grid != null - && grid.ExtData != null - && grid.ListenToNotifications ) + if (grid != null + && grid.ExtData != null + && grid.ListenToNotifications) { grid.CellsStructureDirty = true; } } } - /* /// - /// - /// - private static bool IsIntValueNotNegative(object value) - { - return ((int)value >= 0); - } - - /// - /// - /// - private static bool IsIntValueGreaterThanZero(object value) - { - return ((int)value > 0); - }*/ - /// /// Helper for Comparer methods. /// /// - /// true iff one or both of x and y are null, in which case result holds + /// true if one or both of x and y are null, in which case result holds /// the relative sort order. /// private static bool CompareNullRefs(object x, object y, out int result) @@ -2956,12 +2422,6 @@ namespace Avalonia.Controls return (result != 2); } - //------------------------------------------------------ - // - // Private Properties - // - //------------------------------------------------------ - /// /// Private version returning array of column definitions. /// @@ -2988,8 +2448,8 @@ namespace Avalonia.Controls ExtendedData extData = ExtData; int requiredLength = Math.Max(DefinitionsU.Count, DefinitionsV.Count) * 2; - if ( extData.TempDefinitions == null - || extData.TempDefinitions.Length < requiredLength ) + if (extData.TempDefinitions == null + || extData.TempDefinitions.Length < requiredLength) { WeakReference tempDefinitionsWeakRef = (WeakReference)Thread.GetData(s_tempDefinitionsDataSlot); if (tempDefinitionsWeakRef == null) @@ -3000,8 +2460,8 @@ namespace Avalonia.Controls else { extData.TempDefinitions = (DefinitionBase[])tempDefinitionsWeakRef.Target; - if ( extData.TempDefinitions == null - || extData.TempDefinitions.Length < requiredLength ) + if (extData.TempDefinitions == null + || extData.TempDefinitions.Length < requiredLength) { extData.TempDefinitions = new DefinitionBase[requiredLength]; tempDefinitionsWeakRef.Target = extData.TempDefinitions; @@ -3129,7 +2589,7 @@ namespace Avalonia.Controls /// true if d == 0. private static bool _IsZero(double d) { - return (Math.Abs(d) < c_epsilon); + return (Math.Abs(d) < double.Epsilon); } /// @@ -3140,7 +2600,7 @@ namespace Avalonia.Controls /// true if d1 == d2 private static bool _AreClose(double d1, double d2) { - return (Math.Abs(d1 - d2) < c_epsilon); + return (Math.Abs(d1 - d2) < double.Epsilon); } /// @@ -3169,13 +2629,11 @@ namespace Avalonia.Controls } } - //------------------------------------------------------ - // - // Private Fields - // - //------------------------------------------------------ - private ExtendedData _data; // extended data instantiated on demand, for non-trivial case handling only - private Flags _flags; // grid validity / property caches dirtiness flags + // Extended data instantiated on demand, for non-trivial case handling only + private ExtendedData _data; + + // Grid validity / property caches dirtiness flags + private Flags _flags; private GridLinesRenderer _gridLinesRenderer; // Keeps track of definition indices. @@ -3184,29 +2642,16 @@ namespace Avalonia.Controls // Stores unrounded values and rounding errors during layout rounding. double[] _roundingErrors; - //------------------------------------------------------ - // - // Static Fields - // - //------------------------------------------------------ - private const double c_epsilon = 1e-5; // used in fp calculations - private const double c_starClip = 1e298; // used as maximum for clipping star values during normalization - private const int c_layoutLoopMaxCount = 5; // 5 is an arbitrary constant chosen to end the measure loop + // 5 is an arbitrary constant chosen to end the measure loop + private const int c_layoutLoopMaxCount = 5; + private static readonly LocalDataStoreSlot s_tempDefinitionsDataSlot = Thread.AllocateDataSlot(); private static readonly IComparer s_spanPreferredDistributionOrderComparer = new SpanPreferredDistributionOrderComparer(); private static readonly IComparer s_spanMaxDistributionOrderComparer = new SpanMaxDistributionOrderComparer(); - private static readonly IComparer s_starDistributionOrderComparer = new StarDistributionOrderComparer(); - private static readonly IComparer s_distributionOrderComparer = new DistributionOrderComparer(); private static readonly IComparer s_minRatioComparer = new MinRatioComparer(); private static readonly IComparer s_maxRatioComparer = new MaxRatioComparer(); private static readonly IComparer s_starWeightComparer = new StarWeightComparer(); - //------------------------------------------------------ - // - // Private Structures / Classes - // - //------------------------------------------------------ - /// /// Extended data instantiated on demand, when grid handles non-trivial case. /// @@ -3237,34 +2682,28 @@ namespace Avalonia.Controls // * Valid???Layout flags indicate that layout time portion of the information // stored on the objects should be updated. // - ValidDefinitionsUStructure = 0x00000001, - ValidDefinitionsVStructure = 0x00000002, - ValidCellsStructure = 0x00000004, + ValidDefinitionsUStructure = 0x00000001, + ValidDefinitionsVStructure = 0x00000002, + ValidCellsStructure = 0x00000004, // // boolean properties state // - ShowGridLinesPropertyValue = 0x00000100, // show grid lines ? + ShowGridLinesPropertyValue = 0x00000100, // show grid lines ? // // boolean flags // - ListenToNotifications = 0x00001000, // "0" when all notifications are ignored - SizeToContentU = 0x00002000, // "1" if calculating to content in U direction - SizeToContentV = 0x00004000, // "1" if calculating to content in V direction - HasStarCellsU = 0x00008000, // "1" if at least one cell belongs to a Star column - HasStarCellsV = 0x00010000, // "1" if at least one cell belongs to a Star row - HasGroup3CellsInAutoRows = 0x00020000, // "1" if at least one cell of group 3 belongs to an Auto row - MeasureOverrideInProgress = 0x00040000, // "1" while in the context of Grid.MeasureOverride - ArrangeOverrideInProgress = 0x00080000, // "1" while in the context of Grid.ArrangeOverride + ListenToNotifications = 0x00001000, // "0" when all notifications are ignored + SizeToContentU = 0x00002000, // "1" if calculating to content in U direction + SizeToContentV = 0x00004000, // "1" if calculating to content in V direction + HasStarCellsU = 0x00008000, // "1" if at least one cell belongs to a Star column + HasStarCellsV = 0x00010000, // "1" if at least one cell belongs to a Star row + HasGroup3CellsInAutoRows = 0x00020000, // "1" if at least one cell of group 3 belongs to an Auto row + MeasureOverrideInProgress = 0x00040000, // "1" while in the context of Grid.MeasureOverride + ArrangeOverrideInProgress = 0x00080000, // "1" while in the context of Grid.ArrangeOverride } - //------------------------------------------------------ - // - // Properties - // - //------------------------------------------------------ - /// /// ShowGridLines property. This property is used mostly /// for simplification of visual debuggig. When it is set @@ -3289,8 +2728,11 @@ namespace Avalonia.Controls AvaloniaProperty.RegisterAttached( "Column", defaultValue: 0, - validate: (_, v) => { if (v >= 0) return v; - else throw new ArgumentException("Invalid Grid.Column value."); }); + validate: (_, v) => + { + if (v >= 0) return v; + else throw new ArgumentException("Invalid Grid.Column value."); + }); /// /// Row property. This is an attached property. @@ -3307,8 +2749,11 @@ namespace Avalonia.Controls AvaloniaProperty.RegisterAttached( "Row", defaultValue: 0, - validate: (_, v) => { if (v >= 0) return v; - else throw new ArgumentException("Invalid Grid.Row value."); }); + validate: (_, v) => + { + if (v >= 0) return v; + else throw new ArgumentException("Invalid Grid.Row value."); + }); /// /// ColumnSpan property. This is an attached property. @@ -3324,8 +2769,11 @@ namespace Avalonia.Controls AvaloniaProperty.RegisterAttached( "ColumnSpan", defaultValue: 1, - validate: (_, v) => { if (v >= 1) return v; - else throw new ArgumentException("Invalid Grid.ColumnSpan value."); }); + validate: (_, v) => + { + if (v >= 1) return v; + else throw new ArgumentException("Invalid Grid.ColumnSpan value."); + }); /// /// RowSpan property. This is an attached property. @@ -3341,8 +2789,11 @@ namespace Avalonia.Controls AvaloniaProperty.RegisterAttached( "RowSpan", defaultValue: 1, - validate: (_, v) => { if (v >= 1) return v; - else throw new ArgumentException("Invalid Grid.RowSpan value."); }); + validate: (_, v) => + { + if (v >= 1) return v; + else throw new ArgumentException("Invalid Grid.RowSpan value."); + }); /// /// IsSharedSizeScope property marks scoping element for shared size. @@ -3351,30 +2802,18 @@ namespace Avalonia.Controls AvaloniaProperty.RegisterAttached( "IsSharedSizeScope"); - //------------------------------------------------------ - // - // Internal Structures / Classes - // - //------------------------------------------------------ - /// /// LayoutTimeSizeType is used internally and reflects layout-time size type. /// [System.Flags] internal enum LayoutTimeSizeType : byte { - None = 0x00, - Pixel = 0x01, - Auto = 0x02, - Star = 0x04, + None = 0x00, + Pixel = 0x01, + Auto = 0x02, + Star = 0x04, } - //------------------------------------------------------ - // - // Private Structures / Classes - // - //------------------------------------------------------ - /// /// CellCache stored calculated values of /// 1. attached cell positioning properties; @@ -3422,7 +2861,7 @@ namespace Avalonia.Controls int hash = (_start ^ (_count << 2)); if (_u) hash &= 0x7ffffff; - else hash |= 0x8000000; + else hash |= 0x8000000; return (hash); } @@ -3433,10 +2872,10 @@ namespace Avalonia.Controls public override bool Equals(object obj) { SpanKey sk = obj as SpanKey; - return ( sk != null - && sk._start == _start - && sk._count == _count - && sk._u == _u ); + return (sk != null + && sk._start == _start + && sk._count == _count + && sk._u == _u); } /// @@ -3544,51 +2983,6 @@ namespace Avalonia.Controls } } - /// - /// StarDistributionOrderComparer. - /// - private class StarDistributionOrderComparer : IComparer - { - public int Compare(object x, object y) - { - DefinitionBase definitionX = x as DefinitionBase; - DefinitionBase definitionY = y as DefinitionBase; - - int result; - - if (!CompareNullRefs(definitionX, definitionY, out result)) - { - result = definitionX.SizeCache.CompareTo(definitionY.SizeCache); - } - - return result; - } - } - - /// - /// DistributionOrderComparer. - /// - private class DistributionOrderComparer: IComparer - { - public int Compare(object x, object y) - { - DefinitionBase definitionX = x as DefinitionBase; - DefinitionBase definitionY = y as DefinitionBase; - - int result; - - if (!CompareNullRefs(definitionX, definitionY, out result)) - { - double xprime = definitionX.SizeCache - definitionX.MinSizeForArrange; - double yprime = definitionY.SizeCache - definitionY.MinSizeForArrange; - result = xprime.CompareTo(yprime); - } - - return result; - } - } - - /// /// StarDistributionOrderIndexComparer. /// @@ -3895,94 +3289,8 @@ namespace Avalonia.Controls } } - /* /// - /// Implementation of a simple enumerator of grid's logical children - /// - private class GridChildrenCollectionEnumeratorSimple : IEnumerator - { - internal GridChildrenCollectionEnumeratorSimple(Grid grid, bool includeChildren) - { - Debug.Assert(grid != null); - _currentEnumerator = -1; - _enumerator0 = new ColumnDefinitions.Enumerator(grid.ExtData != null ? grid.ExtData.ColumnDefinitions : null); - _enumerator1 = new RowDefinitions.Enumerator(grid.ExtData != null ? grid.ExtData.RowDefinitions : null); - // GridLineRenderer is NOT included into this enumerator. - _enumerator2Index = 0; - if (includeChildren) - { - _enumerator2Collection = grid.Children; - _enumerator2Count = _enumerator2Collection.Count; - } - else - { - _enumerator2Collection = null; - _enumerator2Count = 0; - } - } - - public bool MoveNext() - { - while (_currentEnumerator < 3) - { - if (_currentEnumerator >= 0) - { - switch (_currentEnumerator) - { - case (0): if (_enumerator0.MoveNext()) { _currentChild = _enumerator0.Current; return (true); } break; - case (1): if (_enumerator1.MoveNext()) { _currentChild = _enumerator1.Current; return (true); } break; - case (2): if (_enumerator2Index < _enumerator2Count) - { - _currentChild = _enumerator2Collection[_enumerator2Index]; - _enumerator2Index++; - return (true); - } - break; - } - } - _currentEnumerator++; - } - return (false); - } - - public Object Current - { - get - { - if (_currentEnumerator == -1) - { - throw new InvalidOperationException(SR.Get(SRID.EnumeratorNotStarted)); - } - if (_currentEnumerator >= 3) - { - throw new InvalidOperationException(SR.Get(SRID.EnumeratorReachedEnd)); - } - - // assert below is not true anymore since Controls allowes for null children - //Debug.Assert(_currentChild != null); - return (_currentChild); - } - } - - public void Reset() - { - _currentEnumerator = -1; - _currentChild = null; - _enumerator0.Reset(); - _enumerator1.Reset(); - _enumerator2Index = 0; - } - - private int _currentEnumerator; - private Object _currentChild; - private ColumnDefinitions.Enumerator _enumerator0; - private RowDefinitions.Enumerator _enumerator1; - private Controls _enumerator2Collection; - private int _enumerator2Index; - private int _enumerator2Count; - }*/ - /// - /// Helper to render grid lines. + /// Helper for rendering grid lines. /// internal class GridLinesRenderer : Control { @@ -3995,15 +3303,15 @@ namespace Avalonia.Controls var ds1 = new DashStyle(dashArray, 0); _oddDashPen = new Pen(Brushes.Blue, - _penWidth, - lineCap: PenLineCap.Flat, - dashStyle: ds1); + _penWidth, + lineCap: PenLineCap.Flat, + dashStyle: ds1); var ds2 = new DashStyle(dashArray, _dashLength); _evenDashPen = new Pen(Brushes.Yellow, - _penWidth, - lineCap: PenLineCap.Flat, - dashStyle: ds2); + _penWidth, + lineCap: PenLineCap.Flat, + dashStyle: ds2); } /// @@ -4052,7 +3360,6 @@ namespace Avalonia.Controls internal void UpdateRenderBounds(Size arrangeSize) { _lastArrangeSize = arrangeSize; - this.InvalidateMeasure(); this.InvalidateVisual(); } @@ -4061,6 +3368,6 @@ namespace Avalonia.Controls private const double _penWidth = 1.0; // private static readonly Pen _oddDashPen; // first pen to draw dash private static readonly Pen _evenDashPen; // second pen to draw dash - } + } } } diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs index 5f01c233b8..bd558af5ef 100644 --- a/src/Avalonia.Controls/MenuItem.cs +++ b/src/Avalonia.Controls/MenuItem.cs @@ -9,6 +9,7 @@ using Avalonia.Controls.Generators; using Avalonia.Controls.Mixins; using Avalonia.Controls.Primitives; using Avalonia.Controls.Templates; +using Avalonia.Data; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.LogicalTree; @@ -20,8 +21,6 @@ namespace Avalonia.Controls /// public class MenuItem : HeaderedSelectingItemsControl, IMenuItem, ISelectable { - private ICommand _command; - /// /// Defines the property. /// @@ -91,9 +90,8 @@ namespace Avalonia.Controls private static readonly ITemplate DefaultPanel = new FuncTemplate(() => new StackPanel()); - /// - /// The submenu popup. - /// + private ICommand _command; + private bool _commandCanExecute = true; private Popup _popup; /// @@ -231,6 +229,8 @@ namespace Avalonia.Controls /// IMenuElement IMenuItem.Parent => Parent as IMenuElement; + protected override bool IsEnabledCore => base.IsEnabledCore && _commandCanExecute; + /// bool IMenuElement.MoveSelection(NavigationDirection direction, bool wrap) => MoveSelection(direction, wrap); @@ -394,6 +394,22 @@ namespace Avalonia.Controls } } + protected override void UpdateDataValidation(AvaloniaProperty property, BindingNotification status) + { + base.UpdateDataValidation(property, status); + if (property == CommandProperty) + { + if (status?.ErrorType == BindingErrorType.Error) + { + if (_commandCanExecute) + { + _commandCanExecute = false; + UpdateIsEffectivelyEnabled(); + } + } + } + } + /// /// Closes all submenus of the menu item. /// @@ -437,9 +453,13 @@ namespace Avalonia.Controls /// The event args. private void CanExecuteChanged(object sender, EventArgs e) { - // HACK: Just set the IsEnabled property for the moment. This needs to be changed to - // use IsEnabledCore etc. but it will do for now. - IsEnabled = Command == null || Command.CanExecute(CommandParameter); + var canExecute = Command == null || Command.CanExecute(CommandParameter); + + if (canExecute != _commandCanExecute) + { + _commandCanExecute = canExecute; + UpdateIsEffectivelyEnabled(); + } } /// diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs index f72a65ead2..d11ce9a7ea 100644 --- a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs +++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs @@ -20,6 +20,8 @@ namespace Avalonia.Controls.Presenters /// internal class ItemVirtualizerSimple : ItemVirtualizer { + private int _anchor; + /// /// Initializes a new instance of the class. /// @@ -362,7 +364,10 @@ namespace Avalonia.Controls.Presenters if (panel.OverflowCount > 0) { - RemoveContainers(panel.OverflowCount); + if (_anchor <= FirstIndex) + { + RemoveContainers(panel.OverflowCount); + } } } @@ -540,7 +545,9 @@ namespace Avalonia.Controls.Presenters // it means we're running a unit test. if (container != null && layoutManager != null) { + _anchor = index; layoutManager.ExecuteLayoutPass(); + _anchor = -1; if (newOffset != -1 && newOffset != OffsetValue) { diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs index fbdf885709..b3345ec101 100644 --- a/src/Avalonia.Controls/Presenters/TextPresenter.cs +++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs @@ -19,6 +19,15 @@ namespace Avalonia.Controls.Presenters public static readonly StyledProperty PasswordCharProperty = AvaloniaProperty.Register(nameof(PasswordChar)); + public static readonly StyledProperty SelectionBrushProperty = + AvaloniaProperty.Register(nameof(SelectionBrushProperty)); + + public static readonly StyledProperty SelectionForegroundBrushProperty = + AvaloniaProperty.Register(nameof(SelectionForegroundBrushProperty)); + + public static readonly StyledProperty CaretBrushProperty = + AvaloniaProperty.Register(nameof(CaretBrushProperty)); + public static readonly DirectProperty SelectionStartProperty = TextBox.SelectionStartProperty.AddOwner( o => o.SelectionStart, @@ -34,11 +43,12 @@ namespace Avalonia.Controls.Presenters private int _selectionStart; private int _selectionEnd; private bool _caretBlink; - private IBrush _highlightBrush; - + static TextPresenter() { - AffectsRender(PasswordCharProperty); + AffectsRender(PasswordCharProperty, + SelectionBrushProperty, SelectionForegroundBrushProperty, + SelectionStartProperty, SelectionEndProperty); } public TextPresenter() @@ -79,6 +89,24 @@ namespace Avalonia.Controls.Presenters set => SetValue(PasswordCharProperty, value); } + public IBrush SelectionBrush + { + get => GetValue(SelectionBrushProperty); + set => SetValue(SelectionBrushProperty, value); + } + + public IBrush SelectionForegroundBrush + { + get => GetValue(SelectionForegroundBrushProperty); + set => SetValue(SelectionForegroundBrushProperty, value); + } + + public IBrush CaretBrush + { + get => GetValue(CaretBrushProperty); + set => SetValue(CaretBrushProperty, value); + } + public int SelectionStart { get @@ -129,14 +157,9 @@ namespace Avalonia.Controls.Presenters var rects = FormattedText.HitTestTextRange(start, length); - if (_highlightBrush == null) - { - _highlightBrush = (IBrush)this.FindResource("HighlightBrush"); - } - foreach (var rect in rects) { - context.FillRectangle(_highlightBrush, rect); + context.FillRectangle(SelectionBrush, rect); } } @@ -144,16 +167,21 @@ namespace Avalonia.Controls.Presenters if (selectionStart == selectionEnd) { - var backgroundColor = (((Control)TemplatedParent).GetValue(BackgroundProperty) as SolidColorBrush)?.Color; - var caretBrush = Brushes.Black; + var caretBrush = CaretBrush; - if (backgroundColor.HasValue) + if (caretBrush is null) { - byte red = (byte)~(backgroundColor.Value.R); - byte green = (byte)~(backgroundColor.Value.G); - byte blue = (byte)~(backgroundColor.Value.B); - - caretBrush = new SolidColorBrush(Color.FromRgb(red, green, blue)); + var backgroundColor = (((Control)TemplatedParent).GetValue(BackgroundProperty) as SolidColorBrush)?.Color; + if (backgroundColor.HasValue) + { + byte red = (byte)~(backgroundColor.Value.R); + byte green = (byte)~(backgroundColor.Value.G); + byte blue = (byte)~(backgroundColor.Value.B); + + caretBrush = new SolidColorBrush(Color.FromRgb(red, green, blue)); + } + else + caretBrush = Brushes.Black; } if (_caretBlink) @@ -252,7 +280,7 @@ namespace Avalonia.Controls.Presenters { result.Spans = new[] { - new FormattedTextStyleSpan(start, length, foregroundBrush: Brushes.White), + new FormattedTextStyleSpan(start, length, SelectionForegroundBrush), }; } diff --git a/src/Avalonia.Controls/Primitives/RangeBase.cs b/src/Avalonia.Controls/Primitives/RangeBase.cs index 76df94cdb8..ae175734b9 100644 --- a/src/Avalonia.Controls/Primitives/RangeBase.cs +++ b/src/Avalonia.Controls/Primitives/RangeBase.cs @@ -44,13 +44,13 @@ namespace Avalonia.Controls.Primitives /// Defines the property. /// public static readonly StyledProperty SmallChangeProperty = - AvaloniaProperty.Register(nameof(SmallChange), 0.1); + AvaloniaProperty.Register(nameof(SmallChange), 1); /// /// Defines the property. /// public static readonly StyledProperty LargeChangeProperty = - AvaloniaProperty.Register(nameof(LargeChange), 1); + AvaloniaProperty.Register(nameof(LargeChange), 10); private double _minimum; private double _maximum = 100.0; diff --git a/src/Avalonia.Controls/Primitives/ScrollBar.cs b/src/Avalonia.Controls/Primitives/ScrollBar.cs index f0d8c81808..e1b3061b54 100644 --- a/src/Avalonia.Controls/Primitives/ScrollBar.cs +++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs @@ -216,25 +216,25 @@ namespace Avalonia.Controls.Primitives private void SmallDecrement() { - Value = Math.Max(Value - SmallChange * ViewportSize, Minimum); + Value = Math.Max(Value - SmallChange, Minimum); OnScroll(ScrollEventType.SmallDecrement); } private void SmallIncrement() { - Value = Math.Min(Value + SmallChange * ViewportSize, Maximum); + Value = Math.Min(Value + SmallChange, Maximum); OnScroll(ScrollEventType.SmallIncrement); } private void LargeDecrement() { - Value = Math.Max(Value - LargeChange * ViewportSize, Minimum); + Value = Math.Max(Value - LargeChange, Minimum); OnScroll(ScrollEventType.LargeDecrement); } private void LargeIncrement() { - Value = Math.Min(Value + LargeChange * ViewportSize, Maximum); + Value = Math.Min(Value + LargeChange, Maximum); OnScroll(ScrollEventType.LargeIncrement); } diff --git a/src/Avalonia.Controls/RowDefinitions.cs b/src/Avalonia.Controls/RowDefinitions.cs index 3090844251..cf72cc8ba3 100644 --- a/src/Avalonia.Controls/RowDefinitions.cs +++ b/src/Avalonia.Controls/RowDefinitions.cs @@ -14,10 +14,8 @@ namespace Avalonia.Controls /// /// Initializes a new instance of the class. /// - public RowDefinitions() + public RowDefinitions() : base() { - ResetBehavior = ResetBehavior.Remove; - CollectionChanged += OnCollectionChanged; } /// diff --git a/src/Avalonia.Controls/Shapes/Ellipse.cs b/src/Avalonia.Controls/Shapes/Ellipse.cs index 8cb73bf5c6..f80bf5d967 100644 --- a/src/Avalonia.Controls/Shapes/Ellipse.cs +++ b/src/Avalonia.Controls/Shapes/Ellipse.cs @@ -14,7 +14,7 @@ namespace Avalonia.Controls.Shapes protected override Geometry CreateDefiningGeometry() { - var rect = new Rect(Bounds.Size).Deflate(StrokeThickness); + var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2); return new EllipseGeometry(rect); } diff --git a/src/Avalonia.Controls/Shapes/Rectangle.cs b/src/Avalonia.Controls/Shapes/Rectangle.cs index 375b0b719a..b803bde588 100644 --- a/src/Avalonia.Controls/Shapes/Rectangle.cs +++ b/src/Avalonia.Controls/Shapes/Rectangle.cs @@ -14,7 +14,7 @@ namespace Avalonia.Controls.Shapes protected override Geometry CreateDefiningGeometry() { - var rect = new Rect(Bounds.Size).Deflate(StrokeThickness); + var rect = new Rect(Bounds.Size).Deflate(StrokeThickness / 2); return new RectangleGeometry(rect); } diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs index 260c708515..bc4733296b 100644 --- a/src/Avalonia.Controls/Slider.cs +++ b/src/Avalonia.Controls/Slider.cs @@ -47,8 +47,6 @@ namespace Avalonia.Controls Thumb.DragStartedEvent.AddClassHandler(x => x.OnThumbDragStarted, RoutingStrategies.Bubble); Thumb.DragDeltaEvent.AddClassHandler(x => x.OnThumbDragDelta, RoutingStrategies.Bubble); Thumb.DragCompletedEvent.AddClassHandler(x => x.OnThumbDragCompleted, RoutingStrategies.Bubble); - SmallChangeProperty.OverrideDefaultValue(1); - LargeChangeProperty.OverrideDefaultValue(10); } /// diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs index d43957313e..7b4bb469d0 100644 --- a/src/Avalonia.Controls/TextBox.cs +++ b/src/Avalonia.Controls/TextBox.cs @@ -38,6 +38,15 @@ namespace Avalonia.Controls public static readonly StyledProperty PasswordCharProperty = AvaloniaProperty.Register(nameof(PasswordChar)); + public static readonly StyledProperty SelectionBrushProperty = + AvaloniaProperty.Register(nameof(SelectionBrushProperty)); + + public static readonly StyledProperty SelectionForegroundBrushProperty = + AvaloniaProperty.Register(nameof(SelectionForegroundBrushProperty)); + + public static readonly StyledProperty CaretBrushProperty = + AvaloniaProperty.Register(nameof(CaretBrushProperty)); + public static readonly DirectProperty SelectionStartProperty = AvaloniaProperty.RegisterDirect( nameof(SelectionStart), @@ -169,6 +178,24 @@ namespace Avalonia.Controls set => SetValue(PasswordCharProperty, value); } + public IBrush SelectionBrush + { + get => GetValue(SelectionBrushProperty); + set => SetValue(SelectionBrushProperty, value); + } + + public IBrush SelectionForegroundBrush + { + get => GetValue(SelectionForegroundBrushProperty); + set => SetValue(SelectionForegroundBrushProperty, value); + } + + public IBrush CaretBrush + { + get => GetValue(CaretBrushProperty); + set => SetValue(CaretBrushProperty, value); + } + public int SelectionStart { get @@ -287,16 +314,11 @@ namespace Avalonia.Controls { DecideCaretVisibility(); } - - e.Handled = true; } private void DecideCaretVisibility() { - if (!IsReadOnly) - _presenter?.ShowCaret(); - else - _presenter?.HideCaret(); + _presenter.ShowCaret(); } protected override void OnLostFocus(RoutedEventArgs e) @@ -456,7 +478,7 @@ namespace Avalonia.Controls movement = true; selection = false; handled = true; - + } else if (Match(keymap.MoveCursorToTheEndOfLine)) { @@ -485,7 +507,7 @@ namespace Avalonia.Controls movement = true; selection = true; handled = true; - + } else if (Match(keymap.MoveCursorToTheEndOfLineWithSelection)) { diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs index 801ed74ca0..a0e86a53b0 100644 --- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs +++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs @@ -9,7 +9,6 @@ using Avalonia.Remote.Protocol; using Avalonia.Remote.Protocol.Designer; using Avalonia.Remote.Protocol.Viewport; using Avalonia.Threading; -using Portable.Xaml; namespace Avalonia.DesignerSupport.Remote { @@ -206,7 +205,6 @@ namespace Avalonia.DesignerSupport.Remote } catch (Exception e) { - var xamlException = e as XamlException; var xmlException = e as XmlException; s_transport.Send(new UpdateXamlResultMessage @@ -216,8 +214,8 @@ namespace Avalonia.DesignerSupport.Remote { ExceptionType = e.GetType().FullName, Message = e.Message.ToString(), - LineNumber = xamlException?.LineNumber ?? xmlException?.LineNumber, - LinePosition = xamlException?.LinePosition ?? xmlException?.LinePosition, + LineNumber = xmlException?.LineNumber, + LinePosition = xmlException?.LinePosition, } }); } diff --git a/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs index 59c0f82414..7ece790310 100644 --- a/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs +++ b/src/Avalonia.Diagnostics/ViewModels/EventTreeNode.cs @@ -56,6 +56,7 @@ namespace Avalonia.Diagnostics.ViewModels { if (IsEnabled.GetValueOrDefault() && !_isRegistered) { + // FIXME: This leaks event handlers. _event.AddClassHandler(typeof(object), HandleEvent, (RoutingStrategies)7, handledEventsToo: true); _isRegistered = true; } diff --git a/src/Avalonia.Input/DragDropDevice.cs b/src/Avalonia.Input/DragDropDevice.cs index 0692b21c66..0b9f09b224 100644 --- a/src/Avalonia.Input/DragDropDevice.cs +++ b/src/Avalonia.Input/DragDropDevice.cs @@ -23,7 +23,13 @@ namespace Avalonia.Input { if (target == null) return DragDropEffects.None; - var args = new DragEventArgs(routedEvent, data, target, inputRoot.TranslatePoint(point, target), modifiers) + + var p = inputRoot.TranslatePoint(point, target); + + if (!p.HasValue) + return DragDropEffects.None; + + var args = new DragEventArgs(routedEvent, data, target, p.Value, modifiers) { RoutedEvent = routedEvent, DragEffects = operation @@ -108,4 +114,4 @@ namespace Avalonia.Input } } } -} \ No newline at end of file +} diff --git a/src/Avalonia.Input/DragEventArgs.cs b/src/Avalonia.Input/DragEventArgs.cs index 915ee4ee5c..dc0b76b225 100644 --- a/src/Avalonia.Input/DragEventArgs.cs +++ b/src/Avalonia.Input/DragEventArgs.cs @@ -26,8 +26,9 @@ namespace Avalonia.Input if (_target != null) { - point = _target.TranslatePoint(_targetLocation, relativeTo); + point = _target.TranslatePoint(_targetLocation, relativeTo) ?? point; } + return point; } @@ -41,4 +42,4 @@ namespace Avalonia.Input } } -} \ No newline at end of file +} diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs index 102da6efc4..80e18cb7bf 100644 --- a/src/Avalonia.Input/FocusManager.cs +++ b/src/Avalonia.Input/FocusManager.cs @@ -23,7 +23,7 @@ namespace Avalonia.Input /// /// Initializes a new instance of the class. /// - public FocusManager() + static FocusManager() { InputElement.PointerPressedEvent.AddClassHandler( typeof(IInputElement), @@ -146,7 +146,7 @@ namespace Avalonia.Input /// /// The element. /// True if the element can be focused. - private static bool CanFocus(IInputElement e) => e.Focusable && e.IsEnabledCore && e.IsVisible; + private static bool CanFocus(IInputElement e) => e.Focusable && e.IsEffectivelyEnabled && e.IsVisible; /// /// Gets the focus scope ancestors of the specified control, traversing popups. @@ -174,7 +174,7 @@ namespace Avalonia.Input /// /// The event sender. /// The event args. - private void OnPreviewPointerPressed(object sender, RoutedEventArgs e) + private static void OnPreviewPointerPressed(object sender, RoutedEventArgs e) { var ev = (PointerPressedEventArgs)e; @@ -191,7 +191,7 @@ namespace Avalonia.Input if (element != null) { - Focus(element, NavigationMethod.Pointer, ev.InputModifiers); + Instance?.Focus(element, NavigationMethod.Pointer, ev.InputModifiers); } } } diff --git a/src/Avalonia.Input/IInputElement.cs b/src/Avalonia.Input/IInputElement.cs index c9924dbffb..9247fb48a9 100644 --- a/src/Avalonia.Input/IInputElement.cs +++ b/src/Avalonia.Input/IInputElement.cs @@ -83,14 +83,14 @@ namespace Avalonia.Input Cursor Cursor { get; } /// - /// Gets a value indicating whether the control is effectively enabled for user interaction. + /// Gets a value indicating whether this control and all its parents are enabled. /// /// /// The property is used to toggle the enabled state for individual - /// controls. The property takes into account the + /// controls. The property takes into account the /// value of this control and its parent controls. /// - bool IsEnabledCore { get; } + bool IsEffectivelyEnabled { get; } /// /// Gets a value indicating whether the control is focused. diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs index 7c687f0d7e..4b4ab177b8 100644 --- a/src/Avalonia.Input/InputElement.cs +++ b/src/Avalonia.Input/InputElement.cs @@ -28,10 +28,12 @@ namespace Avalonia.Input AvaloniaProperty.Register(nameof(IsEnabled), true); /// - /// Defines the property. + /// Defines the property. /// - public static readonly StyledProperty IsEnabledCoreProperty = - AvaloniaProperty.Register(nameof(IsEnabledCore), true); + public static readonly DirectProperty IsEffectivelyEnabledProperty = + AvaloniaProperty.RegisterDirect( + nameof(IsEffectivelyEnabled), + o => o.IsEffectivelyEnabled); /// /// Gets or sets associated mouse cursor. @@ -155,6 +157,7 @@ namespace Avalonia.Input /// public static readonly RoutedEvent DoubleTappedEvent = Gestures.DoubleTappedEvent; + private bool _isEffectivelyEnabled = true; private bool _isFocused; private bool _isPointerOver; private GestureRecognizerCollection _gestureRecognizers; @@ -179,7 +182,7 @@ namespace Avalonia.Input PointerCaptureLostEvent.AddClassHandler(x => x.OnPointerCaptureLost); PointerWheelChangedEvent.AddClassHandler(x => x.OnPointerWheelChanged); - PseudoClass(IsEnabledCoreProperty, x => !x, ":disabled"); + PseudoClass(IsEffectivelyEnabledProperty, x => !x, ":disabled"); PseudoClass(IsFocusedProperty, ":focus"); PseudoClass(IsPointerOverProperty, ":pointerover"); } @@ -365,31 +368,25 @@ namespace Avalonia.Input internal set { SetAndRaise(IsPointerOverProperty, ref _isPointerOver, value); } } - /// - /// Gets a value indicating whether the control is effectively enabled for user interaction. - /// - /// - /// The property is used to toggle the enabled state for individual - /// controls. The property takes into account the - /// value of this control and its parent controls. - /// - bool IInputElement.IsEnabledCore => IsEnabledCore; + /// + public bool IsEffectivelyEnabled + { + get => _isEffectivelyEnabled; + private set => SetAndRaise(IsEffectivelyEnabledProperty, ref _isEffectivelyEnabled, value); + } + + public List KeyBindings { get; } = new List(); /// - /// Gets a value indicating whether the control is effectively enabled for user interaction. + /// Allows a derived class to override the enabled state of the control. /// /// - /// The property is used to toggle the enabled state for individual - /// controls. The property takes into account the - /// value of this control and its parent controls. + /// Derived controls may wish to disable the enabled state of the control without overwriting the + /// user-supplied setting. This can be done by overriding this property + /// to return the overridden enabled state. If the value returned from + /// should change, then the derived control should call . /// - protected bool IsEnabledCore - { - get { return GetValue(IsEnabledCoreProperty); } - set { SetValue(IsEnabledCoreProperty, value); } - } - - public List KeyBindings { get; } = new List(); + protected virtual bool IsEnabledCore => IsEnabled; public GestureRecognizerCollection GestureRecognizers => _gestureRecognizers ?? (_gestureRecognizers = new GestureRecognizerCollection(this)); @@ -417,7 +414,7 @@ namespace Avalonia.Input protected override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e) { base.OnAttachedToVisualTreeCore(e); - UpdateIsEnabledCore(); + UpdateIsEffectivelyEnabled(); } /// @@ -525,9 +522,18 @@ namespace Avalonia.Input { } + /// + /// Updates the property value according to the parent + /// control's enabled state and . + /// + protected void UpdateIsEffectivelyEnabled() + { + UpdateIsEffectivelyEnabled(this.GetVisualParent()); + } + private static void IsEnabledChanged(AvaloniaPropertyChangedEventArgs e) { - ((InputElement)e.Sender).UpdateIsEnabledCore(); + ((InputElement)e.Sender).UpdateIsEffectivelyEnabled(); } /// @@ -551,32 +557,17 @@ namespace Avalonia.Input } /// - /// Updates the property value. - /// - private void UpdateIsEnabledCore() - { - UpdateIsEnabledCore(this.GetVisualParent()); - } - - /// - /// Updates the property based on the parent's - /// . + /// Updates the property based on the parent's + /// . /// /// The parent control. - private void UpdateIsEnabledCore(InputElement parent) + private void UpdateIsEffectivelyEnabled(InputElement parent) { - if (parent != null) - { - IsEnabledCore = IsEnabled && parent.IsEnabledCore; - } - else - { - IsEnabledCore = IsEnabled; - } + IsEffectivelyEnabled = IsEnabledCore && (parent?.IsEffectivelyEnabled ?? true); foreach (var child in this.GetVisualChildren().OfType()) { - child.UpdateIsEnabledCore(this); + child.UpdateIsEffectivelyEnabled(this); } } } diff --git a/src/Avalonia.Input/InputExtensions.cs b/src/Avalonia.Input/InputExtensions.cs index f184e41998..c1d0729560 100644 --- a/src/Avalonia.Input/InputExtensions.cs +++ b/src/Avalonia.Input/InputExtensions.cs @@ -45,7 +45,7 @@ namespace Avalonia.Input return element != null && element.IsVisible && element.IsHitTestVisible && - element.IsEnabledCore && + element.IsEffectivelyEnabled && element.IsAttachedToVisualTree; } } diff --git a/src/Avalonia.Input/Navigation/FocusExtensions.cs b/src/Avalonia.Input/Navigation/FocusExtensions.cs index 41e7c4cd7b..794dc63f84 100644 --- a/src/Avalonia.Input/Navigation/FocusExtensions.cs +++ b/src/Avalonia.Input/Navigation/FocusExtensions.cs @@ -13,13 +13,13 @@ namespace Avalonia.Input.Navigation /// /// The element. /// True if the element can be focused. - public static bool CanFocus(this IInputElement e) => e.Focusable && e.IsEnabledCore && e.IsVisible; + public static bool CanFocus(this IInputElement e) => e.Focusable && e.IsEffectivelyEnabled && e.IsVisible; /// /// Checks if descendants of the specified element can be focused. /// /// The element. /// True if descendants of the element can be focused. - public static bool CanFocusDescendants(this IInputElement e) => e.IsEnabledCore && e.IsVisible; + public static bool CanFocusDescendants(this IInputElement e) => e.IsEffectivelyEnabled && e.IsVisible; } } diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index c8ee73ad5d..35e50b1b36 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -1,4 +1,4 @@ - + false @@ -7,8 +7,6 @@ /usr/bin/castxml /usr/local/bin/castxml true - - $(MSBuildThisFileDirectory)/Generated diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml index 8f7d56dbc6..0ed17fae76 100644 --- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml +++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml @@ -22,6 +22,7 @@ #FF808080 #FF119EDA + #FFFFFFFF #FFFF0000 #10FF0000 @@ -39,6 +40,7 @@ + diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml index 666596d710..3a8a8ec446 100644 --- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml +++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml @@ -22,6 +22,7 @@ #FF808080 #FF086F9E + #FFFFFFFF #FFFF0000 #10FF0000 @@ -39,6 +40,7 @@ + diff --git a/src/Avalonia.Themes.Default/Button.xaml b/src/Avalonia.Themes.Default/Button.xaml index 698ddec2a8..6ed1f6d8fc 100644 --- a/src/Avalonia.Themes.Default/Button.xaml +++ b/src/Avalonia.Themes.Default/Button.xaml @@ -22,13 +22,13 @@ - - - \ No newline at end of file + diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml index 6741bdc7d9..ec1f6e9e7d 100644 --- a/src/Avalonia.Themes.Default/TextBox.xaml +++ b/src/Avalonia.Themes.Default/TextBox.xaml @@ -3,6 +3,8 @@ + + @@ -44,7 +46,10 @@ SelectionEnd="{TemplateBinding SelectionEnd}" TextAlignment="{TemplateBinding TextAlignment}" TextWrapping="{TemplateBinding TextWrapping}" - PasswordChar="{TemplateBinding PasswordChar}"/> + PasswordChar="{TemplateBinding PasswordChar}" + SelectionBrush="{TemplateBinding SelectionBrush}" + SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" + CaretBrush="{TemplateBinding CaretBrush}"/> diff --git a/src/Avalonia.Themes.Default/ToggleButton.xaml b/src/Avalonia.Themes.Default/ToggleButton.xaml index 9e05c38eef..41f366fdf9 100644 --- a/src/Avalonia.Themes.Default/ToggleButton.xaml +++ b/src/Avalonia.Themes.Default/ToggleButton.xaml @@ -22,17 +22,17 @@ - - - - \ No newline at end of file + diff --git a/src/Avalonia.Visuals/Rect.cs b/src/Avalonia.Visuals/Rect.cs index 530a47729f..49d4724b9a 100644 --- a/src/Avalonia.Visuals/Rect.cs +++ b/src/Avalonia.Visuals/Rect.cs @@ -256,7 +256,7 @@ namespace Avalonia /// /// Inflates the rectangle. /// - /// The thickness. + /// The thickness to be subtracted for each side of the rectangle. /// The inflated rectangle. public Rect Inflate(double thickness) { @@ -266,7 +266,7 @@ namespace Avalonia /// /// Inflates the rectangle. /// - /// The thickness. + /// The thickness to be subtracted for each side of the rectangle. /// The inflated rectangle. public Rect Inflate(Thickness thickness) { @@ -278,20 +278,18 @@ namespace Avalonia /// /// Deflates the rectangle. /// - /// The thickness. + /// The thickness to be subtracted for each side of the rectangle. /// The deflated rectangle. - /// The deflated rectangle size cannot be less than 0. public Rect Deflate(double thickness) { - return Deflate(new Thickness(thickness / 2)); + return Deflate(new Thickness(thickness)); } /// /// Deflates the rectangle by a . /// - /// The thickness. + /// The thickness to be subtracted for each side of the rectangle. /// The deflated rectangle. - /// The deflated rectangle size cannot be less than 0. public Rect Deflate(Thickness thickness) { return new Rect( diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs index 33cc39cbe3..c622dc8a43 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs @@ -105,8 +105,28 @@ namespace Avalonia.Rendering.SceneGraph } } - // TODO: This doesn't respect CornerRadius yet. /// - public override bool HitTest(Point p) => Bounds.Contains(p); + public override bool HitTest(Point p) + { + // TODO: This doesn't respect CornerRadius yet. + if (Transform.HasInverse) + { + p *= Transform.Invert(); + + if (Brush != null) + { + var rect = Rect.Inflate((Pen?.Thickness / 2) ?? 0); + return rect.Contains(p); + } + else + { + var borderRect = Rect.Inflate((Pen?.Thickness / 2) ?? 0); + var emptyRect = Rect.Deflate((Pen?.Thickness / 2) ?? 0); + return borderRect.Contains(p) && !emptyRect.Contains(p); + } + } + + return false; + } } } diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs index ad4c475d89..1afc096c98 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs @@ -173,7 +173,7 @@ namespace Avalonia.Rendering.SceneGraph if (node.GeometryClip != null) { var controlPoint = Root.Visual.TranslatePoint(p, node.Visual); - clipped = !node.GeometryClip.FillContains(controlPoint); + clipped = !node.GeometryClip.FillContains(controlPoint.Value); } if (!clipped) diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs index d294f111ad..9e088cb136 100644 --- a/src/Avalonia.Visuals/Visual.cs +++ b/src/Avalonia.Visuals/Visual.cs @@ -291,29 +291,6 @@ namespace Avalonia Contract.Requires(context != null); } - /// - /// Returns a transform that transforms the visual's coordinates into the coordinates - /// of the specified . - /// - /// The visual to translate the coordinates to. - /// - /// A containing the transform or null if the visuals don't share a - /// common ancestor. - /// - public Matrix? TransformToVisual(IVisual visual) - { - var common = this.FindCommonVisualAncestor(visual); - - if (common != null) - { - var thisOffset = GetOffsetFrom(common, this); - var thatOffset = GetOffsetFrom(common, visual); - return -thatOffset * thisOffset; - } - - return null; - } - /// /// Indicates that a property change should cause to be /// called. @@ -480,45 +457,6 @@ namespace Avalonia } } - /// - /// Gets the visual offset from the specified ancestor. - /// - /// The ancestor visual. - /// The visual. - /// The visual offset. - private static Matrix GetOffsetFrom(IVisual ancestor, IVisual visual) - { - var result = Matrix.Identity; - - while (visual != ancestor) - { - if (visual.RenderTransform?.Value != null) - { - var origin = visual.RenderTransformOrigin.ToPixels(visual.Bounds.Size); - var offset = Matrix.CreateTranslation(origin); - var renderTransform = (-offset) * visual.RenderTransform.Value * (offset); - - result *= renderTransform; - } - - var topLeft = visual.Bounds.TopLeft; - - if (topLeft != default) - { - result *= Matrix.CreateTranslation(topLeft); - } - - visual = visual.VisualParent; - - if (visual == null) - { - throw new ArgumentException("'visual' is not a descendant of 'ancestor'."); - } - } - - return result; - } - /// /// Called when a visual's changes. /// diff --git a/src/Avalonia.Visuals/VisualExtensions.cs b/src/Avalonia.Visuals/VisualExtensions.cs index 650921a985..b191d044db 100644 --- a/src/Avalonia.Visuals/VisualExtensions.cs +++ b/src/Avalonia.Visuals/VisualExtensions.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; -using Avalonia.Rendering; using Avalonia.VisualTree; namespace Avalonia @@ -20,10 +19,8 @@ namespace Avalonia /// The point in client coordinates. public static Point PointToClient(this IVisual visual, PixelPoint point) { - var (root, offset) = GetRootAndPosition(visual); - var screenOffset = PixelPoint.FromPoint((Point)offset, root.RenderScaling); - var screenPoint = new PixelPoint(point.X - screenOffset.X, point.Y - screenOffset.Y); - return root.PointToClient(screenPoint); + var rootPoint = visual.VisualRoot.PointToClient(point); + return visual.VisualRoot.TranslatePoint(rootPoint, visual).Value; } /// @@ -34,48 +31,93 @@ namespace Avalonia /// The point in screen coordinates. public static PixelPoint PointToScreen(this IVisual visual, Point point) { - var p = GetRootAndPosition(visual); - return p.Item1.PointToScreen(point + p.Item2); + var p = visual.TranslatePoint(point, visual.VisualRoot); + return visual.VisualRoot.PointToScreen(p.Value); + } + + /// + /// Returns a transform that transforms the visual's coordinates into the coordinates + /// of the specified . + /// + /// The visual whose coordinates are to be transformed. + /// The visual to translate the coordinates to. + /// + /// A containing the transform or null if the visuals don't share a + /// common ancestor. + /// + public static Matrix? TransformToVisual(this IVisual from, IVisual to) + { + var common = from.FindCommonVisualAncestor(to); + + if (common != null) + { + var thisOffset = GetOffsetFrom(common, from); + var thatOffset = GetOffsetFrom(common, to); + return -thatOffset * thisOffset; + } + + return null; } /// /// Translates a point relative to this visual to coordinates that are relative to the specified visual. - /// The visual and relativeTo should be descendants of the same root window /// /// The visual. /// The point value, as relative to this visual. /// The visual to translate the given point into. - /// A point value, now relative to the target visual rather than this source element. - public static Point TranslatePoint(this IVisual visual, Point point, IVisual relativeTo) + /// + /// A point value, now relative to the target visual rather than this source element, or null if the + /// two elements have no common ancestor. + /// + public static Point? TranslatePoint(this IVisual visual, Point point, IVisual relativeTo) { - var pos = GetRootAndPosition(visual); - var relToPos = GetRootAndPosition(relativeTo); + var transform = visual.TransformToVisual(relativeTo); - return point - (relToPos.Item2 - pos.Item2); + if (transform.HasValue) + { + return point.Transform(transform.Value); + } + + return null; } /// - /// Gets the root of the control's visual tree and the position of the control - /// in the root's coordinate space. + /// Gets a transform from an ancestor to a descendent. /// - /// The visual. - /// A tuple containing the root and the position of the control. - private static Tuple GetRootAndPosition(IVisual v) + /// The ancestor visual. + /// The visual. + /// The transform. + private static Matrix GetOffsetFrom(IVisual ancestor, IVisual visual) { - var result = new Vector(); + var result = Matrix.Identity; - while (!(v is IRenderRoot)) + while (visual != ancestor) { - result = new Vector(result.X + v.Bounds.X, result.Y + v.Bounds.Y); - v = v.VisualParent; + if (visual.RenderTransform?.Value != null) + { + var origin = visual.RenderTransformOrigin.ToPixels(visual.Bounds.Size); + var offset = Matrix.CreateTranslation(origin); + var renderTransform = (-offset) * visual.RenderTransform.Value * (offset); + + result *= renderTransform; + } + + var topLeft = visual.Bounds.TopLeft; + + if (topLeft != default) + { + result *= Matrix.CreateTranslation(topLeft); + } + + visual = visual.VisualParent; - if (v == null) + if (visual == null) { - throw new InvalidOperationException("Control is not attached to visual tree."); + throw new ArgumentException("'visual' is not a descendant of 'ancestor'."); } } - return Tuple.Create((IRenderRoot)v, result); + return result; } } } diff --git a/src/Avalonia.Visuals/VisualTree/IVisual.cs b/src/Avalonia.Visuals/VisualTree/IVisual.cs index 278a802597..dd3686ce3d 100644 --- a/src/Avalonia.Visuals/VisualTree/IVisual.cs +++ b/src/Avalonia.Visuals/VisualTree/IVisual.cs @@ -116,16 +116,5 @@ namespace Avalonia.VisualTree /// /// The context. void Render(DrawingContext context); - - /// - /// Returns a transform that transforms the visual's coordinates into the coordinates - /// of the specified . - /// - /// The visual to translate the coordinates to. - /// - /// A containing the transform or null if the visuals don't share a - /// common ancestor. - /// - Matrix? TransformToVisual(IVisual visual); } } diff --git a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs index 2d417852fe..567b676b1e 100644 --- a/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs +++ b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs @@ -132,8 +132,14 @@ namespace Avalonia.VisualTree Contract.Requires(visual != null); var root = visual.GetVisualRoot(); - p = visual.TranslatePoint(p, root); - return root.Renderer.HitTest(p, visual, filter); + var rootPoint = visual.TranslatePoint(p, root); + + if (rootPoint.HasValue) + { + return root.Renderer.HitTest(rootPoint.Value, visual, filter); + } + + return Enumerable.Empty(); } /// diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 8ce29e5b8e..6f3dabd568 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -11,38 +11,22 @@ - - - - + - - - - - - - - - - - - - @@ -52,7 +36,6 @@ - @@ -76,11 +59,11 @@ - + diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs deleted file mode 100644 index f967bdf0af..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.ComponentModel; -using System.Collections.Generic; -using System.Globalization; -using Avalonia.Collections; -using Avalonia.Controls; -using Avalonia.Markup.Xaml.Converters; -using Avalonia.Media.Imaging; -using Avalonia.Styling; -using Avalonia.Controls.Templates; - -namespace Avalonia.Markup.Xaml -{ - using System.Reflection; - using Avalonia.Media; - - /// - /// Maintains a repository of s for XAML parsing on top of those - /// maintained by . - /// - /// - /// The default method of defining type converters using - /// isn't powerful enough for our purposes: - /// - /// - It doesn't handle non-constructed generic types (such as ) - /// - Type converters which require XAML features cannot be defined in non-XAML assemblies and - /// so can't be referenced using - /// - Many types have a static `Parse(string)` method which can be used implicitly; this class - /// detects such methods and auto-creates a type converter - /// - public static class AvaloniaTypeConverters - { - // When adding item to that list make sure to modify AvaloniaXamlIlLanguage - private static Dictionary _converters = new Dictionary() - { - { typeof(AvaloniaList<>), typeof(AvaloniaListConverter<>) }, - { typeof(AvaloniaProperty), typeof(AvaloniaPropertyTypeConverter) }, - { typeof(IBitmap), typeof(BitmapTypeConverter) }, - { typeof(IList), typeof(PointsListTypeConverter) }, - { typeof(IMemberSelector), typeof(MemberSelectorTypeConverter) }, - { typeof(Selector), typeof(SelectorTypeConverter) }, - { typeof(TimeSpan), typeof(TimeSpanTypeConverter) }, - { typeof(WindowIcon), typeof(IconTypeConverter) }, - { typeof(CultureInfo), typeof(CultureInfoConverter) }, - { typeof(Uri), typeof(AvaloniaUriTypeConverter) }, - { typeof(FontFamily), typeof(FontFamilyTypeConverter) }, - { typeof(EventInfo), typeof(AvaloniaEventConverter) }, - }; - - internal static Type GetBuiltinTypeConverter(Type type) - { - _converters.TryGetValue(type, out var result); - return result; - } - - /// - /// Tries to lookup a for a type. - /// - /// The type. - /// The type converter. - public static Type GetTypeConverter(Type type) - { - if (type.IsConstructedGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>)) - { - var inner = GetTypeConverter(type.GetGenericArguments()[0]); - if (inner == null) - return null; - return typeof(NullableTypeConverter<>).MakeGenericType(inner); - } - - if (_converters.TryGetValue(type, out var result)) - { - return result; - } - - // Converters for non-constructed generic types can't be specified using - // TypeConverterAttribute. Allow them to be registered here and handle them sanely. - if (type.IsConstructedGenericType && - _converters.TryGetValue(type.GetGenericTypeDefinition(), out result)) - { - return result?.MakeGenericType(type.GetGenericArguments()); - } - - // If the type isn't a primitive or a type that XAML already handles, but has a static - // Parse method, use that - if (!type.IsPrimitive && - type != typeof(DateTime) && - type != typeof(Uri) && - ParseTypeConverter.HasParseMethod(type)) - { - result = typeof(ParseTypeConverter<>).MakeGenericType(type); - _converters.Add(type, result); - return result; - } - - _converters.Add(type, null); - return null; - } - - /// - /// Registers a type converter for a type. - /// - /// The type. Maybe be a non-constructed generic type. - /// The converter type. Maybe be a non-constructed generic type. - public static void Register(Type type, Type converterType) => _converters[type] = converterType; - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs index 45424e67bb..e8f2439f46 100644 --- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs +++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs @@ -15,7 +15,6 @@ using Avalonia.Controls; using Avalonia.Markup.Data; using Avalonia.Markup.Xaml.PortableXaml; using Avalonia.Platform; -using Portable.Xaml; namespace Avalonia.Markup.Xaml { @@ -26,71 +25,14 @@ namespace Avalonia.Markup.Xaml { public bool IsDesignMode { get; set; } - public static bool UseLegacyXamlLoader { get; set; } = false; - - /// - /// Initializes a new instance of the class. - /// - public AvaloniaXamlLoader() - { - } - /// /// Loads the XAML into a Avalonia component. /// /// The object to load the XAML into. public static void Load(object obj) { - Contract.Requires(obj != null); - - var loader = new AvaloniaXamlLoader(); - loader.Load(obj.GetType(), obj); - } - - /// - /// Loads the XAML for a type. - /// - /// The type. - /// - /// The optional instance into which the XAML should be loaded. - /// - /// The loaded object. - public object Load(Type type, object rootInstance = null) - { - Contract.Requires(type != null); - - // HACK: Currently Visual Studio is forcing us to change the extension of xaml files - // in certain situations, so we try to load .xaml and if that's not found we try .xaml. - // Ideally we'd be able to use .xaml everywhere - var assetLocator = AvaloniaLocator.Current.GetService(); - - if (assetLocator == null) - { - throw new InvalidOperationException( - "Could not create IAssetLoader : maybe Application.RegisterServices() wasn't called?"); - } - - foreach (var uri in GetUrisFor(assetLocator, type)) - { - if (assetLocator.Exists(uri)) - { - using (var stream = assetLocator.Open(uri)) - { - var initialize = rootInstance as ISupportInitialize; - initialize?.BeginInit(); - try - { - return Load(stream, type.Assembly, rootInstance, uri); - } - finally - { - initialize?.EndInit(); - } - } - } - } - - throw new FileNotFoundException("Unable to find view for " + type.FullName); + throw new XamlLoadException( + $"No precompiled XAML found for {obj.GetType()}, make sure to specify x:Class and include your XAML file as AvaloniaResource"); } /// @@ -100,11 +42,8 @@ namespace Avalonia.Markup.Xaml /// /// A base URI to use if is relative. /// - /// - /// The optional instance into which the XAML should be loaded. - /// /// The loaded object. - public object Load(Uri uri, Uri baseUri = null, object rootInstance = null) + public object Load(Uri uri, Uri baseUri = null) { Contract.Requires(uri != null); @@ -133,7 +72,7 @@ namespace Avalonia.Markup.Xaml using (var stream = asset.stream) { var absoluteUri = uri.IsAbsoluteUri ? uri : new Uri(baseUri, uri); - return Load(stream, asset.assembly, rootInstance, absoluteUri); + return Load(stream, asset.assembly, null, absoluteUri); } } @@ -166,95 +105,9 @@ namespace Avalonia.Markup.Xaml /// /// The URI of the XAML /// The loaded object. - public object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null) - { - if (!UseLegacyXamlLoader) - return AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri, IsDesignMode); - - - var readerSettings = new XamlXmlReaderSettings() - { - BaseUri = uri, - LocalAssembly = localAssembly, - ProvideLineInfo = true, - }; - - var context = IsDesignMode ? AvaloniaXamlSchemaContext.DesignInstance : AvaloniaXamlSchemaContext.Instance; - var reader = new XamlXmlReader(stream, context, readerSettings); - - object result = LoadFromReader( - reader, - AvaloniaXamlContext.For(readerSettings, rootInstance)); - - var topLevel = result as TopLevel; - - if (topLevel != null) - { - DelayedBinding.ApplyBindings(topLevel); - } - - return result; - } - - internal static object LoadFromReader(XamlReader reader, AvaloniaXamlContext context = null, IAmbientProvider parentAmbientProvider = null) - { - var writer = AvaloniaXamlObjectWriter.Create( - (AvaloniaXamlSchemaContext)reader.SchemaContext, - context, - parentAmbientProvider); + public object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null) + => AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri, IsDesignMode); - XamlServices.Transform(reader, writer); - writer.ApplyAllDelayedProperties(); - return writer.Result; - } - - internal static object LoadFromReader(XamlReader reader) - { - //return XamlServices.Load(reader); - return LoadFromReader(reader, null); - } - - - private static readonly DataContractSerializer s_xamlInfoSerializer = - new DataContractSerializer(typeof(AvaloniaResourceXamlInfo)); - /// - /// Gets the URI for a type. - /// - /// - /// The type. - /// The URI. - private static IEnumerable GetUrisFor(IAssetLoader assetLocator, Type type) - { - var asm = type.GetTypeInfo().Assembly.GetName().Name; - var xamlInfoUri = new Uri($"avares://{asm}/!AvaloniaResourceXamlInfo"); - var typeName = type.FullName; - if (typeName == null) - throw new ArgumentException("Type doesn't have a FullName"); - - if (assetLocator.Exists(xamlInfoUri)) - { - using (var xamlInfoStream = assetLocator.Open(xamlInfoUri)) - { - var assetDoc = XDocument.Load(xamlInfoStream); - XNamespace assetNs = assetDoc.Root.Attribute("xmlns").Value; - XNamespace arrayNs = "http://schemas.microsoft.com/2003/10/Serialization/Arrays"; - Dictionary xamlInfo = - assetDoc.Root.Element(assetNs + "ClassToResourcePathIndex").Elements(arrayNs + "KeyValueOfstringstring") - .ToDictionary(entry =>entry.Element(arrayNs + "Key").Value, - entry => entry.Element(arrayNs + "Value").Value); - - if (xamlInfo.TryGetValue(typeName, out var rv)) - { - yield return new Uri($"avares://{asm}{rv}"); - yield break; - } - } - } - - yield return new Uri("resm:" + typeName + ".xaml?assembly=" + asm); - yield return new Uri("resm:" + typeName + ".paml?assembly=" + asm); - } - public static object Parse(string xaml, Assembly localAssembly = null) => new AvaloniaXamlLoader().Load(xaml, localAssembly); diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaEventConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaEventConverter.cs deleted file mode 100644 index 665e71bfea..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaEventConverter.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; -using System.ComponentModel; -using System.Globalization; -using System.Linq; -using System.Linq.Expressions; -using System.Reflection; -using Avalonia.Controls; -using Avalonia.Markup.Xaml.PortableXaml; -using Portable.Xaml; - -namespace Avalonia.Markup.Xaml.Converters -{ - internal class AvaloniaEventConverter : TypeConverter - { - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType); - } - - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - var text = value as string; - if (text != null) - { - var rootObjectProvider = context.GetService(typeof(IRootObjectProvider)) as IRootObjectProvider; - var destinationTypeProvider = context.GetService(typeof(IDestinationTypeProvider)) as IDestinationTypeProvider; - if (rootObjectProvider != null && destinationTypeProvider != null) - { - var target = rootObjectProvider.RootObject; - var eventType = destinationTypeProvider.GetDestinationType(); - var eventParameters = eventType.GetRuntimeMethods().First(r => r.Name == "Invoke").GetParameters(); - // go in reverse to match System.Xaml behaviour - var methods = target.GetType().GetRuntimeMethods().Reverse(); - - // find based on exact match parameter types first - foreach (var method in methods) - { - if (method.Name != text) - continue; - var parameters = method.GetParameters(); - if (eventParameters.Length != parameters.Length) - continue; - if (parameters.Length == 0) - return method.CreateDelegate(eventType, target); - - for (int i = 0; i < parameters.Length; i++) - { - var param = parameters[i]; - var eventParam = eventParameters[i]; - if (param.ParameterType != eventParam.ParameterType) - break; - if (i == parameters.Length - 1) - return method.CreateDelegate(eventType, target); - } - } - - // EnhancedXaml: Find method with compatible base class parameters - foreach (var method in methods) - { - if (method.Name != text) - continue; - var parameters = method.GetParameters(); - if (parameters.Length == 0 || eventParameters.Length != parameters.Length) - continue; - - for (int i = 0; i < parameters.Length; i++) - { - var param = parameters[i]; - var eventParam = eventParameters[i]; - if (!param.ParameterType.GetTypeInfo().IsAssignableFrom(eventParam.ParameterType.GetTypeInfo())) - break; - if (i == parameters.Length - 1) - return method.CreateDelegate(eventType, target); - } - } - - var contextProvider = (IXamlSchemaContextProvider)context.GetService(typeof(IXamlSchemaContextProvider)); - var avaloniaContext = (AvaloniaXamlSchemaContext)contextProvider.SchemaContext; - - if (avaloniaContext.IsDesignMode) - { - // We want to ignore missing events in the designer, so if event handler - // wasn't found create an empty delegate. - var lambdaExpression = Expression.Lambda( - eventType, - Expression.Empty(), - eventParameters.Select(x => Expression.Parameter(x.ParameterType))); - return lambdaExpression.Compile(); - } - else - { - throw new XamlObjectWriterException($"Referenced value method {text} in type {target.GetType()} indicated by event {eventType.FullName} was not found"); - } - } - } - return base.ConvertFrom(context, culture, value); - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs index 18a7fe9ab6..b42bd53619 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs @@ -11,7 +11,6 @@ using Avalonia.Markup.Xaml.Parsers; using Avalonia.Markup.Xaml.Templates; using Avalonia.Styling; using Avalonia.Utilities; -using Portable.Xaml.ComponentModel; namespace Avalonia.Markup.Xaml.Converters { diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs index bfee7b953b..c75c54554e 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs @@ -8,8 +8,7 @@ using Avalonia.Platform; namespace Avalonia.Markup.Xaml.Converters { - using Portable.Xaml.ComponentModel; - using System.ComponentModel; + using System.ComponentModel; public class BitmapTypeConverter : TypeConverter { diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs index 863e8fbbce..e92c155773 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Converters/FontFamilyTypeConverter.cs @@ -7,7 +7,6 @@ using System.Globalization; using Avalonia.Media; -using Portable.Xaml.ComponentModel; namespace Avalonia.Markup.Xaml.Converters { diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs index f3972ffe18..3a2f41bd3d 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs @@ -9,7 +9,6 @@ using System.Globalization; namespace Avalonia.Markup.Xaml.Converters { - using Portable.Xaml.ComponentModel; using System.ComponentModel; public class IconTypeConverter : TypeConverter diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/NullableTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/NullableTypeConverter.cs deleted file mode 100644 index 5e7a31da56..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/NullableTypeConverter.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Collections; -using System.ComponentModel; -using System.Globalization; - -namespace Avalonia.Markup.Xaml.Converters -{ - public class NullableTypeConverter : TypeConverter where T : TypeConverter, new() - { - private TypeConverter _inner; - - public NullableTypeConverter() - { - _inner = new T(); - } - - public NullableTypeConverter(TypeConverter inner) - { - _inner = inner; - } - - - public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) - { - if (value == null) - return null; - return _inner.ConvertTo(context, culture, value, destinationType); - } - - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - if (value == null) - return null; - if (value as string == "") - return null; - return _inner.ConvertFrom(context, culture, value); - } - - public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues) - { - return _inner.CreateInstance(context, propertyValues); - } - - public override bool GetStandardValuesSupported(ITypeDescriptorContext context) - { - return _inner.GetStandardValuesSupported(context); - } - - public override bool GetStandardValuesExclusive(ITypeDescriptorContext context) - { - return _inner.GetStandardValuesExclusive(context); - } - - public override bool GetCreateInstanceSupported(ITypeDescriptorContext context) - { - return _inner.GetCreateInstanceSupported(context); - } - - public override bool GetPropertiesSupported(ITypeDescriptorContext context) - { - return _inner.GetPropertiesSupported(context); - } - - public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) - { - return _inner.GetStandardValues(context); - } - - public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes) - { - return _inner.GetProperties(context, value, attributes); - } - - public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) - { - return _inner.CanConvertTo(context, destinationType); - } - - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return _inner.CanConvertFrom(context, sourceType); - } - - public override bool IsValid(ITypeDescriptorContext context, object value) - { - return _inner.IsValid(context, value); - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/ParseTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/ParseTypeConverter.cs deleted file mode 100644 index bfb446fa15..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/ParseTypeConverter.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.ComponentModel; -using System.Globalization; -using System.Reflection; - -namespace Avalonia.Markup.Xaml.Converters -{ - /// - /// Base class for type converters which call a static Parse method. - /// - public abstract class ParseTypeConverter : TypeConverter - { - protected const BindingFlags PublicStatic = BindingFlags.Public | BindingFlags.Static; - protected static readonly Type[] StringParameter = new[] { typeof(string) }; - protected static readonly Type[] StringIFormatProviderParameters = new[] { typeof(string), typeof(IFormatProvider) }; - - /// - /// Checks whether a type has a suitable Parse method. - /// - /// The type. - /// True if the type has a suitable parse method, otherwise false. - public static bool HasParseMethod(Type type) - { - return type.GetMethod("Parse", PublicStatic, null, StringIFormatProviderParameters, null) != null || - type.GetMethod("Parse", PublicStatic, null, StringParameter, null) != null; - } - } - - /// - /// A type converter which calls a static Parse method. - /// - /// The type with the Parse method. - public class ParseTypeConverter : ParseTypeConverter - { - private static Func _parse; - private static Func _parseWithFormat; - - static ParseTypeConverter() - { - var method = typeof(T).GetMethod("Parse", PublicStatic, null, StringIFormatProviderParameters, null); - - if (method != null) - { - _parseWithFormat = (Func)method - .CreateDelegate(typeof(Func)); - return; - } - - method = typeof(T).GetMethod("Parse", PublicStatic, null, StringParameter, null); - - if (method != null) - { - _parse = (Func)method.CreateDelegate(typeof(Func)); - } - } - - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string); - } - - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - if (value != null) - { - if (_parse != null) - { - return _parse(value.ToString()); - } - else if (_parseWithFormat != null) - { - return _parseWithFormat(value.ToString(), culture); - } - } - - return null; - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs deleted file mode 100644 index 54234fe406..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System; -using System.Globalization; -using Avalonia.Markup.Parsers; - -namespace Avalonia.Markup.Xaml.Converters -{ - using Portable.Xaml.ComponentModel; - using System.ComponentModel; - - public class SelectorTypeConverter : TypeConverter - { - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string); - } - - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - var parser = new SelectorParser(context.ResolveType); - - return parser.Parse((string)value); - } - } -} \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/SetterValueTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/SetterValueTypeConverter.cs deleted file mode 100644 index 81cda6db1f..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/SetterValueTypeConverter.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using Avalonia.Styling; -using Portable.Xaml; -using Portable.Xaml.ComponentModel; -using System.ComponentModel; -using Portable.Xaml.Markup; -using System; -using System.Globalization; - -namespace Avalonia.Markup.Xaml.Converters -{ - public class SetterValueTypeConverter : TypeConverter - { - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string); - } - - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - object setter = context.GetService().TargetObject; - var schemaContext = context.GetService().SchemaContext; - - return ConvertSetterValue(context, schemaContext, culture, (setter as Setter), value); - } - - [Obsolete("TODO: try assosiate Setter.Value property with SetterValueTypeConverter, so far coouldn't make it :(")] - internal static object ConvertSetterValue(ITypeDescriptorContext dcontext, XamlSchemaContext context, CultureInfo info, Setter setter, object value) - { - Type targetType = setter?.Property?.PropertyType; - - if (targetType == null) - { - return value; - } - - var ttConv = context.GetXamlType(targetType)?.TypeConverter?.ConverterInstance; - - if (ttConv != null) - { - value = ttConv.ConvertFromString(dcontext, info, value as string); - } - - return value; - } - } -} \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Extensions.cs b/src/Markup/Avalonia.Markup.Xaml/Extensions.cs index c6b914ba72..fe3fd44c1c 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Extensions.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Extensions.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using Avalonia.Markup.Xaml.XamlIl.Runtime; -using Portable.Xaml; -using Portable.Xaml.Markup; namespace Avalonia.Markup.Xaml { @@ -13,42 +11,19 @@ namespace Avalonia.Markup.Xaml public static T GetService(this IServiceProvider sp) => (T)sp?.GetService(typeof(T)); - public static Uri GetContextBaseUri(this IServiceProvider ctx) - { - var properService = ctx.GetService(); - if (properService != null) - return properService.BaseUri; - // Ugly hack with casts - return Portable.Xaml.ComponentModel.TypeDescriptorExtensions.GetBaseUri((ITypeDescriptorContext)ctx); - } + public static Uri GetContextBaseUri(this IServiceProvider ctx) => ctx.GetService().BaseUri; - public static T GetFirstParent(this IServiceProvider ctx) where T : class - { - var parentStack = ctx.GetService(); - if (parentStack != null) - return parentStack.Parents.OfType().FirstOrDefault(); - return Portable.Xaml.ComponentModel.TypeDescriptorExtensions.GetFirstAmbientValue((ITypeDescriptorContext)ctx); - } - - public static T GetLastParent(this IServiceProvider ctx) where T : class - { - var parentStack = ctx.GetService(); - if (parentStack != null) - return parentStack.Parents.OfType().LastOrDefault(); - return Portable.Xaml.ComponentModel.TypeDescriptorExtensions.GetLastOrDefaultAmbientValue( - (ITypeDescriptorContext)ctx); - } + public static T GetFirstParent(this IServiceProvider ctx) where T : class + => ctx.GetService().Parents.OfType().FirstOrDefault(); + + public static T GetLastParent(this IServiceProvider ctx) where T : class + => ctx.GetService().Parents.OfType().LastOrDefault(); public static IEnumerable GetParents(this IServiceProvider sp) { - var stack = sp.GetService(); - if (stack != null) - return stack.Parents.OfType(); + return sp.GetService().Parents.OfType(); + - var context = (ITypeDescriptorContext)sp; - var schemaContext = context.GetService().SchemaContext; - var ambientProvider = context.GetService(); - return ambientProvider.GetAllAmbientValues(schemaContext.GetXamlType(typeof(T))).OfType(); } public static Type ResolveType(this IServiceProvider ctx, string namespacePrefix, string type) diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtension.cs new file mode 100644 index 0000000000..858f2daa58 --- /dev/null +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtension.cs @@ -0,0 +1,9 @@ +using System; + +namespace Avalonia.Markup.Xaml +{ + public abstract class MarkupExtension + { + public abstract object ProvideValue(IServiceProvider serviceProvider); + } +} diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs index 223716ae3b..726f4221f8 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs @@ -10,14 +10,9 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions using Avalonia.Data.Converters; using Avalonia.Markup.Data; using Avalonia.Styling; - using Portable.Xaml; - using Portable.Xaml.ComponentModel; - using Portable.Xaml.Markup; - using PortableXaml; using System.ComponentModel; - [MarkupExtensionReturnType(typeof(IBinding))] - public class BindingExtension : MarkupExtension + public class BindingExtension { public BindingExtension() { @@ -28,12 +23,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions Path = path; } - public override object ProvideValue(IServiceProvider serviceProvider) - { - return ProvideTypedValue(serviceProvider); - } - - public Binding ProvideTypedValue(IServiceProvider serviceProvider) + public Binding ProvideValue(IServiceProvider serviceProvider) { var descriptorContext = (ITypeDescriptorContext)serviceProvider; diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs index 48e55dc251..0a9289bec9 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs @@ -7,13 +7,10 @@ using System.Linq; using System.Reactive.Linq; using Avalonia.Controls; using Avalonia.Data; -using Portable.Xaml; -using Portable.Xaml.ComponentModel; -using Portable.Xaml.Markup; namespace Avalonia.Markup.Xaml.MarkupExtensions { - public class DynamicResourceExtension : MarkupExtension, IBinding + public class DynamicResourceExtension : IBinding { private IResourceNode _anchor; @@ -28,9 +25,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions public object ResourceKey { get; set; } - public override object ProvideValue(IServiceProvider serviceProvider) => ProvideTypedValue(serviceProvider); - - public IBinding ProvideTypedValue(IServiceProvider serviceProvider) + public IBinding ProvideValue(IServiceProvider serviceProvider) { var provideTarget = serviceProvider.GetService(); diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs index 2f7256fa22..f690a5ff0e 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs @@ -3,11 +3,10 @@ using System; using Avalonia.Data; -using Portable.Xaml.Markup; namespace Avalonia.Markup.Xaml.MarkupExtensions { - public class RelativeSourceExtension : MarkupExtension + public class RelativeSourceExtension { public RelativeSourceExtension() { @@ -18,7 +17,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions Mode = mode; } - public override object ProvideValue(IServiceProvider serviceProvider) + public RelativeSource ProvideValue(IServiceProvider serviceProvider) { return new RelativeSource { @@ -38,4 +37,4 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions public int AncestorLevel { get; set; } = 1; } -} \ No newline at end of file +} diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs index 323a341f6a..3525628a79 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs @@ -1,15 +1,13 @@ using System; using System.ComponentModel; using Avalonia.Controls; -using Portable.Xaml.ComponentModel; -using Portable.Xaml.Markup; namespace Avalonia.Markup.Xaml.MarkupExtensions { /// /// Loads a resource dictionary from a specified URL. /// - public class ResourceInclude : MarkupExtension, IResourceProvider + public class ResourceInclude :IResourceProvider { private Uri _baseUri; private IResourceDictionary _loaded; @@ -52,13 +50,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions return Loaded.TryGetResource(key, out value); } - /// - public override object ProvideValue(IServiceProvider serviceProvider) - { - return ProvideTypedValue(serviceProvider); - } - - public ResourceInclude ProvideTypedValue(IServiceProvider serviceProvider) + public ResourceInclude ProvideValue(IServiceProvider serviceProvider) { var tdc = (ITypeDescriptorContext)serviceProvider; _baseUri = tdc?.GetContextBaseUri(); diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs index ea913db598..d6b170ae9d 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs @@ -7,13 +7,10 @@ using System.ComponentModel; using System.Reflection; using Avalonia.Controls; using Avalonia.Markup.Data; -using Portable.Xaml; -using Portable.Xaml.ComponentModel; -using Portable.Xaml.Markup; namespace Avalonia.Markup.Xaml.MarkupExtensions { - public class StaticResourceExtension : MarkupExtension + public class StaticResourceExtension { public StaticResourceExtension() { @@ -26,26 +23,13 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions public string ResourceKey { get; set; } - public override object ProvideValue(IServiceProvider serviceProvider) + public object ProvideValue(IServiceProvider serviceProvider) { - - // Look upwards though the ambient context for IResourceProviders which might be able // to give us the resource. foreach (var resourceProvider in serviceProvider.GetParents()) { - // We override XamlType.CanAssignTo in BindingXamlType so the results we get back - // from GetAllAmbientValues aren't necessarily of the correct type. - - if (AvaloniaXamlLoader.UseLegacyXamlLoader - && resourceProvider is IControl control && control.StylingParent != null) - { - // If we've got to a control that has a StylingParent then it's probably - // a top level control and its StylingParent is pointing to the global - // styles. If this is case just do a FindResource on it. - return control.FindResource(ResourceKey); - } - else if (resourceProvider.TryGetResource(ResourceKey, out var value)) + if (resourceProvider.TryGetResource(ResourceKey, out var value)) { return value; } diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs index d9345738fc..a323050c31 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs @@ -3,23 +3,18 @@ using Avalonia.Markup.Xaml.Styling; using Avalonia.Styling; -using Portable.Xaml; -using Portable.Xaml.ComponentModel; using System.ComponentModel; -using Portable.Xaml.Markup; using System; namespace Avalonia.Markup.Xaml.MarkupExtensions { - [MarkupExtensionReturnType(typeof(IStyle))] - public class StyleIncludeExtension : MarkupExtension + public class StyleIncludeExtension { public StyleIncludeExtension() { } - public override object ProvideValue(IServiceProvider serviceProvider) => ProvideTypedValue(serviceProvider); - public IStyle ProvideTypedValue(IServiceProvider serviceProvider) + public IStyle ProvideValue(IServiceProvider serviceProvider) { return new StyleInclude(serviceProvider.GetContextBaseUri()) { Source = Source }; } diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AttributeExtensions.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AttributeExtensions.cs deleted file mode 100644 index 2a23b7e068..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AttributeExtensions.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Avalonia.Markup.Xaml.Templates; -using avm = Avalonia.Metadata; -using pm = Portable.Xaml.Markup; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - internal static class AttributeExtensions - { - public static pm.XamlDeferLoadAttribute ToPortableXaml(this avm.TemplateContentAttribute attrib) - { - if (attrib == null) - { - return null; - } - - return new pm.XamlDeferLoadAttribute(typeof(TemplateLoader), typeof(TemplateContent)); - } - - public static pm.AmbientAttribute ToPortableXaml(this avm.AmbientAttribute attrib) - { - if (attrib == null) - { - return null; - } - - return new pm.AmbientAttribute(); - } - - public static pm.DependsOnAttribute ToPortableXaml(this avm.DependsOnAttribute attrib) - { - if (attrib == null) - { - return null; - } - - return new pm.DependsOnAttribute(attrib.Name); - } - } -} \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaMemberAttributeProvider.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaMemberAttributeProvider.cs deleted file mode 100644 index 529cbab938..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaMemberAttributeProvider.cs +++ /dev/null @@ -1,83 +0,0 @@ -using Avalonia.Markup.Xaml.Converters; -using Avalonia.Styling; -using Portable.Xaml.ComponentModel; -using System.ComponentModel; -using System; -using System.Linq; -using System.Reflection; -using avm = Avalonia.Metadata; -using pm = Portable.Xaml.Markup; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - public class AvaloniaMemberAttributeProvider : ICustomAttributeProvider - { - public AvaloniaMemberAttributeProvider(MemberInfo info) - { - _info = info; - } - - public object[] GetCustomAttributes(bool inherit) - { - throw new NotImplementedException(); - } - - public object[] GetCustomAttributes(Type attributeType, bool inherit) - { - Attribute result = null; - - if (attributeType == typeof(pm.XamlDeferLoadAttribute)) - { - result = _info.GetCustomAttribute(inherit) - .ToPortableXaml(); - } - else if (attributeType == typeof(pm.AmbientAttribute)) - { - result = _info.GetCustomAttribute(inherit) - .ToPortableXaml(); - } - else if (attributeType == typeof(pm.DependsOnAttribute)) - { - result = _info.GetCustomAttribute(inherit) - .ToPortableXaml(); - } - else if (attributeType == typeof(TypeConverterAttribute) && - _info.DeclaringType == typeof(Setter) && - _info.Name == nameof(Setter.Value)) - { - //actually it never comes here looks like if property type is object - //Portable.Xaml is not searching for Type Converter - result = new TypeConverterAttribute(typeof(SetterValueTypeConverter)); - } - else if (attributeType == typeof(TypeConverterAttribute) && _info is EventInfo) - { - // If a type converter for `EventInfo` is registered, then use that to convert - // event handler values. This is used by the designer to override the lookup - // for event handlers with a null handler. - var eventConverter = AvaloniaTypeConverters.GetTypeConverter(typeof(EventInfo)); - - if (eventConverter != null) - { - result = new TypeConverterAttribute(eventConverter); - } - } - - if (result == null) - { - var attr = _info.GetCustomAttributes(attributeType, inherit); - return (attr as object[]) ?? attr.ToArray(); - } - else - { - return new object[] { result }; - } - } - - public bool IsDefined(Type attributeType, bool inherit) - { - throw new NotImplementedException(); - } - - private readonly MemberInfo _info; - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaNameScope.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaNameScope.cs deleted file mode 100644 index 6f855bafa1..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaNameScope.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections.Generic; -using Avalonia.Controls; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - internal class AvaloniaNameScope : Portable.Xaml.Markup.INameScope - { - public object Instance { get; set; } - - private Dictionary _names = new Dictionary(); - - public object FindName(string name) - { - object result; - if (_names.TryGetValue(name, out result)) - return result; - return null; - } - - public void RegisterName(string name, object scopedElement) - { - if (scopedElement != null) - _names.Add(name, scopedElement); - - //TODO: ??? - //var control = scopedElement as Control; - - //if (control != null) - //{ - // var nameScope = (Instance as INameScope) ?? control.FindNameScope(); - - // if (nameScope != null) - // { - // nameScope.Register(name, scopedElement); - // } - //} - } - - public void UnregisterName(string name) - { - } - - public void RegisterOnNameScope(object target) - { - var nameScope = target as INameScope; - - if (nameScope != null) - { - foreach (var v in _names) - { - nameScope.Register(v.Key, v.Value); - } - } - } - } -} \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs deleted file mode 100644 index eb52e317b8..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Avalonia.Controls; -using Avalonia.Data; -using Avalonia.Markup.Xaml.Templates; -using Avalonia.Media; -using Avalonia.Metadata; -using Avalonia.Platform; -using Avalonia.Styling; - -namespace Avalonia.Markup.Xaml.Context -{ - using ClrNamespaceInfo = Tuple; - - public interface IRuntimeTypeProvider - { - Type FindType(string xamlNamespace, string name, Type[] genArgs); - - IEnumerable ReferencedAssemblies { get; } - } - - public class AvaloniaRuntimeTypeProvider : IRuntimeTypeProvider - { - private const string ClrNamespace = "clr-namespace:"; - // private const string AvaloniaNs = "https://github.com/avaloniaui"; - - private static readonly IEnumerable ForcedAssemblies = new[] - { - typeof(AvaloniaObject).GetTypeInfo().Assembly, - typeof(Animation.Animation).GetTypeInfo().Assembly, - typeof(Control).GetTypeInfo().Assembly, - typeof(Style).GetTypeInfo().Assembly, - typeof(DataTemplate).GetTypeInfo().Assembly, - typeof(SolidColorBrush).GetTypeInfo().Assembly, - typeof(Binding).GetTypeInfo().Assembly, - }; - - private Dictionary> _namespaces = new Dictionary>(); - - private List _scanned = new List(); - - public IEnumerable ReferencedAssemblies => _scanned; - - public AvaloniaRuntimeTypeProvider() - { - ScanAssemblies(ForcedAssemblies); - ScanNewAssemblies(); - } - - private static bool IsClrNamespace(string ns) - { - return ns.StartsWith(ClrNamespace); - } - - private static Assembly GetAssembly(string assemblyName) - { - return Assembly.Load(new AssemblyName(assemblyName)); - } - - private void ScanAssemblies(IEnumerable assemblies) - { - foreach (var assembly in assemblies) - { - var namespaces = assembly.GetCustomAttributes() - .Select(x => new { x.XmlNamespace, x.ClrNamespace }) - .GroupBy(x => x.XmlNamespace); - - foreach (var nsa in namespaces) - { - HashSet reg; - - if (!_namespaces.TryGetValue(nsa.Key, out reg)) - { - _namespaces[nsa.Key] = reg = new HashSet>(); - } - - foreach (var child in nsa) - { - reg.Add(new ClrNamespaceInfo(child.ClrNamespace, assembly)); - } - } - - _scanned.Add(assembly); - } - } - - private void ScanNewAssemblies() - { - IEnumerable assemblies = AppDomain.CurrentDomain.GetAssemblies(); - - if (assemblies != null) - { - assemblies = assemblies.Except(_scanned); - ScanAssemblies(assemblies); - } - } - - private Dictionary _typeCache = new Dictionary(); - - public Type FindType(string xamlNamespace, string name, Type[] genArgs) - { - if (IsClrNamespace(xamlNamespace)) - { - //we need to handle only xaml url namespaces for avalonia, - //the other namespaces are handled well in portable.xaml - return null; - } - - string key = $"{xamlNamespace}:{name}"; - - Type type; - - if (_typeCache.TryGetValue(key, out type)) - { - return type; - } - - HashSet reg; - - if (!_namespaces.TryGetValue(xamlNamespace, out reg)) - { - return null; - } - - if (genArgs != null) - name += "`" + genArgs.Length; - - foreach (var ns in reg) - { - var n = ns.Item1 + "." + name; - var t = ns.Item2.GetType(n); - if (t != null) - { - _typeCache[key] = t; - return t; - } - } - - return null; - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaTypeAttributeProvider.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaTypeAttributeProvider.cs deleted file mode 100644 index 7558a5df0b..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaTypeAttributeProvider.cs +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) The Perspex Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using Portable.Xaml.ComponentModel; -using System.ComponentModel; -using System; -using System.Linq; -using System.Reflection; -using avm = Avalonia.Metadata; -using pm = Portable.Xaml.Markup; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - internal class AvaloniaTypeAttributeProvider : ICustomAttributeProvider - { - public AvaloniaTypeAttributeProvider(Type type) - { - _type = type; - } - - public object[] GetCustomAttributes(bool inherit) - { - throw new NotImplementedException(); - } - - public object[] GetCustomAttributes(Type attributeType, bool inherit) - { - Attribute result = null; - - var ti = _type.GetTypeInfo(); - - if (attributeType == typeof(pm.ContentPropertyAttribute)) - { - result = GetContentPropertyAttribute(inherit); - } - else if (attributeType == typeof(pm.RuntimeNamePropertyAttribute)) - { - if (_namedType.IsAssignableFrom(ti)) - { - result = new pm.RuntimeNamePropertyAttribute(nameof(INamed.Name)); - } - } - else if (attributeType == typeof(TypeConverterAttribute)) - { - var builtin = AvaloniaTypeConverters.GetBuiltinTypeConverter(_type); - if (builtin != null) - result = new TypeConverterAttribute(builtin); - result = result ?? ti.GetCustomAttribute(attributeType, inherit); - - if (result == null) - { - var convType = AvaloniaTypeConverters.GetTypeConverter(_type); - - if (convType != null) - { - result = new TypeConverterAttribute(convType); - } - } - } - else if (attributeType == typeof(pm.AmbientAttribute)) - { - result = ti.GetCustomAttribute(inherit) - .ToPortableXaml(); - } - - if (result == null) - { - var attr = ti.GetCustomAttributes(attributeType, inherit); - return (attr as object[]) ?? attr.ToArray(); - } - else - { - return new object[] { result }; - } - } - - public bool IsDefined(Type attributeType, bool inherit) - { - throw new NotImplementedException(); - } - - private readonly TypeInfo _namedType = typeof(INamed).GetTypeInfo(); - - private readonly Type _type; - - private Attribute GetContentPropertyAttribute(bool inherit) - { - var type = _type; - - while (type != null) - { - var properties = type.GetTypeInfo().DeclaredProperties - .Where(x => x.GetCustomAttribute() != null); - string result = null; - - foreach (var property in properties) - { - if (result != null) - { - throw new Exception($"Content property defined more than once on {type}."); - } - - result = property.Name; - } - - if (result != null) - { - return new pm.ContentPropertyAttribute(result); - } - - type = inherit ? type.GetTypeInfo().BaseType : null; - } - - return null; - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlContext.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlContext.cs deleted file mode 100644 index c159b551b7..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlContext.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Portable.Xaml; -using Portable.Xaml.Markup; -using System; -using System.Reflection; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - public class AvaloniaXamlContext : IUriContext - { - private AvaloniaXamlContext() - { - } - - public Assembly LocalAssembly { get; private set; } - - public Uri BaseUri { get; set; } - - public object RootInstance { get; private set; } - - internal static AvaloniaXamlContext For(XamlXmlReaderSettings sett, - object rootInstance) - { - return new AvaloniaXamlContext() - { - BaseUri = sett.BaseUri, - LocalAssembly = sett.LocalAssembly, - RootInstance = rootInstance - }; - } - } -} \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs deleted file mode 100644 index 9fa6c26c35..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs +++ /dev/null @@ -1,222 +0,0 @@ -using Avalonia.Data; -using Portable.Xaml; -using Portable.Xaml.ComponentModel; -using System.ComponentModel; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Avalonia.Controls; -using Portable.Xaml.Schema; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - class AvaloniaXamlObjectWriter : XamlObjectWriter - { - private static Dictionary DesignDirectives = new Dictionary - { - ["DataContext"] = "DataContext", - ["DesignWidth"] = "Width", ["DesignHeight"] = "Height", ["PreviewWith"] = "PreviewWith" - } - .ToDictionary(p => new XamlDirective( - new[] {"http://schemas.microsoft.com/expression/blend/2008"}, p.Key, - XamlLanguage.Object, null, AllowedMemberLocations.Attribute), p => p.Value); - - private readonly AvaloniaXamlSchemaContext _schemaContext; - - public static AvaloniaXamlObjectWriter Create( - AvaloniaXamlSchemaContext schemaContext, - AvaloniaXamlContext context, - IAmbientProvider parentAmbientProvider = null) - { - var nameScope = new AvaloniaNameScope { Instance = context?.RootInstance }; - - var writerSettings = new XamlObjectWriterSettings() - { - ExternalNameScope = nameScope, - RegisterNamesOnExternalNamescope = true, - RootObjectInstance = context?.RootInstance - }; - - return new AvaloniaXamlObjectWriter(schemaContext, - writerSettings.WithContext(context), - nameScope, - parentAmbientProvider); - } - - private readonly DelayedValuesHelper _delayedValuesHelper = new DelayedValuesHelper(); - - private AvaloniaNameScope _nameScope; - - private AvaloniaXamlObjectWriter( - AvaloniaXamlSchemaContext schemaContext, - XamlObjectWriterSettings settings, - AvaloniaNameScope nameScope, - IAmbientProvider parentAmbientProvider) - : base(schemaContext, settings, parentAmbientProvider) - { - _nameScope = nameScope; - _schemaContext = schemaContext; - } - - protected override void Dispose(bool disposing) - { - if (disposing) - { - if (_nameScope != null && Result != null) - { - _nameScope.RegisterOnNameScope(Result); - } - } - - base.Dispose(disposing); - } - - public void ApplyAllDelayedProperties() - { - //HACK: We need this because Begin/EndInit ordering is broken - _delayedValuesHelper.ApplyAll(); - } - - protected internal override void OnAfterProperties(object value) - { - _delayedValuesHelper.EndInit(value); - - base.OnAfterProperties(value); - } - - protected internal override void OnBeforeProperties(object value) - { - if (value != null) - _delayedValuesHelper.BeginInit(value); - - base.OnBeforeProperties(value); - } - - protected internal override bool OnSetValue(object target, XamlMember member, object value) - { - if (_delayedValuesHelper.TryAdd(target, member, value)) - { - return true; - } - - return base.OnSetValue(target, member, value); - } - - public override void WriteStartMember(XamlMember property) - { - foreach(var d in DesignDirectives) - if (property == d.Key && _schemaContext.IsDesignMode) - { - base.WriteStartMember(new XamlMember(d.Value, - typeof(Design).GetMethod("Get" + d.Value, BindingFlags.Static | BindingFlags.Public), - typeof(Design).GetMethod("Set" + d.Value, BindingFlags.Static | BindingFlags.Public), - SchemaContext)); - return; - } - base.WriteStartMember(property); - } - - private class DelayedValuesHelper - { - private int _cnt; - - private HashSet _targets = new HashSet(); - - private IList _values = new List(); - - private IEnumerable Values => _values; - - public void BeginInit(object target) - { - ++_cnt; - - AddTargetIfNeeded(target); - } - - public void EndInit(object target) - { - --_cnt; - - if (_cnt == 0) - { - ApplyAll(); - } - } - - public bool TryAdd(object target, XamlMember member, object value) - { - if (value is IBinding) - { - Add(new DelayedValue(target, member, value)); - - return true; - } - - return false; - } - - private void Add(DelayedValue value) - { - _values.Add(value); - - var target = value.Target; - - if (!_targets.Contains(value.Target)) - { - _targets.Add(target); - (target as ISupportInitialize)?.BeginInit(); - } - } - - private void AddTargetIfNeeded(object target) - { - if (!_targets.Contains(target)) - { - Add(new DelayedValue(target, null, null)); - } - } - - public void ApplyAll() - { - //TODO: revisit this - //apply delayed values and clear - //that's the last object let's set all delayed bindings - foreach (var dv in Values.Where(v => v.Member != null)) - { - dv.Member.Invoker.SetValue(dv.Target, dv.Value); - } - - //TODO: check/add some order of end init - //currently we are sending end init in the order of - //objects creation - foreach (var v in Values) - { - var target = v.Target; - - if (_targets.Contains(target)) - { - _targets.Remove(target); - (target as ISupportInitialize)?.EndInit(); - } - } - - _targets.Clear(); - _values.Clear(); - } - - private class DelayedValue - { - public DelayedValue(object target, XamlMember member, object value) - { - Target = target; - Member = member; - Value = value; - } - - public XamlMember Member { get; } - public object Target { get; } - public object Value { get; } - } - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs deleted file mode 100644 index 326db884a6..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs +++ /dev/null @@ -1,327 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Avalonia.Data; -using Avalonia.Markup.Xaml.Context; -using Avalonia.Markup.Xaml.MarkupExtensions; -using Avalonia.Markup.Xaml.Styling; -using Portable.Xaml; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - internal class AvaloniaXamlSchemaContext : XamlSchemaContext - { - private static AvaloniaXamlSchemaContext s_instance; - private static AvaloniaXamlSchemaContext s_designInstance; - - public static AvaloniaXamlSchemaContext Instance - { - get - { - if (s_instance == null) - { - s_instance = Create(); - } - - return s_instance; - } - } - - public static AvaloniaXamlSchemaContext DesignInstance - { - get - { - if (s_designInstance == null) - { - s_designInstance = Create(); - s_designInstance.IsDesignMode = true; - } - - return s_designInstance; - } - } - - public bool IsDesignMode { get; private set; } - public static AvaloniaXamlSchemaContext Create(IRuntimeTypeProvider typeProvider = null) - { - return new AvaloniaXamlSchemaContext(typeProvider ?? new AvaloniaRuntimeTypeProvider()); - } - - private AvaloniaXamlSchemaContext(IRuntimeTypeProvider typeProvider) - //better not set the references assemblies - //TODO: check this on iOS - //: base(typeProvider.ReferencedAssemblies) - { - Contract.Requires(typeProvider != null); - - _avaloniaTypeProvider = typeProvider; - } - - private IRuntimeTypeProvider _avaloniaTypeProvider; - - protected override XamlType GetXamlType(string xamlNamespace, string name, params XamlType[] typeArguments) - { - XamlType type = null; - try - { - type = ResolveXamlTypeName(xamlNamespace, name, typeArguments, false); - - if (type == null) - { - type = base.GetXamlType(xamlNamespace, name, typeArguments); - } - } - catch (Exception e) - { - //TODO: log or wrap exception - throw e; - } - return type; - } - - private XamlType ResolveXamlTypeName(string xmlNamespace, string xmlLocalName, XamlType[] typeArguments, bool required) - { - Type[] genArgs = null; - if (typeArguments != null && typeArguments.Any()) - { - genArgs = typeArguments.Select(t => t?.UnderlyingType).ToArray(); - - if (genArgs.Any(t => t == null)) - { - return null; - } - } - - // MarkupExtension type could omit "Extension" part in XML name. - Type type = _avaloniaTypeProvider.FindType(xmlNamespace, - xmlLocalName, - genArgs) ?? - _avaloniaTypeProvider.FindType(xmlNamespace, - xmlLocalName + "Extension", - genArgs); - - if (type != null) - { - Type extType; - if (_wellKnownExtensionTypes.TryGetValue(type, out extType)) - { - type = extType; - } - } - - if (type == null) - { - //let's try the simple types - //in Portable xaml like xmlns:sys='clr-namespace:System;assembly=mscorlib' - //and sys:Double is not resolved properly - return ResolveSimpleTypeName(xmlNamespace, xmlLocalName); - } - - return GetXamlType(type); - } - - #region Workaround for bug in Portablexaml system types like double,int etc ... - - private static Type[] _simpleTypes = new Type[] - { - typeof(bool), - typeof(byte), - typeof(char), - typeof(decimal), - typeof(double), - typeof(Int16), - typeof(Int32), - typeof(Int64), - typeof(float), - typeof(string), - typeof(TimeSpan), - typeof(Uri), - }; - - private static Dictionary, XamlType> _simpleXamlTypes; - - //in Portable xaml like xmlns:sys='clr-namespace:System;assembly=mscorlib' - //and sys:Double is not resolved properly - [Obsolete("TODO: remove once it's fixed in Portable.xaml")] - private static XamlType ResolveSimpleTypeName(string xmlNamespace, string xmlLocalName) - { - if (_simpleXamlTypes == null) - { - _simpleXamlTypes = new Dictionary, XamlType>(); - - foreach (var type in _simpleTypes) - { - string asmName = type.GetTypeInfo().Assembly.GetName().Name; - string ns = $"clr-namespace:{type.Namespace};assembly={asmName}"; - var xamlType = XamlLanguage.AllTypes.First(t => t.UnderlyingType == type); - _simpleXamlTypes.Add(new Tuple(ns, type.Name), xamlType); - } - } - - XamlType result; - - var key = new Tuple(xmlNamespace, xmlLocalName); - - _simpleXamlTypes.TryGetValue(key, out result); - - return result; - } - - #endregion Workaround for bug in Portablexaml system types like double,int etc ... - - protected internal override ICustomAttributeProvider GetCustomAttributeProvider(Type type) - => new AvaloniaTypeAttributeProvider(type); - - protected internal override ICustomAttributeProvider GetCustomAttributeProvider(MemberInfo member) - => new AvaloniaMemberAttributeProvider(member); - - public override XamlType GetXamlType(Type type) - { - XamlType result = null; - - if (_cachedTypes.TryGetValue(type, out result)) - { - return result; - } - - _cachedTypes[type] = result = GetAvaloniaXamlType(type) ?? base.GetXamlType(type); - - return result; - } - - private static readonly Dictionary _wellKnownExtensionTypes = new Dictionary() - { - { typeof(Binding), typeof(BindingExtension) }, - { typeof(StyleInclude), typeof(StyleIncludeExtension) }, - }; - - private XamlType GetAvaloniaXamlType(Type type) - { - //if type is extension get the original type to check - var origType = _wellKnownExtensionTypes.FirstOrDefault(v => v.Value == type).Key; - - if (typeof(IBinding).GetTypeInfo().IsAssignableFrom((origType ?? type).GetTypeInfo())) - { - return new BindingXamlType(type, this); - } - - if (origType != null || - typeof(AvaloniaObject).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo())) - { - return new AvaloniaXamlType(type, this); - } - - return null; - } - - protected internal override XamlMember GetAttachableProperty(string attachablePropertyName, MethodInfo getter, MethodInfo setter) - { - var key = MemberKey.Create(getter ?? setter, attachablePropertyName, "a"); - - XamlMember result; - - if (_cachedMembers.TryGetValue(key, out result)) - { - return result; - } - - var type = (getter ?? setter).DeclaringType; - - var prop = AvaloniaPropertyRegistry.Instance.FindRegistered(type, attachablePropertyName); - - if (prop != null) - { - result = new AvaloniaAttachedPropertyXamlMember( - prop, attachablePropertyName, - getter, setter, this); - } - - if (result == null) - { - result = base.GetAttachableProperty(attachablePropertyName, getter, setter); - } - - return _cachedMembers[key] = result; - } - - protected internal override XamlMember GetProperty(PropertyInfo pi) - { - Type objType = pi.DeclaringType; - string name = pi.Name; - - XamlMember result; - - var key = MemberKey.Create(pi, "p"); - - if (_cachedMembers.TryGetValue(key, out result)) - { - return result; - } - - var avProp = AvaloniaPropertyRegistry.Instance.FindRegistered(objType, name); - - if (avProp != null) - { - result = new AvaloniaPropertyXamlMember(avProp, pi, this); - } - - if (result == null) - { - result = new PropertyXamlMember(pi, this); - } - - return _cachedMembers[key] = result; - } - - private Dictionary _cachedTypes = new Dictionary(); - - private Dictionary _cachedMembers = new Dictionary(); - - private struct MemberKey - { - public static MemberKey Create(MemberInfo m, string name, string memberType) - { - return new MemberKey(m.DeclaringType, name, memberType); - } - - public static MemberKey Create(MemberInfo m, string memberType) - { - return Create(m, m.Name, memberType); - } - - public MemberKey(Type type, object member, string memberType) - { - Type = type; - Member = member; - MemberType = memberType; - } - - public Type Type { get; } - - public object Member { get; } - - public string MemberType { get; } - - public override string ToString() - { - return $"{MemberType}:{Type.Namespace}:{Type.Name}.{Member}"; - } - } - - - public override bool TryGetCompatibleXamlNamespace(string xamlNamespace, out string compatibleNamespace) - { - //Forces XamlXmlReader to not ignore our namespace in design mode if mc:Ignorable is set - if (IsDesignMode && - xamlNamespace == "http://schemas.microsoft.com/expression/blend/2008") - { - compatibleNamespace = xamlNamespace; - return true; - } - - return base.TryGetCompatibleXamlNamespace(xamlNamespace, out compatibleNamespace); - } - - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs deleted file mode 100644 index 10cf716912..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs +++ /dev/null @@ -1,388 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Data; -using Avalonia.Markup.Data; -using Avalonia.Metadata; -using Avalonia.Styling; -using Portable.Xaml; -using Portable.Xaml.Schema; -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.Reflection; -using System.Xml.Serialization; - -namespace Avalonia.Markup.Xaml.PortableXaml -{ - using Converters; - using PropertyKey = Tuple; - - public class AvaloniaXamlType : XamlType - { - static readonly AvaloniaPropertyTypeConverter propertyTypeConverter = new AvaloniaPropertyTypeConverter(); - - public AvaloniaXamlType(Type underlyingType, XamlSchemaContext schemaContext) : - base(underlyingType, schemaContext) - { - } - - protected override XamlMember LookupAttachableMember(string name) - { - var m = base.LookupAttachableMember(name); - - if (m == null) - { - // Might be an AddOwnered attached property. - var avProp = AvaloniaPropertyRegistry.Instance.FindRegistered(UnderlyingType, name); - - if (avProp?.IsAttached == true) - { - return new AvaloniaPropertyXamlMember(avProp, this); - } - } - - return m; - } - - protected override XamlMember LookupMember(string name, bool skipReadOnlyCheck) - { - var m = base.LookupMember(name, skipReadOnlyCheck); - - if (m == null && !name.Contains(".")) - { - //so far Portable.xaml haven't found the member/property - //but what if we have AvaloniaProperty - //without setter and/or without getter - //let's try to find the AvaloniaProperty as a fallback - var avProp = AvaloniaPropertyRegistry.Instance.FindRegistered(UnderlyingType, name); - - if (avProp != null && !(skipReadOnlyCheck && avProp.IsReadOnly)) - { - m = new AvaloniaPropertyXamlMember(avProp, this); - } - } - - return m; - } - } - - public class BindingXamlType : XamlType - { - private static List _notAssignable = - new List - { - typeof (IXmlSerializable) - }; - - public BindingXamlType(Type underlyingType, XamlSchemaContext schemaContext) : - base(underlyingType, schemaContext) - { - } - - public override bool CanAssignTo(XamlType xamlType) - { - return !_notAssignable.Contains(xamlType.UnderlyingType); - } - } - - public class PropertyXamlMember : XamlMember - { - public PropertyXamlMember(PropertyInfo propertyInfo, XamlSchemaContext schemaContext) - : base(propertyInfo, schemaContext) - { - } - - protected PropertyXamlMember(string attachablePropertyName, - MethodInfo getter, MethodInfo setter, XamlSchemaContext schemaContext) - : base(attachablePropertyName, getter, setter, schemaContext) - { - } - - protected PropertyXamlMember(string name, XamlType declaringType, bool isAttachable) - : base(name, declaringType, isAttachable) - { - } - - private bool IsReadOnlyCollectionProperty - { - get - { - //Collection properties like: - //MultiBinding.Bindings, Panel.Children, Control.Styles, - //need to be readonly for Portable.Xaml - //Collection properties like: - //Grid.RowDefinitions, Grid.ColumnDefinitions - //need to be set only once, and subsequent changes to be - //added to collection - //TODO: investigate is this good enough as solution ??? - //We can add some ReadOnyXamlPropertyCollectionAttribute to cover this - return Type.IsCollection; - } - } - - private bool HasCollectionTypeConverter - { - get - { - return Type.IsCollection && Type.TypeConverter != null; - } - } - - protected override MethodInfo LookupUnderlyingSetter() - { - //if we have content property a list - //we have some issues in portable.xaml - //but if the list is read only, this is solving the problem - - if (IsReadOnlyCollectionProperty && - !HasCollectionTypeConverter) - { - return null; - } - - return base.LookupUnderlyingSetter(); - } - - protected override XamlMemberInvoker LookupInvoker() - { - //if we have a IList property and it has TypeConverter - //Portable.xaml need to be able to set the value - //but instead directly set new value we'll sync the lists - bool updateListInsteadSet = HasCollectionTypeConverter; - return new PropertyInvoker(this) - { - UpdateListInsteadSet = updateListInsteadSet - }; - } - - protected override bool LookupIsUnknown() => false; - - protected override XamlType LookupType() - { - var propType = GetPropertyType(); - - if (propType != null) - { - if (propType == typeof(IEnumerable)) - { - //TODO: Portable.xaml is not handling well IEnumerable - //let's threat IEnumerable property as list - //revisit this when smarter solution is found - propType = typeof(IList); - } - - return DeclaringType.SchemaContext.GetXamlType(propType); - } - - return base.LookupType(); - } - - protected virtual Type GetPropertyType() - { - return (UnderlyingMember as PropertyInfo)?.PropertyType; - } - - private IList _dependsOn; - - protected override IList LookupDependsOn() - { - if (_dependsOn == null) - { - var attrib = UnderlyingMember.GetCustomAttribute(true); - - if (attrib != null) - { - var member = DeclaringType.GetMember(attrib.Name); - - _dependsOn = new XamlMember[] { member }; - } - else - { - _dependsOn = base.LookupDependsOn(); - } - } - - return _dependsOn; - } - - private PropertyKey PropertyKey() - => new PropertyKey(DeclaringType.UnderlyingType, Name); - - private class PropertyInvoker : XamlMemberInvoker - { - public bool UpdateListInsteadSet { get; set; } = false; - - public PropertyInvoker(XamlMember member) : base(member) - { - } - - public override void SetValue(object instance, object value) - { - //can't make it work to assign TypeConverter to Setter.Value - //so we need it hard coded - //TODO: try to assosiate TypeConverter with Setter.Value - //and remove this lines - if (instance is Setter && - Member.Name == nameof(Setter.Value) && - value is string) - { - value = SetterValueTypeConverter.ConvertSetterValue(null, - Member.DeclaringType.SchemaContext, CultureInfo.InvariantCulture, - instance as Setter, - value); - } - - if (UpdateListInsteadSet && - value != null && - UpdateListInsteadSetValue(instance, value)) - { - return; - } - - base.SetValue(instance, value); - } - - private bool UpdateListInsteadSetValue(object instance, object value) - { - object old = GetValue(instance); - - if (Equals(old, value)) - { - //don't set the same collection value - return true; - } - else if (old is IList && value is IList) - { - var oldList = (IList)old; - var curList = (IList)value; - - oldList.Clear(); - - foreach (object item in curList) - { - oldList.Add(item); - } - - return true; - } - - return false; - } - } - } - - public class AvaloniaPropertyXamlMember : PropertyXamlMember - { - private bool? _assignBinding; - - public bool AssignBinding => (bool)(_assignBinding ?? (_assignBinding = UnderlyingMember?.GetCustomAttribute() != null)); - - public AvaloniaProperty Property { get; } - - public AvaloniaPropertyXamlMember(AvaloniaProperty property, - PropertyInfo propertyInfo, - XamlSchemaContext schemaContext) : - base(propertyInfo, schemaContext) - { - Property = property; - } - - public AvaloniaPropertyXamlMember(AvaloniaProperty property, XamlType type) : - base(property.Name, type, false) - { - Property = property; - } - - protected AvaloniaPropertyXamlMember(AvaloniaProperty property, - string attachablePropertyName, - MethodInfo getter, MethodInfo setter, XamlSchemaContext schemaContext) - : base(attachablePropertyName, getter, setter, schemaContext) - { - Property = property; - } - - protected override XamlMemberInvoker LookupInvoker() - { - return new AvaloniaPropertyInvoker(this); - } - - protected override bool LookupIsReadOnly() - { - return Property.IsReadOnly; - } - - protected override Type GetPropertyType() - { - return Property.PropertyType; - } - - private class AvaloniaPropertyInvoker : XamlMemberInvoker - { - public AvaloniaPropertyInvoker(XamlMember member) : base(member) - { - } - - public override void SetValue(object instance, object value) - { - if (Property != null) - { - var obj = ((IAvaloniaObject)instance); - if (value is IBinding) - { - if (!Member.AssignBinding) - ApplyBinding(obj, (IBinding)value); - else - obj.SetValue(Property, value); - } - else - { - obj.SetValue(Property, value); - } - } - else - { - base.SetValue(instance, value); - } - } - - public override object GetValue(object instance) - { - if (Property != null && !Property.IsAttached) - { - return ((IAvaloniaObject)instance).GetValue(Property); - } - else - { - return base.GetValue(instance); - } - } - - private void ApplyBinding(IAvaloniaObject obj, IBinding binding) - { - var control = obj as IControl; - var property = Property; - - if (control != null && property != Control.DataContextProperty) - DelayedBinding.Add(control, property, binding); - else - obj.Bind(property, binding); - } - - private AvaloniaProperty Property => Member.Property; - - private new AvaloniaPropertyXamlMember Member => - (AvaloniaPropertyXamlMember)base.Member; - } - } - - public class AvaloniaAttachedPropertyXamlMember : AvaloniaPropertyXamlMember - { - public AvaloniaAttachedPropertyXamlMember(AvaloniaProperty property, - string attachablePropertyName, - MethodInfo getter, MethodInfo setter, - XamlSchemaContext schemaContext) - : base(property, attachablePropertyName, getter, setter, schemaContext) - { - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs deleted file mode 100644 index a48f400af2..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs +++ /dev/null @@ -1,101 +0,0 @@ -using Avalonia.Markup.Xaml.PortableXaml; -using Portable.Xaml.Markup; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.ComponentModel; - -namespace Portable.Xaml.ComponentModel -{ - internal static class TypeDescriptorExtensions - { - /// - /// Gets the service from ITypeDescriptorContext - /// usually in TypeConverter in xaml reader context - /// examples: - /// context.GetService<IXamlTypeResolver>() - /// context.GetService<IXamlNamespaceResolver>() - /// context.GetService<IXamlNameProvider>() - /// context.GetService<INamespacePrefixLookup>() - /// context.GetService<IXamlSchemaContextProvider>() - /// context.GetService<IRootObjectProvider>() - /// context.GetService<IProvideValueTarget>() - /// - /// Service Type - /// The TypeDescriptor context. - /// - public static T GetService(this ITypeDescriptorContext ctx) where T : class - { - return ctx.GetService(typeof(T)) as T; - } - - public static Type ResolveType(this ITypeDescriptorContext ctx, string namespacePrefix, string type) - { - var tr = ctx.GetService(); - - string name = string.IsNullOrEmpty(namespacePrefix) ? type : $"{namespacePrefix}:{type}"; - - return tr?.Resolve(name); - } - - public static T GetFirstAmbientValue(this ITypeDescriptorContext ctx) where T : class - { - var amb = ctx.GetService(); - var sc = ctx.GetService().SchemaContext; - - // Because GetFirstParent uses XamlType.CanAssignTo it returns values that - // aren't actually of the correct type. Use GetAllAmbientValues instead. - return amb.GetAllAmbientValues(sc.GetXamlType(typeof(T))).OfType().FirstOrDefault(); - } - - public static T GetLastOrDefaultAmbientValue(this ITypeDescriptorContext ctx) where T : class - { - return ctx.GetAllAmbientValues().LastOrDefault() as T; - } - - public static IEnumerable GetAllAmbientValues(this ITypeDescriptorContext ctx) where T : class - { - var amb = ctx.GetService(); - var sc = ctx.GetService().SchemaContext; - - return amb.GetAllAmbientValues(sc.GetXamlType(typeof(T))).OfType(); - } - - public static Uri GetBaseUri(this ITypeDescriptorContext ctx) - { - return ctx.GetWriterSettings()?.Context?.BaseUri; - } - - public static Assembly GetLocalAssembly(this ITypeDescriptorContext ctx) - { - return ctx.GetWriterSettings()?.Context?.LocalAssembly; - } - - public static AvaloniaXamlContext GetAvaloniaXamlContext(this ITypeDescriptorContext ctx) - { - return ctx.GetWriterSettings()?.Context; - } - - public static XamlObjectWriterSettings WithContext(this XamlObjectWriterSettings settings, AvaloniaXamlContext context) - { - return new AvaloniaXamlObjectWriterSettings(settings, context); - } - - private static AvaloniaXamlObjectWriterSettings GetWriterSettings(this ITypeDescriptorContext ctx) - { - return ctx.GetService().GetParentSettings() as AvaloniaXamlObjectWriterSettings; - } - - private class AvaloniaXamlObjectWriterSettings : XamlObjectWriterSettings - { - public AvaloniaXamlObjectWriterSettings(XamlObjectWriterSettings settings, AvaloniaXamlContext context) - : base(settings) - { - Context = context; - } - - public AvaloniaXamlContext Context { get; } - } - } -} diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github deleted file mode 160000 index ab55261737..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab5526173722b8988bc5ca3c03c8752ce89c0975 diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs index ff367c0e13..ead373d380 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateContent.cs @@ -7,42 +7,16 @@ using System.Collections.Generic; namespace Avalonia.Markup.Xaml.Templates { - using Portable.Xaml; - - public class TemplateContent + + public static class TemplateContent { - public TemplateContent(IEnumerable namespaces, XamlReader reader, - IAmbientProvider ambientProvider) - { - ParentAmbientProvider = ambientProvider; - List = new XamlNodeList(reader.SchemaContext); - - //we need to rpeserve all namespace and prefixes to writer - //otherwise they are lost. a bug in Portable.xaml or by design ?? - foreach (var ns in namespaces) - { - List.Writer.WriteNamespace(ns); - } - - XamlServices.Transform(reader, List.Writer); - } - - public XamlNodeList List { get; } - - private IAmbientProvider ParentAmbientProvider { get; } - - public IControl Load() - { - return (IControl)AvaloniaXamlLoader.LoadFromReader(List.GetReader(), parentAmbientProvider: ParentAmbientProvider); - } - public static IControl Load(object templateContent) { if (templateContent is Func direct) { return (IControl)direct(null); } - return ((TemplateContent)templateContent).Load(); + throw new ArgumentException(nameof(templateContent)); } } } diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateLoader.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateLoader.cs deleted file mode 100644 index e29485ddb0..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/Templates/TemplateLoader.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) The Avalonia Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -namespace Avalonia.Markup.Xaml.Templates -{ - using Portable.Xaml; - using Portable.Xaml.ComponentModel; - using System.ComponentModel; - using System; - - public class TemplateLoader : XamlDeferringLoader - { - public override object Load(XamlReader xamlReader, IServiceProvider serviceProvider) - { - var tdc = (ITypeDescriptorContext)serviceProvider; - var ns = tdc.GetService(); - var ambientProvider = tdc.GetService(); - return new TemplateContent(ns.GetNamespacePrefixes(), xamlReader, ambientProvider); - } - - public override XamlReader Save(object value, IServiceProvider serviceProvider) - { - return ((TemplateContent)value).List.GetReader(); - } - } -} \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs index 581dbcdac7..c25e1186d0 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/AvaloniaXamlIlLanguage.cs @@ -28,15 +28,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions XmlnsAttributes = { typeSystem.GetType("Avalonia.Metadata.XmlnsDefinitionAttribute"), - typeSystem.FindType("Portable.Xaml.Markup.XmlnsDefinitionAttribute") }, ContentAttributes = { typeSystem.GetType("Avalonia.Metadata.ContentAttribute") }, - ProvideValueTarget = typeSystem.GetType("Portable.Xaml.Markup.IProvideValueTarget"), - RootObjectProvider = typeSystem.GetType("Portable.Xaml.IRootObjectProvider"), - UriContextProvider = typeSystem.GetType("Portable.Xaml.Markup.IUriContext"), + ProvideValueTarget = typeSystem.GetType("Avalonia.Markup.Xaml.IProvideValueTarget"), + RootObjectProvider = typeSystem.GetType("Avalonia.Markup.Xaml.IRootObjectProvider"), + UriContextProvider = typeSystem.GetType("Avalonia.Markup.Xaml.IUriContext"), ParentStackProvider = typeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.IAvaloniaXamlIlParentStackProvider"), @@ -47,7 +46,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions runtimeHelpers.FindMethod(m => m.Name == "DeferredTransformationFactoryV1"), UsableDuringInitializationAttributes = { - typeSystem.GetType("Portable.Xaml.Markup.UsableDuringInitializationAttribute"), typeSystem.GetType("Avalonia.Metadata.UsableDuringInitializationAttribute"), }, InnerServiceProviderFactoryMethod = @@ -79,15 +77,12 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions void Add(string type, string conv) => AddType(typeSystem.GetType(type), typeSystem.GetType(conv)); - - //Add("Avalonia.AvaloniaProperty","Avalonia.Markup.Xaml.Converters.AvaloniaPropertyTypeConverter"); Add("Avalonia.Media.Imaging.IBitmap","Avalonia.Markup.Xaml.Converters.BitmapTypeConverter"); var ilist = typeSystem.GetType("System.Collections.Generic.IList`1"); AddType(ilist.MakeGenericType(typeSystem.GetType("Avalonia.Point")), typeSystem.GetType("Avalonia.Markup.Xaml.Converters.PointsListTypeConverter")); Add("Avalonia.Controls.Templates.IMemberSelector", "Avalonia.Markup.Xaml.Converters.MemberSelectorTypeConverter"); - Add("Avalonia.Styling.Selector","Avalonia.Markup.Xaml.Converters.SelectorTypeConverter"); Add("Avalonia.Controls.WindowIcon","Avalonia.Markup.Xaml.Converters.IconTypeConverter"); Add("System.Globalization.CultureInfo", "System.ComponentModel.CultureInfoConverter"); Add("System.Uri", "Avalonia.Markup.Xaml.Converters.AvaloniaUriTypeConverter"); diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs index 0e7ea34bb7..629e2562d3 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs @@ -16,8 +16,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers if (!(node is XamlIlAstObjectNode on && on.Type.GetClrType().FullName == "Avalonia.Styling.Setter")) return node; + var parent = context.ParentNodes().OfType() - .FirstOrDefault(x => x.Type.GetClrType().FullName == "Avalonia.Styling.Style"); + .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style"); + if (parent == null) throw new XamlIlParseException( "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node); @@ -53,8 +55,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers .OfType().FirstOrDefault(p => p.Property.GetClrProperty().Name == "Value"); if (valueProperty?.Values?.Count == 1 && valueProperty.Values[0] is XamlIlAstTextNode) { - var propType = avaloniaPropertyNode.Property.Getter?.ReturnType - ?? avaloniaPropertyNode.Property.Setters.First().Parameters[0]; + var propType = avaloniaPropertyNode.AvaloniaPropertyType; if (!XamlIlTransformHelpers.TryGetCorrectlyTypedValue(context, valueProperty.Values[0], propType, out var converted)) throw new XamlIlParseException( diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs index b57c26c241..c054e57380 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs @@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers public IXamlIlType BindingPriority { get; } public IXamlIlType AvaloniaObjectExtensions { get; } public IXamlIlType AvaloniaProperty { get; } + public IXamlIlType AvaloniaPropertyT { get; } public IXamlIlType IBinding { get; } public IXamlIlMethod AvaloniaObjectBindMethod { get; } public IXamlIlMethod AvaloniaObjectSetValueMethod { get; } @@ -26,6 +27,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers IAvaloniaObject = ctx.Configuration.TypeSystem.GetType("Avalonia.IAvaloniaObject"); AvaloniaObjectExtensions = ctx.Configuration.TypeSystem.GetType("Avalonia.AvaloniaObjectExtensions"); AvaloniaProperty = ctx.Configuration.TypeSystem.GetType("Avalonia.AvaloniaProperty"); + AvaloniaPropertyT = ctx.Configuration.TypeSystem.GetType("Avalonia.AvaloniaProperty`1"); BindingPriority = ctx.Configuration.TypeSystem.GetType("Avalonia.Data.BindingPriority"); IBinding = ctx.Configuration.TypeSystem.GetType("Avalonia.Data.IBinding"); IDisposable = ctx.Configuration.TypeSystem.GetType("System.IDisposable"); diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs index 452bb05132..6fc83cb5a5 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs @@ -44,7 +44,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions return true; } - public static XamlIlAvaloniaPropertyNode CreateNode(XamlIlAstTransformationContext context, + public static IXamlIlAvaloniaPropertyNode CreateNode(XamlIlAstTransformationContext context, string propertyName, IXamlIlAstTypeReference selectorTypeReference, IXamlIlLineInfo lineInfo) { XamlIlAstNamePropertyReference forgedReference; @@ -63,8 +63,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions xmlOwner += parsedPropertyName.owner; var tref = XamlIlTypeReferenceResolver.ResolveType(context, xmlOwner, false, lineInfo, true); - forgedReference = new XamlIlAstNamePropertyReference(lineInfo, - tref, parsedPropertyName.name, tref); + + var propertyFieldName = parsedPropertyName.name + "Property"; + var found = tref.Type.GetAllFields() + .FirstOrDefault(f => f.IsStatic && f.IsPublic && f.Name == propertyFieldName); + if (found == null) + throw new XamlIlParseException( + $"Unable to find {propertyFieldName} field on type {tref.Type.GetFullName()}", lineInfo); + return new XamlIlAvaloniaPropertyFieldNode(context.GetAvaloniaTypes(), lineInfo, found); } var clrProperty = @@ -75,13 +81,20 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions clrProperty); } } + + interface IXamlIlAvaloniaPropertyNode : IXamlIlAstValueNode + { + IXamlIlType AvaloniaPropertyType { get; } + } - class XamlIlAvaloniaPropertyNode : XamlIlAstNode, IXamlIlAstValueNode, IXamlIlAstEmitableNode + class XamlIlAvaloniaPropertyNode : XamlIlAstNode, IXamlIlAstValueNode, IXamlIlAstEmitableNode, IXamlIlAvaloniaPropertyNode { public XamlIlAvaloniaPropertyNode(IXamlIlLineInfo lineInfo, IXamlIlType type, XamlIlAstClrProperty property) : base(lineInfo) { Type = new XamlIlAstClrTypeReference(this, type, false); Property = property; + AvaloniaPropertyType = Property.Getter?.ReturnType + ?? Property.Setters.First().Parameters[0]; } public XamlIlAstClrProperty Property { get; } @@ -93,6 +106,46 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions throw new XamlIlLoadException(Property.Name + " is not an AvaloniaProperty", this); return XamlIlNodeEmitResult.Type(0, Type.GetClrType()); } + + public IXamlIlType AvaloniaPropertyType { get; } + } + + class XamlIlAvaloniaPropertyFieldNode : XamlIlAstNode, IXamlIlAstValueNode, IXamlIlAstEmitableNode, IXamlIlAvaloniaPropertyNode + { + private readonly IXamlIlField _field; + + public XamlIlAvaloniaPropertyFieldNode(AvaloniaXamlIlWellKnownTypes types, + IXamlIlLineInfo lineInfo, IXamlIlField field) : base(lineInfo) + { + _field = field; + var avaloniaPropertyType = field.FieldType; + while (avaloniaPropertyType != null) + { + if (avaloniaPropertyType.GenericTypeDefinition?.Equals(types.AvaloniaPropertyT) == true) + { + AvaloniaPropertyType = avaloniaPropertyType.GenericArguments[0]; + return; + } + + avaloniaPropertyType = avaloniaPropertyType.BaseType; + } + + throw new XamlIlParseException( + $"{field.Name}'s type {field.FieldType} doesn't inherit from AvaloniaProperty, make sure to use typed properties", + lineInfo); + + } + + + + public IXamlIlAstTypeReference Type => new XamlIlAstClrTypeReference(this, _field.FieldType, false); + public XamlIlNodeEmitResult Emit(XamlIlEmitContext context, IXamlIlEmitter codeGen) + { + codeGen.Ldsfld(_field); + return XamlIlNodeEmitResult.Type(0, _field.FieldType); + } + + public IXamlIlType AvaloniaPropertyType { get; } } interface IXamlIlAvaloniaProperty diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs index 70b7fe6aec..2d8ea643ac 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/Runtime/XamlIlRuntimeHelpers.cs @@ -4,8 +4,6 @@ using System.Linq; using System.Reflection; using Avalonia.Controls; using Avalonia.Data; -using Portable.Xaml; -using Portable.Xaml.Markup; // ReSharper disable UnusedMember.Global // ReSharper disable UnusedParameter.Global diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlTypes.cs b/src/Markup/Avalonia.Markup.Xaml/XamlTypes.cs new file mode 100644 index 0000000000..06cc85101a --- /dev/null +++ b/src/Markup/Avalonia.Markup.Xaml/XamlTypes.cs @@ -0,0 +1,34 @@ +using System; + +namespace Avalonia.Markup.Xaml +{ + public interface IProvideValueTarget + { + object TargetObject { get; } + object TargetProperty { get; } + } + + public interface IRootObjectProvider + { + object RootObject { get; } + } + + public interface IUriContext + { + Uri BaseUri { get; set; } + } + + public interface IXamlTypeResolver + { + Type Resolve (string qualifiedTypeName); + } + + + public class ConstructorArgumentAttribute : Attribute + { + public ConstructorArgumentAttribute(string name) + { + + } + } +} diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs index b701e60660..eb7b65cdce 100644 --- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs +++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs @@ -28,7 +28,7 @@ namespace Avalonia.Skia // Replace 0 characters with zero-width spaces (200B) Text = Text.Replace((char)0, (char)0x200B); - SKTypeface skiaTypeface = TypefaceCache.Default; + SKTypeface skiaTypeface = null; if (typeface.FontFamily.Key != null) { @@ -45,7 +45,7 @@ namespace Avalonia.Skia familyName, typeface.Style, typeface.Weight); - if (skiaTypeface != TypefaceCache.Default) break; + if (skiaTypeface.FamilyName != TypefaceCache.DefaultFamilyName) break; } } else diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs index 17c51dbb6e..17448127b0 100644 --- a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs +++ b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs @@ -47,7 +47,7 @@ namespace Avalonia.Skia if (!_fontFamilies.TryGetValue(typeface.FontFamily.Name, out var fontFamily)) { - return TypefaceCache.Default; + return TypefaceCache.GetTypeface(TypefaceCache.DefaultFamilyName, typeface.Style, typeface.Weight); } var weight = (SKFontStyleWeight)typeface.Weight; diff --git a/src/Skia/Avalonia.Skia/TypefaceCache.cs b/src/Skia/Avalonia.Skia/TypefaceCache.cs index 94b9e89962..9e270114d2 100644 --- a/src/Skia/Avalonia.Skia/TypefaceCache.cs +++ b/src/Skia/Avalonia.Skia/TypefaceCache.cs @@ -12,8 +12,10 @@ namespace Avalonia.Skia /// internal static class TypefaceCache { - public static SKTypeface Default = CreateDefaultTypeface(); - static readonly Dictionary> Cache = new Dictionary>(); + public static readonly string DefaultFamilyName = CreateDefaultFamilyName(); + + private static readonly Dictionary> s_cache = + new Dictionary>(); struct FontKey { @@ -49,26 +51,26 @@ namespace Avalonia.Skia // Equals and GetHashCode ommitted } - private static SKTypeface CreateDefaultTypeface() + private static string CreateDefaultFamilyName() { - var defaultTypeface = SKTypeface.FromFamilyName(FontFamily.Default.Name) ?? SKTypeface.FromFamilyName(null); + var defaultTypeface = SKTypeface.CreateDefault(); - return defaultTypeface; + return defaultTypeface.FamilyName; } private static SKTypeface GetTypeface(string name, FontKey key) { var familyKey = name; - if (!Cache.TryGetValue(familyKey, out var entry)) + if (!s_cache.TryGetValue(familyKey, out var entry)) { - Cache[familyKey] = entry = new Dictionary(); + s_cache[familyKey] = entry = new Dictionary(); } if (!entry.TryGetValue(key, out var typeface)) { - typeface = SKTypeface.FromFamilyName(familyKey, key.Weight, SKFontStyleWidth.Normal, key.Slant) - ?? Default; + typeface = SKTypeface.FromFamilyName(familyKey, key.Weight, SKFontStyleWidth.Normal, key.Slant) ?? + GetTypeface(DefaultFamilyName, key); entry[key] = typeface; } @@ -78,7 +80,7 @@ namespace Avalonia.Skia public static SKTypeface GetTypeface(string name, FontStyle style, FontWeight weight) { - SKFontStyleSlant skStyle = SKFontStyleSlant.Upright; + var skStyle = SKFontStyleSlant.Upright; switch (style) { @@ -93,6 +95,5 @@ namespace Avalonia.Skia return GetTypeface(name, new FontKey((SKFontStyleWeight)weight, skStyle)); } - } } diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs index 20b2ac5d9d..994804e9e1 100644 --- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs @@ -26,11 +26,26 @@ namespace Avalonia.Controls.UnitTests }; var root = new TestRoot { Child = target }; - Assert.False(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); command.IsEnabled = true; - Assert.True(target.IsEnabled); + Assert.True(target.IsEffectivelyEnabled); command.IsEnabled = false; - Assert.False(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + } + + [Fact] + public void Button_Is_Disabled_When_Command_Is_Enabled_But_IsEnabled_Is_False() + { + var command = new TestCommand(true); + var target = new Button + { + IsEnabled = false, + Command = command, + }; + + var root = new TestRoot { Child = target }; + + Assert.False(((IInputElement)target).IsEffectivelyEnabled); } [Fact] @@ -41,7 +56,8 @@ namespace Avalonia.Controls.UnitTests [!Button.CommandProperty] = new Binding("Command"), }; - Assert.False(target.IsEnabled); + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); } [Fact] @@ -59,8 +75,12 @@ namespace Avalonia.Controls.UnitTests }; Assert.True(target.IsEnabled); + Assert.True(target.IsEffectivelyEnabled); + target.DataContext = null; - Assert.False(target.IsEnabled); + + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); } [Fact] @@ -77,9 +97,13 @@ namespace Avalonia.Controls.UnitTests [!Button.CommandProperty] = new Binding("Command"), }; - Assert.False(target.IsEnabled); + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + target.DataContext = viewModel; + Assert.True(target.IsEnabled); + Assert.True(target.IsEffectivelyEnabled); } [Fact] @@ -96,9 +120,13 @@ namespace Avalonia.Controls.UnitTests [!Button.CommandProperty] = new Binding("Command"), }; - Assert.False(target.IsEnabled); + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + target.DataContext = viewModel; - Assert.False(target.IsEnabled); + + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); } [Fact] diff --git a/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs index 32d154249c..34371916df 100644 --- a/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs +++ b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Text; using System.Windows.Input; +using Avalonia.Data; +using Avalonia.Input; using Avalonia.UnitTests; using Xunit; @@ -25,6 +27,103 @@ namespace Avalonia.Controls.UnitTests Assert.False(target.Focusable); } + + [Fact] + public void MenuItem_Is_Disabled_When_Command_Is_Enabled_But_IsEnabled_Is_False() + { + var command = new TestCommand(true); + var target = new MenuItem + { + IsEnabled = false, + Command = command, + }; + + var root = new TestRoot { Child = target }; + + Assert.False(((IInputElement)target).IsEffectivelyEnabled); + } + + [Fact] + public void MenuItem_Is_Disabled_When_Bound_Command_Doesnt_Exist() + { + var target = new MenuItem + { + [!MenuItem.CommandProperty] = new Binding("Command"), + }; + + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + } + + [Fact] + public void MenuItem_Is_Disabled_When_Bound_Command_Is_Removed() + { + var viewModel = new + { + Command = new TestCommand(true), + }; + + var target = new MenuItem + { + DataContext = viewModel, + [!MenuItem.CommandProperty] = new Binding("Command"), + }; + + Assert.True(target.IsEnabled); + Assert.True(target.IsEffectivelyEnabled); + + target.DataContext = null; + + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + } + + [Fact] + public void MenuItem_Is_Enabled_When_Bound_Command_Is_Added() + { + var viewModel = new + { + Command = new TestCommand(true), + }; + + var target = new MenuItem + { + DataContext = new object(), + [!MenuItem.CommandProperty] = new Binding("Command"), + }; + + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + + target.DataContext = viewModel; + + Assert.True(target.IsEnabled); + Assert.True(target.IsEffectivelyEnabled); + } + + [Fact] + public void MenuItem_Is_Disabled_When_Disabled_Bound_Command_Is_Added() + { + var viewModel = new + { + Command = new TestCommand(false), + }; + + var target = new MenuItem + { + DataContext = new object(), + [!MenuItem.CommandProperty] = new Binding("Command"), + }; + + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + + target.DataContext = viewModel; + + Assert.True(target.IsEnabled); + Assert.False(target.IsEffectivelyEnabled); + } + [Fact] public void MenuItem_Does_Not_Subscribe_To_Command_CanExecuteChanged_Until_Added_To_Logical_Tree() { @@ -60,8 +159,14 @@ namespace Avalonia.Controls.UnitTests private class TestCommand : ICommand { + private bool _enabled; private EventHandler _canExecuteChanged; + public TestCommand(bool enabled = true) + { + _enabled = enabled; + } + public int SubscriptionCount { get; private set; } public event EventHandler CanExecuteChanged @@ -70,7 +175,7 @@ namespace Avalonia.Controls.UnitTests remove { _canExecuteChanged -= value; --SubscriptionCount; } } - public bool CanExecute(object parameter) => true; + public bool CanExecute(object parameter) => _enabled; public void Execute(object parameter) { diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs index 9921a8de6c..97d57e9eb6 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs @@ -15,6 +15,7 @@ using Avalonia.Input; using Avalonia.Layout; using Avalonia.Platform; using Avalonia.Rendering; +using Avalonia.Styling; using Avalonia.UnitTests; using Xunit; @@ -756,6 +757,80 @@ namespace Avalonia.Controls.UnitTests.Presenters Assert.Same(target.Panel.Children[9].DataContext, last); } + [Fact] + public void Scrolling_Less_Than_A_Page_Should_Move_Recycled_Items() + { + var target = CreateTarget(); + var items = (IList)target.Items; + + target.ApplyTemplate(); + target.Measure(new Size(100, 100)); + target.Arrange(new Rect(0, 0, 100, 100)); + + var containers = target.Panel.Children.ToList(); + var scroller = (ScrollContentPresenter)target.Parent; + + scroller.Offset = new Vector(0, 5); + + var scrolledContainers = containers + .Skip(5) + .Take(5) + .Concat(containers.Take(5)).ToList(); + + Assert.Equal(new Vector(0, 5), ((ILogicalScrollable)target).Offset); + Assert.Equal(scrolledContainers, target.Panel.Children); + + for (var i = 0; i < target.Panel.Children.Count; ++i) + { + Assert.Equal(items[i + 5], target.Panel.Children[i].DataContext); + } + + scroller.Offset = new Vector(0, 0); + Assert.Equal(new Vector(0, 0), ((ILogicalScrollable)target).Offset); + Assert.Equal(containers, target.Panel.Children); + + var dcs = target.Panel.Children.Select(x => x.DataContext).ToList(); + + for (var i = 0; i < target.Panel.Children.Count; ++i) + { + Assert.Equal(items[i], target.Panel.Children[i].DataContext); + } + } + + [Fact] + public void Scrolling_More_Than_A_Page_Should_Recycle_Items() + { + var target = CreateTarget(itemCount: 50); + var items = (IList)target.Items; + + target.ApplyTemplate(); + target.Measure(new Size(100, 100)); + target.Arrange(new Rect(0, 0, 100, 100)); + + var containers = target.Panel.Children.ToList(); + var scroller = (ScrollContentPresenter)target.Parent; + + scroller.Offset = new Vector(0, 20); + + Assert.Equal(new Vector(0, 20), ((ILogicalScrollable)target).Offset); + Assert.Equal(containers, target.Panel.Children); + + for (var i = 0; i < target.Panel.Children.Count; ++i) + { + Assert.Equal(items[i + 20], target.Panel.Children[i].DataContext); + } + + scroller.Offset = new Vector(0, 0); + + Assert.Equal(new Vector(0, 0), ((ILogicalScrollable)target).Offset); + Assert.Equal(containers, target.Panel.Children); + + for (var i = 0; i < target.Panel.Children.Count; ++i) + { + Assert.Equal(items[i], target.Panel.Children[i].DataContext); + } + } + public class Vertical { [Fact] @@ -941,86 +1016,8 @@ namespace Avalonia.Controls.UnitTests.Presenters } } - public class WithContainers - { - [Fact] - public void Scrolling_Less_Than_A_Page_Should_Move_Recycled_Items() - { - var target = CreateTarget(); - var items = (IList)target.Items; - - target.ApplyTemplate(); - target.Measure(new Size(100, 100)); - target.Arrange(new Rect(0, 0, 100, 100)); - - var containers = target.Panel.Children.ToList(); - var scroller = (ScrollContentPresenter)target.Parent; - - scroller.Offset = new Vector(0, 5); - - var scrolledContainers = containers - .Skip(5) - .Take(5) - .Concat(containers.Take(5)).ToList(); - - Assert.Equal(new Vector(0, 5), ((ILogicalScrollable)target).Offset); - Assert.Equal(scrolledContainers, target.Panel.Children); - - for (var i = 0; i < target.Panel.Children.Count; ++i) - { - Assert.Equal(items[i + 5], target.Panel.Children[i].DataContext); - } - - scroller.Offset = new Vector(0, 0); - Assert.Equal(new Vector(0, 0), ((ILogicalScrollable)target).Offset); - Assert.Equal(containers, target.Panel.Children); - - var dcs = target.Panel.Children.Select(x => x.DataContext).ToList(); - - for (var i = 0; i < target.Panel.Children.Count; ++i) - { - Assert.Equal(items[i], target.Panel.Children[i].DataContext); - } - } - - [Fact] - public void Scrolling_More_Than_A_Page_Should_Recycle_Items() - { - var target = CreateTarget(itemCount: 50); - var items = (IList)target.Items; - - target.ApplyTemplate(); - target.Measure(new Size(100, 100)); - target.Arrange(new Rect(0, 0, 100, 100)); - - var containers = target.Panel.Children.ToList(); - var scroller = (ScrollContentPresenter)target.Parent; - - scroller.Offset = new Vector(0, 20); - - Assert.Equal(new Vector(0, 20), ((ILogicalScrollable)target).Offset); - Assert.Equal(containers, target.Panel.Children); - - for (var i = 0; i < target.Panel.Children.Count; ++i) - { - Assert.Equal(items[i + 20], target.Panel.Children[i].DataContext); - } - - scroller.Offset = new Vector(0, 0); - - Assert.Equal(new Vector(0, 0), ((ILogicalScrollable)target).Offset); - Assert.Equal(containers, target.Panel.Children); - - for (var i = 0; i < target.Panel.Children.Count; ++i) - { - Assert.Equal(items[i], target.Panel.Children[i].DataContext); - } - } - } - private static ItemsPresenter CreateTarget( Orientation orientation = Orientation.Vertical, - bool useContainers = true, int itemCount = 20, bool useAvaloniaList = false) { @@ -1034,11 +1031,11 @@ namespace Avalonia.Controls.UnitTests.Presenters { CanHorizontallyScroll = true, CanVerticallyScroll = true, - Content = result = new TestItemsPresenter(useContainers) + Content = result = new TestItemsPresenter { Items = items, ItemsPanel = VirtualizingPanelTemplate(orientation), - ItemTemplate = ItemTemplate(), + DataTemplates = { StringDataTemplate() }, VirtualizationMode = ItemVirtualizationMode.Simple, } }; @@ -1047,7 +1044,7 @@ namespace Avalonia.Controls.UnitTests.Presenters return result; } - private static IDataTemplate ItemTemplate() + private static IDataTemplate StringDataTemplate() { return new FuncDataTemplate(x => new Canvas { @@ -1065,7 +1062,7 @@ namespace Avalonia.Controls.UnitTests.Presenters }); } - private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot + private class TestScroller : ScrollContentPresenter, IRenderRoot, ILayoutRoot, IStyleRoot { public IRenderer Renderer { get; } public Size ClientSize { get; } @@ -1085,18 +1082,12 @@ namespace Avalonia.Controls.UnitTests.Presenters private class TestItemsPresenter : ItemsPresenter { - private bool _useContainers; - - public TestItemsPresenter(bool useContainers) - { - _useContainers = useContainers; - } - protected override IItemContainerGenerator CreateItemContainerGenerator() { - return _useContainers ? - new ItemContainerGenerator(this, TestContainer.ContentProperty, null) : - new ItemContainerGenerator(this); + return new ItemContainerGenerator( + this, + TestContainer.ContentProperty, + null); } } @@ -1104,8 +1095,12 @@ namespace Avalonia.Controls.UnitTests.Presenters { public TestContainer() { - Width = 10; - Height = 10; + Template = new FuncControlTemplate(parent => new ContentPresenter + { + Name = "PART_ContentPresenter", + [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty], + [~ContentPresenter.ContentTemplateProperty] = parent[~ContentControl.ContentTemplateProperty], + }); } } } diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs index 9b62509138..932aada64e 100644 --- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs @@ -401,6 +401,56 @@ namespace Avalonia.Controls.UnitTests } } + [Fact] + public void TextBox_GotFocus_And_LostFocus_Work_Properly() + { + using (UnitTestApplication.Start(FocusServices)) + { + var target1 = new TextBox + { + Template = CreateTemplate(), + Text = "1234" + }; + var target2 = new TextBox + { + Template = CreateTemplate(), + Text = "5678" + }; + var sp = new StackPanel(); + sp.Children.Add(target1); + sp.Children.Add(target2); + + target1.ApplyTemplate(); + target2.ApplyTemplate(); + + var root = new TestRoot { Child = sp }; + + var gfcount = 0; + var lfcount = 0; + + target1.GotFocus += (s, e) => gfcount++; + target2.LostFocus += (s, e) => lfcount++; + + target2.Focus(); + Assert.False(target1.IsFocused); + Assert.True(target2.IsFocused); + + target1.Focus(); + Assert.False(target2.IsFocused); + Assert.True(target1.IsFocused); + + Assert.Equal(1, gfcount); + Assert.Equal(1, lfcount); + } + } + + private static TestServices FocusServices => TestServices.MockThreadingInterface.With( + focusManager: new FocusManager(), + keyboardDevice: () => new KeyboardDevice(), + keyboardNavigation: new KeyboardNavigationHandler(), + inputManager: new InputManager(), + standardCursorFactory: Mock.Of()); + private static TestServices Services => TestServices.MockThreadingInterface.With( standardCursorFactory: Mock.Of()); diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml b/tests/Avalonia.DesignerSupport.TestApp/App.xaml index 214bcd8797..56c0e8059a 100644 --- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml +++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml @@ -1,6 +1,8 @@ - + - \ No newline at end of file + diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj index ebe64b89ce..6bba5e7348 100644 --- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj +++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj @@ -31,6 +31,6 @@ - + diff --git a/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml b/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml index 6938bd8c49..f90e5beaa6 100644 --- a/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml +++ b/tests/Avalonia.DesignerSupport.TestApp/MainWindow.xaml @@ -1,5 +1,7 @@  + Title="TESTAPP" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + x:Class="Avalonia.DesignerSupport.TestApp.MainWindow">