From 1707496b3f6adb5fa1c28f7edc89315b4ec3fdb7 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Sat, 29 Jun 2019 16:49:05 +0300 Subject: [PATCH 01/43] Add `Add`, `Remove` buttons and `SelectionMode` combobox to ListBoxPage.xaml --- samples/ControlCatalog/Pages/ListBoxPage.xaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml b/samples/ControlCatalog/Pages/ListBoxPage.xaml index 4783c8cfb8..e7c81a28d4 100644 --- a/samples/ControlCatalog/Pages/ListBoxPage.xaml +++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml @@ -9,7 +9,20 @@ Margin="0,16,0,0" HorizontalAlignment="Center" Spacing="16"> - + + + + + + + + + Single + Multiple + Toggle + AlwaysSelected + + From c3f0841142cd253c6b97ae31f9fbf965b472b9e7 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Sat, 29 Jun 2019 16:50:14 +0300 Subject: [PATCH 02/43] Implement functionality for added controls in ListBoxPage.xaml.cs --- .../ControlCatalog/Pages/ListBoxPage.xaml.cs | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs index dbe6c74800..e1a615af4b 100644 --- a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs +++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs @@ -1,9 +1,9 @@ -using System; -using System.Collections; -using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; +using System.Reactive; using Avalonia.Controls; using Avalonia.Markup.Xaml; +using ReactiveUI; namespace ControlCatalog.Pages { @@ -11,9 +11,8 @@ namespace ControlCatalog.Pages { public ListBoxPage() { - this.InitializeComponent(); - DataContext = Enumerable.Range(1, 10).Select(i => $"Item {i}" ) - .ToArray(); + InitializeComponent(); + DataContext = new PageViewModel(this.Find("listBox")); } private void InitializeComponent() @@ -21,5 +20,46 @@ namespace ControlCatalog.Pages AvaloniaXamlLoader.Load(this); } + private class PageViewModel : ReactiveObject + { + private readonly ListBox _listBox; + private int _counter; + private SelectionMode _selectionMode; + + public PageViewModel(ListBox listBox) + { + _listBox = listBox; + + Items = new ObservableCollection(Enumerable.Range(1, 10).Select(i => GenerateItem())); + + AddItemCommand = ReactiveCommand.Create(() => Items.Add(GenerateItem())); + + RemoveItemCommand = ReactiveCommand.Create(() => + { + foreach (string selectedItem in listBox.SelectedItems) + { + Items.Remove(selectedItem); + } + }); + } + + public ObservableCollection Items { get; } + + public ReactiveCommand AddItemCommand { get; } + + public ReactiveCommand RemoveItemCommand { get; } + + public SelectionMode SelectionMode + { + get => _selectionMode; + set + { + _listBox.SelectedItems.Clear(); + this.RaiseAndSetIfChanged(ref _selectionMode, value); + } + } + + private string GenerateItem() => $"Item {_counter++}"; + } } } From 9e874529c6ef747105b76f1ed66f50b3579efcce Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Sat, 29 Jun 2019 18:40:51 +0300 Subject: [PATCH 03/43] Add `Add`, `Remove` buttons and `SelectionMode` combobox to TreeViewPage.xaml --- .../ControlCatalog/Pages/TreeViewPage.xaml | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml b/samples/ControlCatalog/Pages/TreeViewPage.xaml index c03edb8b03..1b01a38c60 100644 --- a/samples/ControlCatalog/Pages/TreeViewPage.xaml +++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml @@ -6,16 +6,29 @@ Displays a hierachical tree of data. - - - - - - - + Margin="0,16,0,0" + HorizontalAlignment="Center" + Spacing="16"> + + + + + + + + + + + + + + + Single + Multiple + Toggle + AlwaysSelected + + From 6f58bb0e392081739453ac2fef67c93552b5fa55 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Sat, 29 Jun 2019 18:41:29 +0300 Subject: [PATCH 04/43] Implement functionality for added controls in TreeViewPage.xaml.cs --- .../ControlCatalog/Pages/ListBoxPage.xaml.cs | 2 +- .../ControlCatalog/Pages/TreeViewPage.xaml.cs | 93 +++++++++++++++++-- 2 files changed, 85 insertions(+), 10 deletions(-) diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs index e1a615af4b..d6d48cd030 100644 --- a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs +++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs @@ -36,7 +36,7 @@ namespace ControlCatalog.Pages RemoveItemCommand = ReactiveCommand.Create(() => { - foreach (string selectedItem in listBox.SelectedItems) + foreach (string selectedItem in _listBox.SelectedItems) { Items.Remove(selectedItem); } diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs index a83f9cf43f..cf6aa50db7 100644 --- a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs +++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs @@ -1,8 +1,9 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; +using System.Reactive; using Avalonia.Controls; using Avalonia.Markup.Xaml; +using ReactiveUI; namespace ControlCatalog.Pages { @@ -10,8 +11,8 @@ namespace ControlCatalog.Pages { public TreeViewPage() { - this.InitializeComponent(); - DataContext = new Node().Children; + InitializeComponent(); + DataContext = new PageViewModel(this.Find("treeView")); } private void InitializeComponent() @@ -19,22 +20,96 @@ namespace ControlCatalog.Pages AvaloniaXamlLoader.Load(this); } - public class Node + private class PageViewModel : ReactiveObject { - private IList _children; + private readonly TreeView _treeView; + private SelectionMode _selectionMode; + + public PageViewModel(TreeView treeView) + { + _treeView = treeView; + + Node root = new Node(); + Items = root.Children; + + AddItemCommand = ReactiveCommand.Create(() => + { + Node selectedItem = _treeView.SelectedItems.Count > 0 ? (Node)_treeView.SelectedItems[0] : root; + selectedItem.AddNewItem(); + }); + + RemoveItemCommand = ReactiveCommand.Create(() => + { + foreach (Node selectedItem in _treeView.SelectedItems) + { + RecursiveRemove(Items, selectedItem); + } + + _treeView.SelectedItems.Clear(); + + bool RecursiveRemove(ObservableCollection items, Node selectedItem) + { + if (items.Remove(selectedItem)) + { + return true; + } + + foreach (Node item in items) + { + if (item.AreChildrenInitialized && RecursiveRemove(item.Children, selectedItem)) + { + return true; + } + } + + return false; + } + }); + } + + public ObservableCollection Items { get; } + + public ReactiveCommand AddItemCommand { get; } + + public ReactiveCommand RemoveItemCommand { get; } + + public SelectionMode SelectionMode + { + get => _selectionMode; + set + { + _treeView.SelectedItems.Clear(); + this.RaiseAndSetIfChanged(ref _selectionMode, value); + } + } + } + + private class Node + { + private int _counter; + private ObservableCollection _children; + public string Header { get; private set; } - public IList Children + + public bool AreChildrenInitialized => _children != null; + + public ObservableCollection Children { get { if (_children == null) { - _children = Enumerable.Range(1, 10).Select(i => new Node() {Header = $"Item {i}"}) - .ToArray(); + _children = new ObservableCollection(Enumerable.Range(1, 10).Select(i => CreateNewNode())); } return _children; } } + + public void AddNewItem() => Children.Add(CreateNewNode()); + + public override string ToString() => Header; + + private Node CreateNewNode() => new Node {Header = $"Item {_counter++}"}; } } } From df6068604b69270f14c785465a7a703e9da3ed73 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Sat, 29 Jun 2019 23:10:13 +0300 Subject: [PATCH 05/43] Fix @Gillibald review notes: get rid of passing control to viewmodel, use binding instead --- samples/ControlCatalog/Pages/ListBoxPage.xaml | 2 +- .../ControlCatalog/Pages/ListBoxPage.xaml.cs | 16 ++++++------- .../ControlCatalog/Pages/TreeViewPage.xaml | 2 +- .../ControlCatalog/Pages/TreeViewPage.xaml.cs | 24 +++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml b/samples/ControlCatalog/Pages/ListBoxPage.xaml index e7c81a28d4..49e9aafc4a 100644 --- a/samples/ControlCatalog/Pages/ListBoxPage.xaml +++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml @@ -10,7 +10,7 @@ HorizontalAlignment="Center" Spacing="16"> - + diff --git a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs index d6d48cd030..8a67766c76 100644 --- a/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs +++ b/samples/ControlCatalog/Pages/ListBoxPage.xaml.cs @@ -12,7 +12,7 @@ namespace ControlCatalog.Pages public ListBoxPage() { InitializeComponent(); - DataContext = new PageViewModel(this.Find("listBox")); + DataContext = new PageViewModel(); } private void InitializeComponent() @@ -22,29 +22,29 @@ namespace ControlCatalog.Pages private class PageViewModel : ReactiveObject { - private readonly ListBox _listBox; private int _counter; private SelectionMode _selectionMode; - public PageViewModel(ListBox listBox) + public PageViewModel() { - _listBox = listBox; - Items = new ObservableCollection(Enumerable.Range(1, 10).Select(i => GenerateItem())); + SelectedItems = new ObservableCollection(); AddItemCommand = ReactiveCommand.Create(() => Items.Add(GenerateItem())); RemoveItemCommand = ReactiveCommand.Create(() => { - foreach (string selectedItem in _listBox.SelectedItems) + while (SelectedItems.Count > 0) { - Items.Remove(selectedItem); + Items.Remove(SelectedItems[0]); } }); } public ObservableCollection Items { get; } + public ObservableCollection SelectedItems { get; } + public ReactiveCommand AddItemCommand { get; } public ReactiveCommand RemoveItemCommand { get; } @@ -54,7 +54,7 @@ namespace ControlCatalog.Pages get => _selectionMode; set { - _listBox.SelectedItems.Clear(); + SelectedItems.Clear(); this.RaiseAndSetIfChanged(ref _selectionMode, value); } } diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml b/samples/ControlCatalog/Pages/TreeViewPage.xaml index 1b01a38c60..3a81e2ed02 100644 --- a/samples/ControlCatalog/Pages/TreeViewPage.xaml +++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml @@ -10,7 +10,7 @@ HorizontalAlignment="Center" Spacing="16"> - + diff --git a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs index cf6aa50db7..1f35f05f1d 100644 --- a/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs +++ b/samples/ControlCatalog/Pages/TreeViewPage.xaml.cs @@ -12,7 +12,7 @@ namespace ControlCatalog.Pages public TreeViewPage() { InitializeComponent(); - DataContext = new PageViewModel(this.Find("treeView")); + DataContext = new PageViewModel(); } private void InitializeComponent() @@ -22,31 +22,29 @@ namespace ControlCatalog.Pages private class PageViewModel : ReactiveObject { - private readonly TreeView _treeView; private SelectionMode _selectionMode; - public PageViewModel(TreeView treeView) + public PageViewModel() { - _treeView = treeView; - Node root = new Node(); Items = root.Children; + SelectedItems = new ObservableCollection(); AddItemCommand = ReactiveCommand.Create(() => { - Node selectedItem = _treeView.SelectedItems.Count > 0 ? (Node)_treeView.SelectedItems[0] : root; - selectedItem.AddNewItem(); + Node parentItem = SelectedItems.Count > 0 ? SelectedItems[0] : root; + parentItem.AddNewItem(); }); RemoveItemCommand = ReactiveCommand.Create(() => { - foreach (Node selectedItem in _treeView.SelectedItems) + while (SelectedItems.Count > 0) { - RecursiveRemove(Items, selectedItem); + Node lastItem = SelectedItems[0]; + RecursiveRemove(Items, lastItem); + SelectedItems.Remove(lastItem); } - _treeView.SelectedItems.Clear(); - bool RecursiveRemove(ObservableCollection items, Node selectedItem) { if (items.Remove(selectedItem)) @@ -69,6 +67,8 @@ namespace ControlCatalog.Pages public ObservableCollection Items { get; } + public ObservableCollection SelectedItems { get; } + public ReactiveCommand AddItemCommand { get; } public ReactiveCommand RemoveItemCommand { get; } @@ -78,7 +78,7 @@ namespace ControlCatalog.Pages get => _selectionMode; set { - _treeView.SelectedItems.Clear(); + SelectedItems.Clear(); this.RaiseAndSetIfChanged(ref _selectionMode, value); } } From 35f64af761bc80e7efbeffd0633c61afb39e95cb Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 10:37:24 +0300 Subject: [PATCH 06/43] Make toplevels responsible of creating popups --- .../Avalonia.Android/AndroidPlatform.cs | 5 --- .../Platform/SkiaPlatform/TopLevelImpl.cs | 2 + .../Offscreen/OffscreenTopLevelImpl.cs | 1 + .../Platform/ITopLevelImpl.cs | 2 + .../Platform/IWindowingPlatform.cs | 1 - .../Platform/PlatformManager.cs | 5 --- src/Avalonia.Controls/Primitives/Popup.cs | 37 +++++++++---------- src/Avalonia.Controls/Primitives/PopupRoot.cs | 8 ++-- src/Avalonia.Controls/ToolTip.cs | 3 +- src/Avalonia.DesignerSupport/Remote/Stubs.cs | 2 + src/Avalonia.Native/AvaloniaNativePlatform.cs | 5 --- src/Avalonia.Native/PopupImpl.cs | 6 +++ src/Avalonia.Native/WindowImpl.cs | 5 +++ src/Avalonia.Native/WindowImplBase.cs | 3 +- src/Avalonia.X11/X11Platform.cs | 7 +--- src/Avalonia.X11/X11Window.cs | 10 +++-- .../FramebufferToplevelImpl.cs | 2 + .../Wpf/WpfTopLevelImpl.cs | 2 + src/Windows/Avalonia.Win32/Win32Platform.cs | 5 --- src/iOS/Avalonia.iOS/TopLevelImpl.cs | 2 + .../Primitives/PopupRootTests.cs | 12 +++--- 21 files changed, 63 insertions(+), 62 deletions(-) diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs index 4e48811c35..c91b58311b 100644 --- a/src/Android/Avalonia.Android/AndroidPlatform.cs +++ b/src/Android/Avalonia.Android/AndroidPlatform.cs @@ -71,10 +71,5 @@ namespace Avalonia.Android { throw new NotSupportedException(); } - - public IPopupImpl CreatePopup() - { - return new PopupImpl(); - } } } diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs index f42faeaa63..0d0d9db252 100644 --- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs +++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs @@ -191,6 +191,8 @@ namespace Avalonia.Android.Platform.SkiaPlatform } } + public IPopupImpl CreatePopup() => null; + ILockedFramebuffer IFramebufferPlatformSurface.Lock()=>new AndroidFramebuffer(_view.Holder.Surface); } } diff --git a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs index 9c53dc0c10..29f0374301 100644 --- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs +++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevelImpl.cs @@ -61,5 +61,6 @@ namespace Avalonia.Controls.Embedding.Offscreen public Action Closed { get; set; } public abstract IMouseDevice MouseDevice { get; } + public IPopupImpl CreatePopup() => null; } } diff --git a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs index 8d8ce35c38..cfbc0b1c4b 100644 --- a/src/Avalonia.Controls/Platform/ITopLevelImpl.cs +++ b/src/Avalonia.Controls/Platform/ITopLevelImpl.cs @@ -107,5 +107,7 @@ namespace Avalonia.Platform /// [CanBeNull] IMouseDevice MouseDevice { get; } + + IPopupImpl CreatePopup(); } } diff --git a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs index 5c2c1a8da3..a55bd63c6a 100644 --- a/src/Avalonia.Controls/Platform/IWindowingPlatform.cs +++ b/src/Avalonia.Controls/Platform/IWindowingPlatform.cs @@ -4,6 +4,5 @@ namespace Avalonia.Platform { IWindowImpl CreateWindow(); IEmbeddableWindowImpl CreateEmbeddableWindow(); - IPopupImpl CreatePopup(); } } diff --git a/src/Avalonia.Controls/Platform/PlatformManager.cs b/src/Avalonia.Controls/Platform/PlatformManager.cs index fa01b9e839..ef453274b8 100644 --- a/src/Avalonia.Controls/Platform/PlatformManager.cs +++ b/src/Avalonia.Controls/Platform/PlatformManager.cs @@ -41,10 +41,5 @@ namespace Avalonia.Controls.Platform throw new Exception("Could not CreateEmbeddableWindow(): IWindowingPlatform is not registered."); return platform.CreateEmbeddableWindow(); } - - public static IPopupImpl CreatePopup() - { - return AvaloniaLocator.Current.GetService().CreatePopup(); - } } } diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index 058658357f..895094eded 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -218,9 +218,16 @@ namespace Avalonia.Controls.Primitives /// public void Open() { + if (PlacementTarget == null) + throw new InvalidOperationException("It's not valid to show a popup without a PlacementTarget"); + + + if (_topLevel == null && PlacementTarget != null) + _topLevel = PlacementTarget.GetSelfAndLogicalAncestors().First(x => x is TopLevel) as TopLevel; + if (_popupRoot == null) { - _popupRoot = new PopupRoot(DependencyResolver) + _popupRoot = new PopupRoot(_topLevel, DependencyResolver) { [~ContentControl.ContentProperty] = this[~ChildProperty], [~WidthProperty] = this[~WidthProperty], @@ -236,30 +243,22 @@ namespace Avalonia.Controls.Primitives _popupRoot.Position = GetPosition(); - if (_topLevel == null && PlacementTarget != null) + var window = _topLevel as Window; + if (window != null) { - _topLevel = PlacementTarget.GetSelfAndLogicalAncestors().First(x => x is TopLevel) as TopLevel; + window.Deactivated += WindowDeactivated; } - - if (_topLevel != null) + else { - var window = _topLevel as Window; - if (window != null) + var parentPopuproot = _topLevel as PopupRoot; + if (parentPopuproot?.Parent is Popup popup) { - window.Deactivated += WindowDeactivated; + popup.Closed += ParentClosed; } - else - { - var parentPopuproot = _topLevel as PopupRoot; - if (parentPopuproot?.Parent is Popup popup) - { - popup.Closed += ParentClosed; - } - } - _topLevel.AddHandler(PointerPressedEvent, PointerPressedOutside, RoutingStrategies.Tunnel); - _nonClientListener = InputManager.Instance.Process.Subscribe(ListenForNonClientClick); } - + _topLevel.AddHandler(PointerPressedEvent, PointerPressedOutside, RoutingStrategies.Tunnel); + _nonClientListener = InputManager.Instance.Process.Subscribe(ListenForNonClientClick); + PopupRootCreated?.Invoke(this, EventArgs.Empty); _popupRoot.Show(); diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index d2e8f1ab92..47863932d1 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -31,8 +31,8 @@ namespace Avalonia.Controls.Primitives /// /// Initializes a new instance of the class. /// - public PopupRoot() - : this(null) + public PopupRoot(TopLevel parent) + : this(parent, null) { } @@ -42,8 +42,8 @@ namespace Avalonia.Controls.Primitives /// /// The dependency resolver to use. If null the default dependency resolver will be used. /// - public PopupRoot(IAvaloniaDependencyResolver dependencyResolver) - : base(PlatformManager.CreatePopup(), dependencyResolver) + public PopupRoot(TopLevel parent, IAvaloniaDependencyResolver dependencyResolver) + : base(parent.PlatformImpl.CreatePopup(), dependencyResolver) { } diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs index 28d1ba5e0f..8c23f4abdc 100644 --- a/src/Avalonia.Controls/ToolTip.cs +++ b/src/Avalonia.Controls/ToolTip.cs @@ -4,6 +4,7 @@ using System; using System.Reactive.Linq; using Avalonia.Controls.Primitives; +using Avalonia.VisualTree; namespace Avalonia.Controls { @@ -234,7 +235,7 @@ namespace Avalonia.Controls { Close(); - _popup = new PopupRoot { Content = this, }; + _popup = new PopupRoot((TopLevel)control.GetVisualRoot()) {Content = this}; ((ISetLogicalParent)_popup).SetParent(control); _popup.Position = Popup.GetPosition(control, GetPlacement(control), _popup, GetHorizontalOffset(control), GetVerticalOffset(control)); diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs index 9c547279d6..ddb8b62b6a 100644 --- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs +++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs @@ -29,6 +29,8 @@ namespace Avalonia.DesignerSupport.Remote public Func Closing { get; set; } public Action Closed { get; set; } public IMouseDevice MouseDevice { get; } = new MouseDevice(); + public IPopupImpl CreatePopup() => null; + public PixelPoint Position { get; set; } public Action PositionChanged { get; set; } public WindowState WindowState { get; set; } diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs index adb27d348d..edde2176bd 100644 --- a/src/Avalonia.Native/AvaloniaNativePlatform.cs +++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs @@ -97,11 +97,6 @@ namespace Avalonia.Native { throw new NotImplementedException(); } - - public IPopupImpl CreatePopup() - { - return new PopupImpl(_factory, _options); - } } public class AvaloniaNativeMacOptions diff --git a/src/Avalonia.Native/PopupImpl.cs b/src/Avalonia.Native/PopupImpl.cs index a470caa80e..976208b058 100644 --- a/src/Avalonia.Native/PopupImpl.cs +++ b/src/Avalonia.Native/PopupImpl.cs @@ -9,8 +9,12 @@ namespace Avalonia.Native { public class PopupImpl : WindowBaseImpl, IPopupImpl { + private readonly IAvaloniaNativeFactory _factory; + private readonly AvaloniaNativePlatformOptions _opts; public PopupImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts) : base(opts) { + _factory = factory; + _opts = opts; using (var e = new PopupEvents(this)) { Init(factory.CreatePopup(e), factory.CreateScreens()); @@ -35,5 +39,7 @@ namespace Avalonia.Native { } } + + public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts); } } diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs index 076fe9ccae..c7857898d2 100644 --- a/src/Avalonia.Native/WindowImpl.cs +++ b/src/Avalonia.Native/WindowImpl.cs @@ -11,9 +11,13 @@ namespace Avalonia.Native { public class WindowImpl : WindowBaseImpl, IWindowImpl { + private readonly IAvaloniaNativeFactory _factory; + private readonly AvaloniaNativePlatformOptions _opts; IAvnWindow _native; public WindowImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts) : base(opts) { + _factory = factory; + _opts = opts; using (var e = new WindowEvents(this)) { Init(_native = factory.CreateWindow(e), factory.CreateScreens()); @@ -100,5 +104,6 @@ namespace Avalonia.Native } public Func Closing { get; set; } + public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts); } } diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs index 638879ba14..ae0a2f535b 100644 --- a/src/Avalonia.Native/WindowImplBase.cs +++ b/src/Avalonia.Native/WindowImplBase.cs @@ -15,7 +15,7 @@ using Avalonia.Threading; namespace Avalonia.Native { - public class WindowBaseImpl : IWindowBaseImpl, + public abstract class WindowBaseImpl : IWindowBaseImpl, IFramebufferPlatformSurface { IInputRoot _inputRoot; @@ -91,6 +91,7 @@ namespace Avalonia.Native public Action Resized { get; set; } public Action Closed { get; set; } public IMouseDevice MouseDevice => AvaloniaNativePlatform.MouseDevice; + public abstract IPopupImpl CreatePopup(); class FramebufferWrapper : ILockedFramebuffer diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs index 7bdc61eb28..9bdcaab82b 100644 --- a/src/Avalonia.X11/X11Platform.cs +++ b/src/Avalonia.X11/X11Platform.cs @@ -74,18 +74,13 @@ namespace Avalonia.X11 public IntPtr Display { get; set; } public IWindowImpl CreateWindow() { - return new X11Window(this, false); + return new X11Window(this, null); } public IEmbeddableWindowImpl CreateEmbeddableWindow() { throw new NotSupportedException(); } - - public IPopupImpl CreatePopup() - { - return new X11Window(this, true); - } } } diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs index 18c23aa31e..a1e386892b 100644 --- a/src/Avalonia.X11/X11Window.cs +++ b/src/Avalonia.X11/X11Window.cs @@ -21,6 +21,7 @@ namespace Avalonia.X11 unsafe class X11Window : IWindowImpl, IPopupImpl, IXI2Client { private readonly AvaloniaX11Platform _platform; + private readonly IWindowImpl _popupParent; private readonly bool _popup; private readonly X11Info _x11; private bool _invalidated; @@ -47,10 +48,10 @@ namespace Avalonia.X11 private readonly Queue _inputQueue = new Queue(); private InputEventContainer _lastEvent; private bool _useRenderWindow = false; - public X11Window(AvaloniaX11Platform platform, bool popup) + public X11Window(AvaloniaX11Platform platform, IWindowImpl popupParent) { _platform = platform; - _popup = popup; + _popup = popupParent != null; _x11 = platform.Info; _mouse = platform.MouseDevice; _keyboard = platform.KeyboardDevice; @@ -66,7 +67,7 @@ namespace Avalonia.X11 | SetWindowValuemask.BackPixmap | SetWindowValuemask.BackingStore | SetWindowValuemask.BitGravity | SetWindowValuemask.WinGravity; - if (popup) + if (_popup) { attr.override_redirect = true; valueMask |= SetWindowValuemask.OverrideRedirect; @@ -793,7 +794,8 @@ namespace Avalonia.X11 } public IMouseDevice MouseDevice => _mouse; - + public IPopupImpl CreatePopup() => new X11Window(_platform, this); + public void Activate() { if (_x11.Atoms._NET_ACTIVE_WINDOW != IntPtr.Zero) diff --git a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs index 5e2ba51caf..ebaad81fa1 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs @@ -59,6 +59,8 @@ namespace Avalonia.LinuxFramebuffer public Size ClientSize => ScaledSize; public IMouseDevice MouseDevice => new MouseDevice(); + public IPopupImpl CreatePopup() => null; + public double Scaling => 1; public IEnumerable Surfaces => new object[] {_outputBackend}; public Action Input { get; set; } diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs index c89d0a15cf..7798452f10 100644 --- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs +++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs @@ -240,5 +240,7 @@ namespace Avalonia.Win32.Interop.Wpf return new Vector(1, 1); return new Vector(src.TransformToDevice.M11, src.TransformToDevice.M22); } + + IPopupImpl CreatePopup() => null; } } diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs index c45bf6389e..56a7e356b6 100644 --- a/src/Windows/Avalonia.Win32/Win32Platform.cs +++ b/src/Windows/Avalonia.Win32/Win32Platform.cs @@ -210,11 +210,6 @@ namespace Avalonia.Win32 return embedded; } - public IPopupImpl CreatePopup() - { - return new PopupImpl(); - } - public IWindowIconImpl LoadIcon(string fileName) { using (var stream = File.OpenRead(fileName)) diff --git a/src/iOS/Avalonia.iOS/TopLevelImpl.cs b/src/iOS/Avalonia.iOS/TopLevelImpl.cs index 15e8b35056..d5f456409f 100644 --- a/src/iOS/Avalonia.iOS/TopLevelImpl.cs +++ b/src/iOS/Avalonia.iOS/TopLevelImpl.cs @@ -134,5 +134,7 @@ namespace Avalonia.iOS } public ILockedFramebuffer Lock() => new EmulatedFramebuffer(this); + + public IPopupImpl CreatePopup() => null; } } diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs index 059146f17d..44bb7cb69b 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs @@ -21,7 +21,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (UnitTestApplication.Start(TestServices.StyledWindow)) { - var target = CreateTarget(); + var target = CreateTarget(new Window()); Assert.True(((ILogical)target).IsAttachedToLogicalTree); } @@ -32,7 +32,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (UnitTestApplication.Start(TestServices.StyledWindow)) { - var target = CreateTarget(); + var target = CreateTarget(new Window()); Assert.True(target.Presenter.IsAttachedToLogicalTree); } @@ -63,8 +63,8 @@ namespace Avalonia.Controls.UnitTests.Primitives using (UnitTestApplication.Start(TestServices.StyledWindow)) { var child = new Decorator(); - var target = CreateTarget(); var window = new Window(); + var target = CreateTarget(window); var detachedCount = 0; var attachedCount = 0; @@ -88,8 +88,8 @@ namespace Avalonia.Controls.UnitTests.Primitives using (UnitTestApplication.Start(TestServices.StyledWindow)) { var child = new Decorator(); - var target = CreateTarget(); var window = new Window(); + var target = CreateTarget(window); var detachedCount = 0; var attachedCount = 0; @@ -130,9 +130,9 @@ namespace Avalonia.Controls.UnitTests.Primitives } } - private PopupRoot CreateTarget() + private PopupRoot CreateTarget(TopLevel popupParent) { - var result = new PopupRoot + var result = new PopupRoot(popupParent) { Template = new FuncControlTemplate((parent, scope) => new ContentPresenter From 3e786dbadb4df265eb958dba8be06f7e48ad0664 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 11:04:04 +0300 Subject: [PATCH 07/43] PixelVector and stuff --- src/Avalonia.Visuals/Media/PixelPoint.cs | 55 ++++++ src/Avalonia.Visuals/Media/PixelRect.cs | 11 ++ src/Avalonia.Visuals/Media/PixelVector.cs | 205 ++++++++++++++++++++++ 3 files changed, 271 insertions(+) create mode 100644 src/Avalonia.Visuals/Media/PixelVector.cs diff --git a/src/Avalonia.Visuals/Media/PixelPoint.cs b/src/Avalonia.Visuals/Media/PixelPoint.cs index 995781ee9f..1fc102045e 100644 --- a/src/Avalonia.Visuals/Media/PixelPoint.cs +++ b/src/Avalonia.Visuals/Media/PixelPoint.cs @@ -59,6 +59,59 @@ namespace Avalonia { return !(left == right); } + + /// + /// Converts the to a . + /// + /// The point. + public static implicit operator PixelVector(PixelPoint p) + { + return new PixelVector(p.X, p.Y); + } + + /// + /// Adds two points. + /// + /// The first point. + /// The second point. + /// A point that is the result of the addition. + public static PixelPoint operator +(PixelPoint a, PixelPoint b) + { + return new PixelPoint(a.X + b.X, a.Y + b.Y); + } + + /// + /// Adds a vector to a point. + /// + /// The point. + /// The vector. + /// A point that is the result of the addition. + public static PixelPoint operator +(PixelPoint a, PixelVector b) + { + return new PixelPoint(a.X + b.X, a.Y + b.Y); + } + + /// + /// Subtracts two points. + /// + /// The first point. + /// The second point. + /// A point that is the result of the subtraction. + public static PixelPoint operator -(PixelPoint a, PixelPoint b) + { + return new PixelPoint(a.X - b.X, a.Y - b.Y); + } + + /// + /// Subtracts a vector from a point. + /// + /// The point. + /// The vector. + /// A point that is the result of the subtraction. + public static PixelPoint operator -(PixelPoint a, PixelVector b) + { + return new PixelPoint(a.X - b.X, a.Y - b.Y); + } /// /// Parses a string. @@ -106,6 +159,8 @@ namespace Avalonia return hash; } } + + /// /// Returns a new with the same Y co-ordinate and the specified X co-ordinate. diff --git a/src/Avalonia.Visuals/Media/PixelRect.cs b/src/Avalonia.Visuals/Media/PixelRect.cs index 9c8e5ad1c4..75987681ff 100644 --- a/src/Avalonia.Visuals/Media/PixelRect.cs +++ b/src/Avalonia.Visuals/Media/PixelRect.cs @@ -261,6 +261,17 @@ namespace Avalonia { return (rect.X < Right) && (X < rect.Right) && (rect.Y < Bottom) && (Y < rect.Bottom); } + + /// + /// Translates the rectangle by an offset. + /// + /// The offset. + /// The translated rectangle. + public PixelRect Translate(PixelVector offset) + { + return new PixelRect(Position + offset, Size); + } + /// /// Gets the union of two rectangles. diff --git a/src/Avalonia.Visuals/Media/PixelVector.cs b/src/Avalonia.Visuals/Media/PixelVector.cs new file mode 100644 index 0000000000..b959b462c2 --- /dev/null +++ b/src/Avalonia.Visuals/Media/PixelVector.cs @@ -0,0 +1,205 @@ +// 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.Animation.Animators; +using JetBrains.Annotations; + +namespace Avalonia +{ + /// + /// Defines a vector. + /// + public readonly struct PixelVector + { + /// + /// The X vector. + /// + private readonly int _x; + + /// + /// The Y vector. + /// + private readonly int _y; + + /// + /// Initializes a new instance of the structure. + /// + /// The X vector. + /// The Y vector. + public PixelVector(int x, int y) + { + _x = x; + _y = y; + } + + /// + /// Gets the X vector. + /// + public int X => _x; + + /// + /// Gets the Y vector. + /// + public int Y => _y; + + /// + /// Converts the to a . + /// + /// The vector. + public static explicit operator PixelPoint(PixelVector a) + { + return new PixelPoint(a._x, a._y); + } + + /// + /// Calculates the dot product of two vectors + /// + /// First vector + /// Second vector + /// The dot product + public static int operator *(PixelVector a, PixelVector b) + { + return a.X * b.X + a.Y * b.Y; + } + + /// + /// Scales a vector. + /// + /// The vector + /// The scaling factor. + /// The scaled vector. + public static PixelVector operator *(PixelVector vector, int scale) + { + return new PixelVector(vector._x * scale, vector._y * scale); + } + + /// + /// Scales a vector. + /// + /// The vector + /// The divisor. + /// The scaled vector. + public static PixelVector operator /(PixelVector vector, int scale) + { + return new PixelVector(vector._x / scale, vector._y / scale); + } + + /// + /// Length of the vector + /// + public double Length => Math.Sqrt(X * X + Y * Y); + + /// + /// Negates a vector. + /// + /// The vector. + /// The negated vector. + public static PixelVector operator -(PixelVector a) + { + return new PixelVector(-a._x, -a._y); + } + + /// + /// Adds two vectors. + /// + /// The first vector. + /// The second vector. + /// A vector that is the result of the addition. + public static PixelVector operator +(PixelVector a, PixelVector b) + { + return new PixelVector(a._x + b._x, a._y + b._y); + } + + /// + /// Subtracts two vectors. + /// + /// The first vector. + /// The second vector. + /// A vector that is the result of the subtraction. + public static PixelVector operator -(PixelVector a, PixelVector b) + { + return new PixelVector(a._x - b._x, a._y - b._y); + } + + /// + /// Check if two vectors are equal (bitwise). + /// + /// + /// + public bool Equals(PixelVector other) + { + // ReSharper disable CompareOfFloatsByEqualityOperator + return _x == other._x && _y == other._y; + // ReSharper restore CompareOfFloatsByEqualityOperator + } + + /// + /// Check if two vectors are nearly equal (numerically). + /// + /// The other vector. + /// True if vectors are nearly equal. + [Pure] + public bool NearlyEquals(PixelVector other) + { + const float tolerance = float.Epsilon; + + return Math.Abs(_x - other._x) < tolerance && Math.Abs(_y - other._y) < tolerance; + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(null, obj)) return false; + + return obj is PixelVector vector && Equals(vector); + } + + public override int GetHashCode() + { + unchecked + { + return (_x.GetHashCode() * 397) ^ _y.GetHashCode(); + } + } + + public static bool operator ==(PixelVector left, PixelVector right) + { + return left.Equals(right); + } + + public static bool operator !=(PixelVector left, PixelVector right) + { + return !left.Equals(right); + } + + /// + /// Returns the string representation of the point. + /// + /// The string representation of the point. + public override string ToString() + { + return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", _x, _y); + } + + /// + /// Returns a new vector with the specified X coordinate. + /// + /// The X coordinate. + /// The new vector. + public PixelVector WithX(int x) + { + return new PixelVector(x, _y); + } + + /// + /// Returns a new vector with the specified Y coordinate. + /// + /// The Y coordinate. + /// The new vector. + public PixelVector WithY(int y) + { + return new PixelVector(_x, y); + } + } +} From 880a2269fd36df27a42265c796ad7fd62c273b14 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 12:56:29 +0300 Subject: [PATCH 08/43] IPopupPositioner + managed implementation --- .../PopupPositioning/IPopupPositioner.cs | 294 ++++++++++++++++++ .../ManagedPopupPositioner.cs | 174 +++++++++++ .../ManagedPopupPositionerPopupImplHelper.cs | 50 +++ 3 files changed, 518 insertions(+) create mode 100644 src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs create mode 100644 src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs create mode 100644 src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs new file mode 100644 index 0000000000..af78483b7f --- /dev/null +++ b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs @@ -0,0 +1,294 @@ +// The documentation and flag names in this file are initially taken from +// xdg_shell wayland protocol this API is designed after +// therefore, I'm including the license from wayland-protocols repo + +/* +Copyright © 2008-2013 Kristian Høgsberg +Copyright © 2010-2013 Intel Corporation +Copyright © 2013 Rafael Antognolli +Copyright © 2013 Jasper St. Pierre +Copyright © 2014 Jonas Ådahl +Copyright © 2014 Jason Ekstrand +Copyright © 2014-2015 Collabora, Ltd. +Copyright © 2015 Red Hat Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +--- + +The above is the version of the MIT "Expat" License used by X.org: + + http://cgit.freedesktop.org/xorg/xserver/tree/COPYING + + +Adjustments for Avalonia needs: +Copyright © 2019 Nikita Tsukanov + + +*/ + +using System; + +namespace Avalonia.Controls.Primitives.PopupPositioning +{ + /// + /// + /// The IPopupPositioner provides a collection of rules for the placement of a + /// a popup relative to its parent. Rules can be defined to ensure + /// the popup remains within the visible area's borders, and to + /// specify how the popup changes its position, such as sliding along + /// an axis, or flipping around a rectangle. These positioner-created rules are + /// constrained by the requirement that a popup must intersect with or + /// be at least partially adjacent to its parent surface. + /// + public struct PopupPositionerParameters + { + private PopupPositioningEdge _gravity; + private PopupPositioningEdge _anchor; + + /// + /// Set the size of the popup that is to be positioned with the positioner + /// object. The size is in scaled coordinates. + /// + public Size Size { get; set; } + + /// + /// Specify the anchor rectangle within the parent that the popup + /// will be placed relative to. The rectangle is relative to the + /// parent geometry + /// + /// The anchor rectangle may not extend outside the window geometry of the + /// popup's parent. The anchor rectangle is in scaled coordinates + /// + public Rect AnchorRectangle { get; set; } + + + /// + /// Defines the anchor point for the anchor rectangle. The specified anchor + /// is used derive an anchor point that the popup will be + /// positioned relative to. If a corner anchor is set (e.g. 'TopLeft' or + /// 'BottomRight'), the anchor point will be at the specified corner; + /// otherwise, the derived anchor point will be centered on the specified + /// edge, or in the center of the anchor rectangle if no edge is specified. + /// + public PopupPositioningEdge Anchor + { + get => _anchor; + set + { + PopupPositioningEdgeHelper.ValidateEdge(value); + _anchor = value; + } + } + + /// + /// Defines in what direction a popup should be positioned, relative to + /// the anchor point of the parent. If a corner gravity is + /// specified (e.g. 'BottomRight' or 'TopLeft'), then the popup + /// will be placed towards the specified gravity; otherwise, the popup + /// will be centered over the anchor point on any axis that had no + /// gravity specified. + /// + public PopupPositioningEdge Gravity + { + get => _gravity; + set + { + PopupPositioningEdgeHelper.ValidateEdge(value); + _gravity = value; + } + } + + /// + /// Specify how the popup should be positioned if the originally intended + /// position caused the popup to be constrained, meaning at least + /// partially outside positioning boundaries set by the positioner. The + /// adjustment is set by constructing a bitmask describing the adjustment to + /// be made when the popup is constrained on that axis. + /// + /// If no bit for one axis is set, the positioner will assume that the child + /// surface should not change its position on that axis when constrained. + /// + /// If more than one bit for one axis is set, the order of how adjustments + /// are applied is specified in the corresponding adjustment descriptions. + /// + /// The default adjustment is none. + /// + public PopupPositionerConstraintAdjustment ConstraintAdjustment { get; set; } + + /// + /// Specify the popup position offset relative to the position of the + /// anchor on the anchor rectangle and the anchor on the popup. For + /// example if the anchor of the anchor rectangle is at (x, y), the popup + /// has the gravity bottom|right, and the offset is (ox, oy), the calculated + /// surface position will be (x + ox, y + oy). The offset position of the + /// surface is the one used for constraint testing. See + /// set_constraint_adjustment. + /// + /// An example use case is placing a popup menu on top of a user interface + /// element, while aligning the user interface element of the parent surface + /// with some user interface element placed somewhere in the popup. + /// + public Point Offset { get; set; } + } + + /// + /// The constraint adjustment value define ways how popup position will + /// be adjusted if the unadjusted position would result in the popup + /// being partly constrained. + /// + /// Whether a popup is considered 'constrained' is left to the positioner + /// to determine. For example, the popup may be partly outside the + /// target platform defined 'work area', thus necessitating the popup's + /// position be adjusted until it is entirely inside the work area. + /// + [Flags] + public enum PopupPositionerConstraintAdjustment + { + /// + /// Don't alter the surface position even if it is constrained on some + /// axis, for example partially outside the edge of an output. + /// + None = 0, + + /// + /// Slide the surface along the x axis until it is no longer constrained. + /// First try to slide towards the direction of the gravity on the x axis + /// until either the edge in the opposite direction of the gravity is + /// unconstrained or the edge in the direction of the gravity is + /// constrained. + /// + /// Then try to slide towards the opposite direction of the gravity on the + /// x axis until either the edge in the direction of the gravity is + /// unconstrained or the edge in the opposite direction of the gravity is + /// constrained. + /// + SlideX = 1, + + + /// + /// Slide the surface along the y axis until it is no longer constrained. + /// + /// First try to slide towards the direction of the gravity on the y axis + /// until either the edge in the opposite direction of the gravity is + /// unconstrained or the edge in the direction of the gravity is + /// constrained. + /// + /// Then try to slide towards the opposite direction of the gravity on the + /// y axis until either the edge in the direction of the gravity is + /// unconstrained or the edge in the opposite direction of the gravity is + /// constrained. + /// */ + /// + SlideY = 2, + + /// + /// Invert the anchor and gravity on the x axis if the surface is + /// constrained on the x axis. For example, if the left edge of the + /// surface is constrained, the gravity is 'left' and the anchor is + /// 'left', change the gravity to 'right' and the anchor to 'right'. + /// + /// If the adjusted position also ends up being constrained, the resulting + /// position of the flip_x adjustment will be the one before the + /// adjustment. + /// + FlipX = 4, + + /// + /// Invert the anchor and gravity on the y axis if the surface is + /// constrained on the y axis. For example, if the bottom edge of the + /// surface is constrained, the gravity is 'bottom' and the anchor is + /// 'bottom', change the gravity to 'top' and the anchor to 'top'. + /// + /// The adjusted position is calculated given the original anchor + /// rectangle and offset, but with the new flipped anchor and gravity + /// values. + /// + /// If the adjusted position also ends up being constrained, the resulting + /// position of the flip_y adjustment will be the one before the + /// adjustment. + /// + FlipY = 8, + All = SlideX|SlideY|FlipX|FlipY + } + + static class PopupPositioningEdgeHelper + { + public static void ValidateEdge(this PopupPositioningEdge edge) + { + if (((edge & PopupPositioningEdge.Left) != 0 && (edge & PopupPositioningEdge.Right) != 0) + || + ((edge & PopupPositioningEdge.Top) != 0 && (edge & PopupPositioningEdge.Bottom) != 0)) + throw new ArgumentException("Opposite edges specified"); + } + + public static PopupPositioningEdge Flip(this PopupPositioningEdge edge) + { + var hmask = PopupPositioningEdge.Left | PopupPositioningEdge.Right; + var vmask = PopupPositioningEdge.Top | PopupPositioningEdge.Bottom; + if ((edge & hmask) != 0) + edge ^= hmask; + if ((edge & vmask) != 0) + edge ^= vmask; + return edge; + } + + public static PopupPositioningEdge FlipX(this PopupPositioningEdge edge) + { + if ((edge & PopupPositioningEdge.HorizontalMask) != 0) + edge ^= PopupPositioningEdge.HorizontalMask; + return edge; + } + + public static PopupPositioningEdge FlipY(this PopupPositioningEdge edge) + { + if ((edge & PopupPositioningEdge.VerticalMask) != 0) + edge ^= PopupPositioningEdge.VerticalMask; + return edge; + } + + } + + [Flags] + public enum PopupPositioningEdge + { + None, + Top = 1, + Bottom = 2, + Left = 4, + Right = 8, + TopLeft = Top | Left, + TopRight = Top | Right, + BottomLeft = Bottom | Left, + BottomRight = Bottom | Right, + + + VerticalMask = Top | Bottom, + HorizontalMask = Left | Right, + AllMask = VerticalMask|HorizontalMask + } + + public interface IPopupPositioner + { + void Update(PopupPositionerParameters parameters); + } + + +} diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs new file mode 100644 index 0000000000..d9d3c5a61b --- /dev/null +++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs @@ -0,0 +1,174 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Avalonia.Controls.Primitives.PopupPositioning +{ + public interface IManagedPopupPositionerPopup + { + IReadOnlyList Screens { get; } + Rect ParentClientAreaScreenGeometry { get; } + void MoveAndResize(Point devicePoint, Size virtualSize); + Point TranslatePoint(Point pt); + Size TranslateSize(Size size); + } + + public class ManagedPopupPositionerScreenInfo + { + public Rect Bounds { get; } + public Rect WorkingArea { get; } + + public ManagedPopupPositionerScreenInfo(Rect bounds, Rect workingArea) + { + Bounds = bounds; + WorkingArea = workingArea; + } + } + + public class ManagedPopupPositioner : IPopupPositioner + { + private readonly IManagedPopupPositionerPopup _popup; + + public ManagedPopupPositioner(IManagedPopupPositionerPopup popup) + { + _popup = popup; + } + + + static Point GetAnchorPoint(Rect anchorRect, PopupPositioningEdge edge) + { + double x, y; + if ((edge & PopupPositioningEdge.Left) != 0) + x = anchorRect.X; + else if ((edge & PopupPositioningEdge.Right) != 0) + x = anchorRect.Right; + else + x = anchorRect.X + anchorRect.Width / 2; + + if ((edge & PopupPositioningEdge.Top) != 0) + y = anchorRect.Y; + else if ((edge & PopupPositioningEdge.Bottom) != 0) + y = anchorRect.Bottom; + else + y = anchorRect.Y + anchorRect.Height / 2; + return new Point(x, y); + } + + static Point Gravitate(Point anchorPoint, Size size, PopupPositioningEdge gravity) + { + double x, y; + if ((gravity & PopupPositioningEdge.Left) != 0) + x = -size.Width; + else if ((gravity & PopupPositioningEdge.Right) != 0) + x = 0; + else + x = -size.Width / 2; + + if ((gravity & PopupPositioningEdge.Top) != 0) + y = -size.Height; + else if ((gravity & PopupPositioningEdge.Bottom) != 0) + y = 0; + else + y = -size.Height / 2; + return anchorPoint + new Point(x, y); + } + + public void Update(PopupPositionerParameters parameters) + { + + Update(_popup.TranslateSize(parameters.Size), + new Rect(_popup.TranslatePoint(parameters.AnchorRectangle.TopLeft), + _popup.TranslateSize(parameters.AnchorRectangle.Size)), + parameters.Anchor, parameters.Gravity, parameters.ConstraintAdjustment, + _popup.TranslatePoint(parameters.Offset)); + } + + + void Update(Size size, Rect anchorRect, PopupPositioningEdge anchor, PopupPositioningEdge gravity, + PopupPositionerConstraintAdjustment constraintAdjustment, Point offset) + { + var parentGeometry = _popup.ParentClientAreaScreenGeometry; + anchorRect = anchorRect.Translate(parentGeometry.TopLeft); + + Rect GetBounds() + { + var screens = _popup.Screens; + + var targetScreen = screens.FirstOrDefault(s => s.Bounds.Contains(anchorRect.TopLeft)) + ?? screens.FirstOrDefault(s => s.Bounds.Intersects(anchorRect)) + ?? screens.FirstOrDefault(s => s.Bounds.Contains(parentGeometry.TopLeft)) + ?? screens.FirstOrDefault(s => s.Bounds.Intersects(parentGeometry)) + ?? screens.FirstOrDefault(); + return targetScreen?.WorkingArea + ?? new Rect(0, 0, double.MaxValue, double.MaxValue); + } + + var bounds = GetBounds(); + + bool FitsInBounds(Rect rc, PopupPositioningEdge edge = PopupPositioningEdge.AllMask) + { + if ((edge & PopupPositioningEdge.Left) != 0 + && rc.X < bounds.X) + return false; + + if ((edge & PopupPositioningEdge.Top) != 0 + && rc.Y < bounds.Y) + return false; + + if ((edge & PopupPositioningEdge.Right) != 0 + && rc.Right > bounds.Right) + return false; + + if ((edge & PopupPositioningEdge.Bottom) != 0 + && rc.Bottom > bounds.Bottom) + return false; + + return true; + } + + Rect GetUnconstrained(PopupPositioningEdge a, PopupPositioningEdge g) => + new Rect(Gravitate(GetAnchorPoint(anchorRect, a), size, g) + offset, size); + + + var geo = GetUnconstrained(anchor, gravity); + + // If flipping geometry and anchor is allowed and helps, use the flipped one, + // otherwise leave it as is + if (!FitsInBounds(geo, PopupPositioningEdge.HorizontalMask) + && (constraintAdjustment & PopupPositionerConstraintAdjustment.FlipX) != 0) + { + var flipped = GetUnconstrained(anchor.FlipX(), gravity.FlipX()); + if (FitsInBounds(flipped, PopupPositioningEdge.HorizontalMask)) + geo = geo.WithX(flipped.X); + } + + // If sliding is allowed, try moving the rect into the bounds + if ((constraintAdjustment & PopupPositionerConstraintAdjustment.SlideX) != 0) + { + geo = geo.WithX(Math.Max(geo.X, bounds.X)); + if (geo.Right > bounds.Right) + geo = geo.WithX(bounds.Right - geo.Width); + } + + // If flipping geometry and anchor is allowed and helps, use the flipped one, + // otherwise leave it as is + if (!FitsInBounds(geo, PopupPositioningEdge.VerticalMask) + && (constraintAdjustment & PopupPositionerConstraintAdjustment.FlipY) != 0) + { + var flipped = GetUnconstrained(anchor.FlipY(), gravity.FlipY()); + if (FitsInBounds(flipped, PopupPositioningEdge.VerticalMask)) + geo = geo.WithY(flipped.Y); + } + + // If sliding is allowed, try moving the rect into the bounds + if ((constraintAdjustment & PopupPositionerConstraintAdjustment.SlideY) != 0) + { + geo = geo.WithY(Math.Max(geo.Y, bounds.Y)); + if (geo.Bottom > bounds.Bottom) + geo = geo.WithY(bounds.Bottom - geo.Height); + } + + _popup.MoveAndResize(geo.TopLeft, size); + } + } +} diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs new file mode 100644 index 0000000000..ed1551bba5 --- /dev/null +++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Avalonia.Platform; + +namespace Avalonia.Controls.Primitives.PopupPositioning +{ + /// + /// This class is used to simplify integration of IPopupImpl implementations with popup positioner + /// + public class ManagedPopupPositionerPopupImplHelper : IManagedPopupPositionerPopup + { + private readonly IWindowBaseImpl _parent; + + public delegate void MoveResizeDelegate(PixelPoint position, Size size, double scaling); + private readonly MoveResizeDelegate _moveResize; + + public ManagedPopupPositionerPopupImplHelper(IWindowBaseImpl parent, MoveResizeDelegate moveResize) + { + _parent = parent; + _moveResize = moveResize; + } + + public IReadOnlyList Screens => + + _parent.Screen.AllScreens.Select(s => new ManagedPopupPositionerScreenInfo( + s.Bounds.ToRect(_parent.Scaling), s.WorkingArea.ToRect(_parent.Scaling))).ToList(); + + public Rect ParentClientAreaScreenGeometry + { + get + { + // Popup positioner operates with abstract coordinates, but in our case they are pixel ones + var point = _parent.PointToScreen(default); + var size = PixelSize.FromSize(_parent.ClientSize, _parent.Scaling); + return new Rect(point.X, point.Y, size.Width, size.Height); + + } + } + + public void MoveAndResize(Point devicePoint, Size virtualSize) + { + _moveResize(new PixelPoint((int)devicePoint.X, (int)devicePoint.Y), virtualSize, _parent.Scaling); + } + + public Point TranslatePoint(Point pt) => pt * _parent.Scaling; + + public Size TranslateSize(Size size) => size * _parent.Scaling; + } +} From 9343ba4c23f993b023106d7513c2e80d20afda66 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 13:05:19 +0300 Subject: [PATCH 09/43] Wired up the popup positioner Tests are failing because they are trying create popups out of a thin air --- src/Avalonia.Controls/PlacementMode.cs | 19 ++- src/Avalonia.Controls/Platform/IPopupImpl.cs | 4 +- .../Platform/IWindowBaseImpl.cs | 24 +--- src/Avalonia.Controls/Platform/IWindowImpl.cs | 27 +++++ src/Avalonia.Controls/Primitives/Popup.cs | 60 +--------- src/Avalonia.Controls/Primitives/PopupRoot.cs | 111 +++++++++++++----- src/Avalonia.Controls/ToolTip.cs | 6 +- src/Avalonia.Controls/Window.cs | 45 +++++++ src/Avalonia.Controls/WindowBase.cs | 49 +------- .../Remote/PreviewerWindowImpl.cs | 5 + .../Remote/PreviewerWindowingPlatform.cs | 2 - src/Avalonia.DesignerSupport/Remote/Stubs.cs | 23 +++- src/Avalonia.Native/PopupImpl.cs | 16 ++- src/Avalonia.Native/WindowImpl.cs | 4 +- src/Avalonia.X11/X11Window.cs | 34 +++++- src/Windows/Avalonia.Win32/PopupImpl.cs | 15 +++ src/Windows/Avalonia.Win32/WindowImpl.cs | 4 +- .../WindowBaseTests.cs | 27 ----- .../WindowTests.cs | 25 ++++ 19 files changed, 304 insertions(+), 196 deletions(-) diff --git a/src/Avalonia.Controls/PlacementMode.cs b/src/Avalonia.Controls/PlacementMode.cs index db77b6a365..99958c4c9e 100644 --- a/src/Avalonia.Controls/PlacementMode.cs +++ b/src/Avalonia.Controls/PlacementMode.cs @@ -23,6 +23,21 @@ namespace Avalonia.Controls /// /// The popup is placed at the top right of its target. /// - Right + Right, + + /// + /// The popup is placed at the top left of its target. + /// + Left, + + /// + /// The popup is placed at the top left of its target. + /// + Top, + + /// + /// The popup is placed according to anchor and gravity rules + /// + AnchorAndGravity } -} \ No newline at end of file +} diff --git a/src/Avalonia.Controls/Platform/IPopupImpl.cs b/src/Avalonia.Controls/Platform/IPopupImpl.cs index 1b606f550b..2978016519 100644 --- a/src/Avalonia.Controls/Platform/IPopupImpl.cs +++ b/src/Avalonia.Controls/Platform/IPopupImpl.cs @@ -1,6 +1,8 @@ // 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.Controls.Primitives.PopupPositioning; + namespace Avalonia.Platform { /// @@ -8,6 +10,6 @@ namespace Avalonia.Platform /// public interface IPopupImpl : IWindowBaseImpl { - + IPopupPositioner PopupPositioner { get; } } } diff --git a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs index b37521de30..8c99dffc28 100644 --- a/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs +++ b/src/Avalonia.Controls/Platform/IWindowBaseImpl.cs @@ -15,21 +15,10 @@ namespace Avalonia.Platform /// void Hide(); - /// - /// Starts moving a window with left button being held. Should be called from left mouse button press event handler. - /// - void BeginMoveDrag(); - - /// - /// Starts resizing a window. This function is used if an application has window resizing controls. - /// Should be called from left mouse button press event handler - /// - void BeginResizeDrag(WindowEdge edge); - /// /// Gets the position of the window in device pixels. /// - PixelPoint Position { get; set; } + PixelPoint Position { get; } /// /// Gets or sets a method called when the window's position changes. @@ -61,17 +50,6 @@ namespace Avalonia.Platform /// Size MaxClientSize { get; } - /// - /// Sets the client size of the top level. - /// - void Resize(Size clientSize); - - /// - /// Minimum width of the window. - /// - /// - void SetMinMaxSize(Size minSize, Size maxSize); - /// /// Sets whether this window appears on top of all other windows /// diff --git a/src/Avalonia.Controls/Platform/IWindowImpl.cs b/src/Avalonia.Controls/Platform/IWindowImpl.cs index 2ddc5a5c85..bc5d38c845 100644 --- a/src/Avalonia.Controls/Platform/IWindowImpl.cs +++ b/src/Avalonia.Controls/Platform/IWindowImpl.cs @@ -57,5 +57,32 @@ namespace Avalonia.Platform /// Return true to prevent the underlying implementation from closing. /// Func Closing { get; set; } + + /// + /// Starts moving a window with left button being held. Should be called from left mouse button press event handler. + /// + void BeginMoveDrag(); + + /// + /// Starts resizing a window. This function is used if an application has window resizing controls. + /// Should be called from left mouse button press event handler + /// + void BeginResizeDrag(WindowEdge edge); + + /// + /// Sets the client size of the top level. + /// + void Resize(Size clientSize); + + /// + /// Sets the client size of the top level. + /// + void Move(PixelPoint point); + + /// + /// Minimum width of the window. + /// + /// + void SetMinMaxSize(Size minSize, Size maxSize); } } diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index 895094eded..f9ec9796fb 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -42,7 +42,7 @@ namespace Avalonia.Controls.Primitives /// Defines the property. /// public static readonly StyledProperty ObeyScreenEdgesProperty = - AvaloniaProperty.Register(nameof(ObeyScreenEdges)); + AvaloniaProperty.Register(nameof(ObeyScreenEdges), true); /// /// Defines the property. @@ -147,10 +147,7 @@ namespace Avalonia.Controls.Primitives set { SetValue(PlacementModeProperty, value); } } - /// - /// Gets or sets a value indicating whether the popup positions itself within the nearest screen boundary - /// when its opened at a position where it would otherwise overlap the screen edge. - /// + [Obsolete("This property has no effect")] public bool ObeyScreenEdges { get => GetValue(ObeyScreenEdgesProperty); @@ -241,8 +238,9 @@ namespace Avalonia.Controls.Primitives ((ISetLogicalParent)_popupRoot).SetParent(this); } - _popupRoot.Position = GetPosition(); - + _popupRoot.ConfigurePosition(PlacementTarget ?? this.GetVisualParent(), + PlacementMode, new Point(HorizontalOffset, VerticalOffset)); + var window = _topLevel as Window; if (window != null) { @@ -263,11 +261,6 @@ namespace Avalonia.Controls.Primitives _popupRoot.Show(); - if (ObeyScreenEdges) - { - _popupRoot.SnapInsideScreenEdges(); - } - using (BeginIgnoringIsOpen()) { IsOpen = true; @@ -379,49 +372,6 @@ namespace Avalonia.Controls.Primitives } } - /// - /// Gets the position for the popup based on the placement properties. - /// - /// The popup's position in screen coordinates. - protected virtual PixelPoint GetPosition() - { - var result = GetPosition(PlacementTarget ?? this.GetVisualParent(), PlacementMode, PopupRoot, - HorizontalOffset, VerticalOffset); - - return result; - } - - internal static PixelPoint GetPosition(Control target, PlacementMode placement, PopupRoot popupRoot, double horizontalOffset, double verticalOffset) - { - var root = target?.GetVisualRoot(); - var mode = root != null ? placement : PlacementMode.Pointer; - var scaling = root?.RenderScaling ?? 1; - - switch (mode) - { - case PlacementMode.Pointer: - if (popupRoot != null) - { - var screenOffset = PixelPoint.FromPoint(new Point(horizontalOffset, verticalOffset), scaling); - var mouseOffset = ((IInputRoot)popupRoot)?.MouseDevice?.Position ?? default; - return new PixelPoint( - screenOffset.X + mouseOffset.X, - screenOffset.Y + mouseOffset.Y); - } - - return default; - - case PlacementMode.Bottom: - return target?.PointToScreen(new Point(0 + horizontalOffset, target.Bounds.Height + verticalOffset)) ?? default; - - case PlacementMode.Right: - return target?.PointToScreen(new Point(target.Bounds.Width + horizontalOffset, 0 + verticalOffset)) ?? default; - - default: - throw new InvalidOperationException("Invalid value for Popup.PlacementMode"); - } - } - private void ListenForNonClientClick(RawInputEventArgs e) { var mouse = e as RawPointerEventArgs; diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index 47863932d1..efe4d09b3d 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -4,6 +4,7 @@ using System; using Avalonia.Controls.Platform; using Avalonia.Controls.Presenters; +using Avalonia.Controls.Primitives.PopupPositioning; using Avalonia.Interactivity; using Avalonia.Media; using Avalonia.Platform; @@ -18,7 +19,9 @@ namespace Avalonia.Controls.Primitives /// public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost { + private readonly TopLevel _parent; private IDisposable _presenterSubscription; + private PopupPositionerParameters _positionerParameters; /// /// Initializes static members of the class. @@ -45,6 +48,7 @@ namespace Avalonia.Controls.Primitives public PopupRoot(TopLevel parent, IAvaloniaDependencyResolver dependencyResolver) : base(parent.PlatformImpl.CreatePopup(), dependencyResolver) { + _parent = parent; } /// @@ -74,33 +78,6 @@ namespace Avalonia.Controls.Primitives /// public void Dispose() => PlatformImpl?.Dispose(); - /// - /// Moves the Popups position so that it doesnt overlap screen edges. - /// This method can be called immediately after Show has been called. - /// - public void SnapInsideScreenEdges() - { - var screen = (VisualRoot as WindowBase)?.Screens?.ScreenFromPoint(Position); - - if (screen != null) - { - var scaling = VisualRoot.RenderScaling; - var bounds = PixelRect.FromRect(Bounds, scaling); - var screenX = Position.X + bounds.Width - screen.Bounds.X; - var screenY = Position.Y + bounds.Height - screen.Bounds.Y; - - if (screenX > screen.Bounds.Width) - { - Position = Position.WithX(Position.X - (screenX - screen.Bounds.Width)); - } - - if (screenY > screen.Bounds.Height) - { - Position = Position.WithY(Position.Y - (screenY - screen.Bounds.Height)); - } - } - } - /// protected override void OnTemplateApplied(TemplateAppliedEventArgs e) { @@ -142,5 +119,85 @@ namespace Avalonia.Controls.Primitives } } } + + void UpdatePosition() + { + PlatformImpl?.PopupPositioner.Update(_positionerParameters); + } + + public void ConfigurePosition(Control target, PlacementMode placement, Point offset, + PopupPositioningEdge anchor = PopupPositioningEdge.None, + PopupPositioningEdge gravity = PopupPositioningEdge.None) + { + // We need a better way for tracking the last pointer position + var pointer = _parent.PointToClient(_parent.PlatformImpl.MouseDevice.Position); + + _positionerParameters.Offset = offset; + _positionerParameters.ConstraintAdjustment = PopupPositionerConstraintAdjustment.All; + if (placement == PlacementMode.Pointer) + { + _positionerParameters.AnchorRectangle = new Rect(pointer, new Size(1, 1)); + _positionerParameters.Anchor = PopupPositioningEdge.BottomRight; + _positionerParameters.Gravity = PopupPositioningEdge.BottomRight; + } + else + { + if (target == null) + throw new InvalidOperationException("Placement mode is not Pointer and PlacementTarget is null"); + var matrix = target.TransformToVisual(_parent); + if (matrix == null) + throw new InvalidCastException("Target control is not in the same tree as the popup parent"); + + _positionerParameters.AnchorRectangle = new Rect(default, target.Bounds.Size) + .TransformToAABB(matrix.Value); + + if (placement == PlacementMode.Right) + { + _positionerParameters.Anchor = PopupPositioningEdge.TopRight; + _positionerParameters.Gravity = PopupPositioningEdge.BottomRight; + } + else if (placement == PlacementMode.Bottom) + { + _positionerParameters.Anchor = PopupPositioningEdge.BottomLeft; + _positionerParameters.Gravity = PopupPositioningEdge.BottomRight; + } + else if (placement == PlacementMode.Left) + { + _positionerParameters.Anchor = PopupPositioningEdge.TopLeft; + _positionerParameters.Gravity = PopupPositioningEdge.BottomLeft; + } + else if (placement == PlacementMode.Top) + { + _positionerParameters.Anchor = PopupPositioningEdge.TopLeft; + _positionerParameters.Gravity = PopupPositioningEdge.TopRight; + } + else if (placement == PlacementMode.AnchorAndGravity) + { + _positionerParameters.Anchor = anchor; + _positionerParameters.Gravity = gravity; + } + else + throw new InvalidOperationException("Invalid value for Popup.PlacementMode"); + } + + if (_positionerParameters.Size != default) + UpdatePosition(); + } + + /// + /// Carries out the arrange pass of the window. + /// + /// The final window size. + /// The parameter unchanged. + protected override Size ArrangeOverride(Size finalSize) + { + using (BeginAutoSizing()) + { + _positionerParameters.Size = finalSize; + UpdatePosition(); + } + + return base.ArrangeOverride(PlatformImpl?.ClientSize ?? default(Size)); + } } } diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs index 8c23f4abdc..da537a2e65 100644 --- a/src/Avalonia.Controls/ToolTip.cs +++ b/src/Avalonia.Controls/ToolTip.cs @@ -237,10 +237,10 @@ namespace Avalonia.Controls _popup = new PopupRoot((TopLevel)control.GetVisualRoot()) {Content = this}; ((ISetLogicalParent)_popup).SetParent(control); - _popup.Position = Popup.GetPosition(control, GetPlacement(control), _popup, - GetHorizontalOffset(control), GetVerticalOffset(control)); + + _popup.ConfigurePosition(control, GetPlacement(control), + new Point(GetHorizontalOffset(control), GetVerticalOffset(control))); _popup.Show(); - _popup.SnapInsideScreenEdges(); } private void Close() diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs index d2793fe0dd..ef43746665 100644 --- a/src/Avalonia.Controls/Window.cs +++ b/src/Avalonia.Controls/Window.cs @@ -135,6 +135,12 @@ namespace Avalonia.Controls WindowStateProperty.Changed.AddClassHandler( (w, e) => { if (w.PlatformImpl != null) w.PlatformImpl.WindowState = (WindowState)e.NewValue; }); + + MinWidthProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size((double)e.NewValue, w.MinHeight), new Size(w.MaxWidth, w.MaxHeight))); + MinHeightProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, (double)e.NewValue), new Size(w.MaxWidth, w.MaxHeight))); + MaxWidthProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, w.MinHeight), new Size((double)e.NewValue, w.MaxHeight))); + MaxHeightProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, w.MinHeight), new Size(w.MaxWidth, (double)e.NewValue))); + } /// @@ -155,6 +161,7 @@ namespace Avalonia.Controls impl.Closing = HandleClosing; impl.WindowStateChanged = HandleWindowStateChanged; _maxPlatformClientSize = PlatformImpl?.MaxClientSize ?? default(Size); + this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x)); } /// @@ -239,6 +246,44 @@ namespace Avalonia.Controls set { SetAndRaise(WindowStartupLocationProperty, ref _windowStartupLocation, value); } } + /// + /// Gets or sets the window position in screen coordinates. + /// + public PixelPoint Position + { + get { return PlatformImpl?.Position ?? PixelPoint.Origin; } + set + { + PlatformImpl?.Move(value); + } + } + + /// + /// Starts moving a window with left button being held. Should be called from left mouse button press event handler + /// + public void BeginMoveDrag() => PlatformImpl?.BeginMoveDrag(); + + /// + /// Starts resizing a window. This function is used if an application has window resizing controls. + /// Should be called from left mouse button press event handler + /// + public void BeginResizeDrag(WindowEdge edge) => PlatformImpl?.BeginResizeDrag(edge); + + /// + /// Carries out the arrange pass of the window. + /// + /// The final window size. + /// The parameter unchanged. + protected override Size ArrangeOverride(Size finalSize) + { + using (BeginAutoSizing()) + { + PlatformImpl?.Resize(finalSize); + } + + return base.ArrangeOverride(PlatformImpl?.ClientSize ?? default(Size)); + } + /// Size ILayoutRoot.MaxClientSize => _maxPlatformClientSize; diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs index 40c9fc94d2..53e43e4ec4 100644 --- a/src/Avalonia.Controls/WindowBase.cs +++ b/src/Avalonia.Controls/WindowBase.cs @@ -49,10 +49,6 @@ namespace Avalonia.Controls IsVisibleProperty.OverrideDefaultValue(false); IsVisibleProperty.Changed.AddClassHandler(x => x.IsVisibleChanged); - MinWidthProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size((double)e.NewValue, w.MinHeight), new Size(w.MaxWidth, w.MaxHeight))); - MinHeightProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, (double)e.NewValue), new Size(w.MaxWidth, w.MaxHeight))); - MaxWidthProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, w.MinHeight), new Size((double)e.NewValue, w.MaxHeight))); - MaxHeightProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetMinMaxSize(new Size(w.MinWidth, w.MinHeight), new Size(w.MaxWidth, (double)e.NewValue))); TopmostProperty.Changed.AddClassHandler((w, e) => w.PlatformImpl?.SetTopmost((bool)e.NewValue)); } @@ -67,7 +63,6 @@ namespace Avalonia.Controls impl.Activated = HandleActivated; impl.Deactivated = HandleDeactivated; impl.PositionChanged = HandlePositionChanged; - this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x)); } /// @@ -96,19 +91,6 @@ namespace Avalonia.Controls get { return _isActive; } private set { SetAndRaise(IsActiveProperty, ref _isActive, value); } } - - /// - /// Gets or sets the window position in screen coordinates. - /// - public PixelPoint Position - { - get { return PlatformImpl?.Position ?? PixelPoint.Origin; } - set - { - if (PlatformImpl is IWindowBaseImpl impl) - impl.Position = value; - } - } public Screens Screens { get; private set; } @@ -193,6 +175,11 @@ namespace Avalonia.Controls } } + protected internal virtual void OnBeforeShow() + { + + } + /// /// Begins an auto-resize operation. /// @@ -208,21 +195,6 @@ namespace Avalonia.Controls return Disposable.Create(() => AutoSizing = false); } - /// - /// Carries out the arrange pass of the window. - /// - /// The final window size. - /// The parameter unchanged. - protected override Size ArrangeOverride(Size finalSize) - { - using (BeginAutoSizing()) - { - PlatformImpl?.Resize(finalSize); - } - - return base.ArrangeOverride(PlatformImpl?.ClientSize ?? default(Size)); - } - /// /// Ensures that the window is initialized. /// @@ -318,16 +290,5 @@ namespace Avalonia.Controls } } } - - /// - /// Starts moving a window with left button being held. Should be called from left mouse button press event handler - /// - public void BeginMoveDrag() => PlatformImpl?.BeginMoveDrag(); - - /// - /// Starts resizing a window. This function is used if an application has window resizing controls. - /// Should be called from left mouse button press event handler - /// - public void BeginResizeDrag(WindowEdge edge) => PlatformImpl?.BeginResizeDrag(edge); } } diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs index dc01bcb07e..40524ad4b7 100644 --- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs +++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs @@ -72,6 +72,11 @@ namespace Avalonia.DesignerSupport.Remote RenderIfNeeded(); } + public void Move(PixelPoint point) + { + + } + public void SetMinMaxSize(Size minSize, Size maxSize) { } diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs index a7a94130ea..dcfcd42c04 100644 --- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs +++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowingPlatform.cs @@ -40,8 +40,6 @@ namespace Avalonia.DesignerSupport.Remote return s_lastWindow; } - public IPopupImpl CreatePopup() => new WindowStub(); - public static void Initialize(IAvaloniaRemoteTransportConnection transport) { s_transport = transport; diff --git a/src/Avalonia.DesignerSupport/Remote/Stubs.cs b/src/Avalonia.DesignerSupport/Remote/Stubs.cs index ddb8b62b6a..4ce0da60a2 100644 --- a/src/Avalonia.DesignerSupport/Remote/Stubs.cs +++ b/src/Avalonia.DesignerSupport/Remote/Stubs.cs @@ -5,6 +5,7 @@ using System.Reactive.Disposables; using System.Threading.Tasks; using Avalonia.Controls; using Avalonia.Controls.Platform; +using Avalonia.Controls.Primitives.PopupPositioning; using Avalonia.Input; using Avalonia.Input.Platform; using Avalonia.Input.Raw; @@ -13,7 +14,7 @@ using Avalonia.Rendering; namespace Avalonia.DesignerSupport.Remote { - class WindowStub : IPopupImpl, IWindowImpl + class WindowStub : IWindowImpl, IPopupImpl { public Action Deactivated { get; set; } public Action Activated { get; set; } @@ -29,12 +30,23 @@ namespace Avalonia.DesignerSupport.Remote public Func Closing { get; set; } public Action Closed { get; set; } public IMouseDevice MouseDevice { get; } = new MouseDevice(); - public IPopupImpl CreatePopup() => null; + public IPopupImpl CreatePopup() => new WindowStub(this); public PixelPoint Position { get; set; } public Action PositionChanged { get; set; } public WindowState WindowState { get; set; } public Action WindowStateChanged { get; set; } + + public WindowStub(IWindowImpl parent = null) + { + if (parent != null) + PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(parent, + (_, size, __) => + { + Resize(size); + })); + } + public IRenderer CreateRenderer(IRenderRoot root) => new ImmediateRenderer(root); public void Dispose() { @@ -79,6 +91,11 @@ namespace Avalonia.DesignerSupport.Remote { } + public void Move(PixelPoint point) + { + + } + public IScreenImpl Screen { get; } = new ScreenStub(); public void SetMinMaxSize(Size minSize, Size maxSize) @@ -112,6 +129,8 @@ namespace Avalonia.DesignerSupport.Remote public void SetTopmost(bool value) { } + + public IPopupPositioner PopupPositioner { get; } } class ClipboardStub : IClipboard diff --git a/src/Avalonia.Native/PopupImpl.cs b/src/Avalonia.Native/PopupImpl.cs index 976208b058..f776ee0132 100644 --- a/src/Avalonia.Native/PopupImpl.cs +++ b/src/Avalonia.Native/PopupImpl.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; +using Avalonia.Controls.Primitives.PopupPositioning; using Avalonia.Native.Interop; using Avalonia.Platform; @@ -11,7 +12,9 @@ namespace Avalonia.Native { private readonly IAvaloniaNativeFactory _factory; private readonly AvaloniaNativePlatformOptions _opts; - public PopupImpl(IAvaloniaNativeFactory factory, AvaloniaNativePlatformOptions opts) : base(opts) + public PopupImpl(IAvaloniaNativeFactory factory, + AvaloniaNativePlatformOptions opts, + IWindowBaseImpl parent) : base(opts) { _factory = factory; _opts = opts; @@ -19,6 +22,14 @@ namespace Avalonia.Native { Init(factory.CreatePopup(e), factory.CreateScreens()); } + PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(parent, MoveResize)); + } + + private void MoveResize(PixelPoint position, Size size, double scaling) + { + Position = position; + Resize(size); + //TODO: We ignore the scaling override for now } class PopupEvents : WindowBaseEvents, IAvnWindowEvents @@ -40,6 +51,7 @@ namespace Avalonia.Native } } - public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts); + public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, this); + public IPopupPositioner PopupPositioner { get; } } } diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs index c7857898d2..e4c158eeb3 100644 --- a/src/Avalonia.Native/WindowImpl.cs +++ b/src/Avalonia.Native/WindowImpl.cs @@ -104,6 +104,8 @@ namespace Avalonia.Native } public Func Closing { get; set; } - public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts); + public void Move(PixelPoint point) => Position = point; + + public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, this); } } diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs index a1e386892b..7ca2672d2b 100644 --- a/src/Avalonia.X11/X11Window.cs +++ b/src/Avalonia.X11/X11Window.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Reactive.Disposables; using System.Text; using Avalonia.Controls; +using Avalonia.Controls.Primitives.PopupPositioning; using Avalonia.Input; using Avalonia.Input.Raw; using Avalonia.OpenGL; @@ -39,6 +40,7 @@ namespace Avalonia.X11 private bool _mapped; private HashSet _transientChildren = new HashSet(); private X11Window _transientParent; + private double? _scalingOverride; public object SyncRoot { get; } = new object(); class InputEventContainer @@ -151,6 +153,8 @@ namespace Avalonia.X11 _xic = XCreateIC(_x11.Xim, XNames.XNInputStyle, XIMProperties.XIMPreeditNothing | XIMProperties.XIMStatusNothing, XNames.XNClientWindow, _handle, IntPtr.Zero); XFlush(_x11.Display); + if(_popup) + PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(popupParent, MoveResize)); } class SurfaceInfo : EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo @@ -454,13 +458,20 @@ namespace Avalonia.X11 } } - private bool UpdateScaling() + private bool UpdateScaling(bool skipResize = false) { lock (SyncRoot) { - var monitor = _platform.X11Screens.Screens.OrderBy(x => x.PixelDensity) - .FirstOrDefault(m => m.Bounds.Contains(Position)); - var newScaling = monitor?.PixelDensity ?? Scaling; + double newScaling; + if (_scalingOverride.HasValue) + newScaling = _scalingOverride.Value; + else + { + var monitor = _platform.X11Screens.Screens.OrderBy(x => x.PixelDensity) + .FirstOrDefault(m => m.Bounds.Contains(Position)); + newScaling = monitor?.PixelDensity ?? Scaling; + } + if (Scaling != newScaling) { Console.WriteLine( @@ -469,7 +480,8 @@ namespace Avalonia.X11 Scaling = newScaling; ScalingChanged?.Invoke(Scaling); SetMinMaxSize(_scaledMinMaxSize.minSize, _scaledMinMaxSize.maxSize); - Resize(oldScaledSize, true); + if(!skipResize) + Resize(oldScaledSize, true); return true; } @@ -731,6 +743,14 @@ namespace Avalonia.X11 public void Resize(Size clientSize) => Resize(clientSize, false); + public void Move(PixelPoint point) => Position = point; + private void MoveResize(PixelPoint position, Size size, double scaling) + { + Move(position); + _scalingOverride = scaling; + UpdateScaling(true); + Resize(size, true); + } PixelSize ToPixelSize(Size size) => new PixelSize((int)(size.Width * Scaling), (int)(size.Height * Scaling)); @@ -939,6 +959,8 @@ namespace Avalonia.X11 { SendNetWMMessage(_x11.Atoms._NET_WM_STATE, (IntPtr)(value ? 0 : 1), _x11.Atoms._NET_WM_STATE_SKIP_TASKBAR, IntPtr.Zero); - } + } + + public IPopupPositioner PopupPositioner { get; } } } diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs index 39f1a95466..c9aa1ce4e7 100644 --- a/src/Windows/Avalonia.Win32/PopupImpl.cs +++ b/src/Windows/Avalonia.Win32/PopupImpl.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; +using Avalonia.Controls.Primitives.PopupPositioning; using Avalonia.Platform; using Avalonia.Win32.Interop; @@ -57,5 +58,19 @@ namespace Avalonia.Win32 return base.WndProc(hWnd, msg, wParam, lParam); } } + + public PopupImpl(IWindowBaseImpl parent) + { + PopupPositioner = new ManagedPopupPositioner(new ManagedPopupPositionerPopupImplHelper(parent, MoveResize)); + } + + private void MoveResize(PixelPoint position, Size size, double scaling) + { + Move(position); + Resize(size); + //TODO: We ignore the scaling override for now + } + + public IPopupPositioner PopupPositioner { get; } } } diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index 2f7805884d..21625af84a 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -131,6 +131,8 @@ namespace Avalonia.Win32 } } + public void Move(PixelPoint point) => Position = point; + public void SetMinMaxSize(Size minSize, Size maxSize) { _minSize = minSize; @@ -250,7 +252,7 @@ namespace Avalonia.Win32 public IPopupImpl CreatePopup() { - return new PopupImpl(); + return new PopupImpl(this); } public void Dispose() diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs index 3ee6a50e69..55e8ae0115 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs @@ -20,33 +20,6 @@ namespace Avalonia.Controls.UnitTests { public class WindowBaseTests { - [Fact] - public void Impl_ClientSize_Should_Be_Set_After_Layout_Pass() - { - using (UnitTestApplication.Start(TestServices.StyledWindow)) - { - var impl = Mock.Of(x => x.Scaling == 1); - - Mock.Get(impl).Setup(x => x.Resize(It.IsAny())).Callback(() => { }); - - var target = new TestWindowBase(impl) - { - Template = CreateTemplate(), - Content = new TextBlock - { - Width = 321, - Height = 432, - }, - IsVisible = true, - }; - - target.LayoutManager.ExecuteInitialLayoutPass(target); - - Mock.Get(impl).Verify(x => x.Resize(new Size(321, 432))); - } - } - - [Fact] public void Activate_Should_Call_Impl_Activate() { diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs index f4d9a91d0c..cbcf08049e 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs @@ -17,6 +17,31 @@ namespace Avalonia.Controls.UnitTests { public class WindowTests { + [Fact] + public void Impl_ClientSize_Should_Be_Set_After_Layout_Pass() + { + using (UnitTestApplication.Start(TestServices.StyledWindow)) + { + var impl = Mock.Of(x => x.Scaling == 1); + + Mock.Get(impl).Setup(x => x.Resize(It.IsAny())).Callback(() => { }); + + var target = new Window(impl) + { + Content = new TextBlock + { + Width = 321, + Height = 432, + }, + IsVisible = true, + }; + + target.LayoutManager.ExecuteInitialLayoutPass(target); + + Mock.Get(impl).Verify(x => x.Resize(new Size(321, 432))); + } + } + [Fact] public void Setting_Title_Should_Set_Impl_Title() { From 8e5c8fee07e1c256069f27e971381c88b6ea1efb Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 14:22:43 +0300 Subject: [PATCH 10/43] Somewhat fixed tests --- src/Avalonia.Controls/ContextMenu.cs | 2 + src/Avalonia.Controls/Primitives/Popup.cs | 20 +++++-- src/Avalonia.Controls/Primitives/PopupRoot.cs | 4 ++ .../AutoCompleteBoxTests.cs | 5 +- .../ContextMenuTests.cs | 16 ++--- .../Primitives/PopupRootTests.cs | 11 ++-- .../Primitives/PopupTests.cs | 58 ++++++------------- .../WindowTests.cs | 34 +---------- .../Avalonia.UnitTests.csproj | 1 + .../MockWindowingPlatform.cs | 40 +++++++++++-- 10 files changed, 96 insertions(+), 95 deletions(-) diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs index 58b4324a3e..ca2ed2590f 100644 --- a/src/Avalonia.Controls/ContextMenu.cs +++ b/src/Avalonia.Controls/ContextMenu.cs @@ -90,6 +90,8 @@ namespace Avalonia.Controls /// The control. public void Open(Control control) { + if (control == null) + throw new ArgumentNullException(nameof(control)); if (IsOpen) { return; diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index f9ec9796fb..2163e035dc 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -215,13 +215,21 @@ namespace Avalonia.Controls.Primitives /// public void Open() { - if (PlacementTarget == null) - throw new InvalidOperationException("It's not valid to show a popup without a PlacementTarget"); - + if (PlacementTarget == null && PlacementMode != PlacementMode.Pointer) + throw new InvalidOperationException("It's not valid to show a popup without a PlacementTarget with PlacementMode != Pointer"); if (_topLevel == null && PlacementTarget != null) - _topLevel = PlacementTarget.GetSelfAndLogicalAncestors().First(x => x is TopLevel) as TopLevel; - + _topLevel = PlacementTarget.GetSelfAndLogicalAncestors().FirstOrDefault(x => x is TopLevel) as TopLevel; + + if (_topLevel == null) + { + if (PlacementTarget == null) + throw new InvalidOperationException( + "Attempted to open a popup not attached to a TopLevel and PlacementTarget is null"); + throw new InvalidOperationException( + "Attempted to open a popup not attached to a TopLevel and PlacementTarget is also not attached to a TopLevel"); + } + if (_popupRoot == null) { _popupRoot = new PopupRoot(_topLevel, DependencyResolver) @@ -255,7 +263,7 @@ namespace Avalonia.Controls.Primitives } } _topLevel.AddHandler(PointerPressedEvent, PointerPressedOutside, RoutingStrategies.Tunnel); - _nonClientListener = InputManager.Instance.Process.Subscribe(ListenForNonClientClick); + _nonClientListener = InputManager.Instance?.Process.Subscribe(ListenForNonClientClick); PopupRootCreated?.Invoke(this, EventArgs.Empty); diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index efe4d09b3d..d3dba6c908 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -146,7 +146,11 @@ namespace Avalonia.Controls.Primitives throw new InvalidOperationException("Placement mode is not Pointer and PlacementTarget is null"); var matrix = target.TransformToVisual(_parent); if (matrix == null) + { + if (target.GetVisualRoot() == null) + throw new InvalidCastException("Target control is not attached to the visual tree"); throw new InvalidCastException("Target control is not in the same tree as the popup parent"); + } _positionerParameters.AnchorRectangle = new Rect(default, target.Bounds.Size) .TransformToAABB(matrix.Value); diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs index 015a122677..ef7dc33f76 100644 --- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs @@ -982,6 +982,8 @@ namespace Avalonia.Controls.UnitTests AutoCompleteBox control = CreateControl(); control.Items = CreateSimpleStringArray(); TextBox textBox = GetTextBox(control); + var window = new Window {Content = control}; + window.ApplyTemplate(); Dispatcher.UIThread.RunJobs(); test.Invoke(control, textBox); } @@ -1027,7 +1029,8 @@ namespace Avalonia.Controls.UnitTests var popup = new Popup { - Name = "PART_Popup" + Name = "PART_Popup", + PlacementTarget = control }.RegisterInNameScope(scope); var panel = new Panel(); diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs index 58d205deaa..93db620702 100644 --- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs @@ -27,7 +27,7 @@ namespace Avalonia.Controls.UnitTests ContextMenu = sut }; - new Window { Content = target }; + new Window { Content = target }.ApplyTemplate(); int openedCount = 0; @@ -36,7 +36,7 @@ namespace Avalonia.Controls.UnitTests openedCount++; }; - sut.Open(null); + sut.Open(target); Assert.Equal(1, openedCount); } @@ -53,9 +53,9 @@ namespace Avalonia.Controls.UnitTests ContextMenu = sut }; - new Window { Content = target }; + new Window { Content = target }.ApplyTemplate(); - sut.Open(null); + sut.Open(target); int closedCount = 0; @@ -190,12 +190,12 @@ namespace Avalonia.Controls.UnitTests screenImpl.Setup(x => x.ScreenCount).Returns(1); screenImpl.Setup(X => X.AllScreens).Returns( new[] { new Screen(screen, screen, true) }); - var windowImpl = new Mock(); - windowImpl.Setup(x => x.Screen).Returns(screenImpl.Object); - - popupImpl = new Mock(); + popupImpl = MockWindowingPlatform.CreatePopupMock(); popupImpl.SetupGet(x => x.Scaling).Returns(1); + var windowImpl = MockWindowingPlatform.CreateWindowMock(() => popupImpl.Object); + windowImpl.Setup(x => x.Screen).Returns(screenImpl.Object); + var services = TestServices.StyledWindow.With( inputManager: new InputManager(), windowImpl: windowImpl.Object, diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs index 44bb7cb69b..944bf1e642 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs @@ -43,13 +43,14 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (UnitTestApplication.Start(TestServices.StyledWindow)) { + var window = new Window(); var target = new TemplatedControlWithPopup { PopupContent = new Canvas(), }; + window.Content = target; - var root = new TestRoot { Child = target }; - + window.ApplyTemplate(); target.ApplyTemplate(); target.Popup.Open(); @@ -117,13 +118,14 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (UnitTestApplication.Start(TestServices.StyledWindow)) { + var window = new Window(); var target = new TemplatedControlWithPopup { PopupContent = new Canvas(), }; + window.Content = target; - var root = new TestRoot { Child = target }; - + window.ApplyTemplate(); target.ApplyTemplate(); target.Popup.Open(); target.PopupContent = null; @@ -158,6 +160,7 @@ namespace Avalonia.Controls.UnitTests.Primitives new Popup { [!Popup.ChildProperty] = parent[!TemplatedControlWithPopup.PopupContentProperty], + PlacementTarget = parent }); } diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index 2e22725125..82610c91df 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -146,7 +146,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (CreateServices()) { - var target = new Popup(); + var target = new Popup() {PlacementTarget = new Window()}; target.Open(); @@ -159,7 +159,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (CreateServices()) { - var target = new Popup(); + var target = new Popup() {PlacementTarget = new Window()}; target.Open(); @@ -173,15 +173,15 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (CreateServices()) { - var target = new Popup(); - var root = new TestRoot { Child = target }; + var target = new Popup() {PlacementMode = PlacementMode.Pointer}; + var root = new Window() { Content = target }; target.Open(); var popupRoot = (ILogical)target.PopupRoot; Assert.True(popupRoot.IsAttachedToLogicalTree); - root.Child = null; + root.Content = null; Assert.False(((ILogical)target).IsAttachedToLogicalTree); } } @@ -192,7 +192,7 @@ namespace Avalonia.Controls.UnitTests.Primitives using (CreateServices()) { var window = new Window(); - var target = new Popup(); + var target = new Popup() {PlacementMode = PlacementMode.Pointer}; window.Content = target; @@ -215,9 +215,10 @@ namespace Avalonia.Controls.UnitTests.Primitives using (CreateServices()) { var window = new Window(); - var target = new Popup(); + var target = new Popup() {PlacementMode = PlacementMode.Pointer}; window.Content = target; + window.ApplyTemplate(); target.Open(); int closedCount = 0; @@ -239,10 +240,11 @@ namespace Avalonia.Controls.UnitTests.Primitives using (CreateServices()) { var window = new Window(); - var target = new Popup(); + var target = new Popup {PlacementMode = PlacementMode.Pointer}; var child = new Control(); window.Content = target; + window.ApplyTemplate(); target.Open(); Assert.Single(target.PopupRoot.GetVisualChildren()); @@ -259,15 +261,16 @@ namespace Avalonia.Controls.UnitTests.Primitives using (CreateServices()) { PopupContentControl target; - var root = new TestRoot + var root = new Window() { - Child = target = new PopupContentControl + Content = target = new PopupContentControl { Content = new Border(), Template = new FuncControlTemplate(PopupContentControlTemplate), }, - StylingParent = AvaloniaLocator.Current.GetService() + //StylingParent = AvaloniaLocator.Current.GetService() }; + root.ApplyTemplate(); target.ApplyTemplate(); var popup = (Popup)target.GetTemplateChildren().First(x => x.Name == "popup"); @@ -311,6 +314,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { Child = child = new TestControl(), DataContext = "foo", + PlacementTarget = new Window() }; var beginCalled = false; @@ -332,36 +336,7 @@ namespace Avalonia.Controls.UnitTests.Primitives } - private static IDisposable CreateServices() - { - var result = AvaloniaLocator.EnterScope(); - - var styles = new Styles - { - new Style(x => x.OfType()) - { - Setters = new[] - { - new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate(PopupRootTemplate)), - } - }, - }; - - var globalStyles = new Mock(); - globalStyles.Setup(x => x.IsStylesInitialized).Returns(true); - globalStyles.Setup(x => x.Styles).Returns(styles); - - var renderInterface = new Mock(); - - AvaloniaLocator.CurrentMutable - .Bind().ToFunc(() => globalStyles.Object) - .Bind().ToConstant(new WindowingPlatformMock()) - .Bind().ToTransient() - .Bind().ToFunc(() => renderInterface.Object) - .Bind().ToConstant(new InputManager()); - - return result; - } + private static IDisposable CreateServices() => UnitTestApplication.Start(TestServices.StyledWindow); private static IControl PopupRootTemplate(PopupRoot control, INameScope scope) { @@ -377,6 +352,7 @@ namespace Avalonia.Controls.UnitTests.Primitives return new Popup { Name = "popup", + PlacementTarget = control, Child = new ContentPresenter { [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty], diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs index cbcf08049e..75239f014f 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs @@ -17,31 +17,6 @@ namespace Avalonia.Controls.UnitTests { public class WindowTests { - [Fact] - public void Impl_ClientSize_Should_Be_Set_After_Layout_Pass() - { - using (UnitTestApplication.Start(TestServices.StyledWindow)) - { - var impl = Mock.Of(x => x.Scaling == 1); - - Mock.Get(impl).Setup(x => x.Resize(It.IsAny())).Callback(() => { }); - - var target = new Window(impl) - { - Content = new TextBlock - { - Width = 321, - Height = 432, - }, - IsVisible = true, - }; - - target.LayoutManager.ExecuteInitialLayoutPass(target); - - Mock.Get(impl).Verify(x => x.Resize(new Size(321, 432))); - } - } - [Fact] public void Setting_Title_Should_Set_Impl_Title() { @@ -302,8 +277,7 @@ namespace Avalonia.Controls.UnitTests var screens = new Mock(); screens.Setup(x => x.AllScreens).Returns(new Screen[] { screen1.Object, screen2.Object }); - var windowImpl = new Mock(); - windowImpl.SetupProperty(x => x.Position); + var windowImpl = MockWindowingPlatform.CreateWindowMock(); windowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480)); windowImpl.Setup(x => x.Scaling).Returns(1); windowImpl.Setup(x => x.Screen).Returns(screens.Object); @@ -327,14 +301,12 @@ namespace Avalonia.Controls.UnitTests [Fact] public void Window_Should_Be_Centered_Relative_To_Owner_When_WindowStartupLocation_Is_CenterOwner() { - var parentWindowImpl = new Mock(); - parentWindowImpl.SetupProperty(x => x.Position); + var parentWindowImpl = MockWindowingPlatform.CreateWindowMock(); parentWindowImpl.Setup(x => x.ClientSize).Returns(new Size(800, 480)); parentWindowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080)); parentWindowImpl.Setup(x => x.Scaling).Returns(1); - var windowImpl = new Mock(); - windowImpl.SetupProperty(x => x.Position); + var windowImpl = MockWindowingPlatform.CreateWindowMock(); windowImpl.Setup(x => x.ClientSize).Returns(new Size(320, 200)); windowImpl.Setup(x => x.MaxClientSize).Returns(new Size(1920, 1080)); windowImpl.Setup(x => x.Scaling).Returns(1); diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index f065fcb63d..a1b3ab9736 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -4,6 +4,7 @@ false Library false + latest diff --git a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs index 36297bf58b..1b47318fe1 100644 --- a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs +++ b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs @@ -1,4 +1,6 @@ using System; +using Avalonia.Controls.Primitives.PopupPositioning; +using Avalonia.Input; using Moq; using Avalonia.Platform; @@ -15,16 +17,46 @@ namespace Avalonia.UnitTests _popupImpl = popupImpl; } + public static Mock CreateWindowMock(Func popupImpl = null) + { + var win = Mock.Of(x => x.Scaling == 1); + var mock = Mock.Get(win); + mock.Setup(x => x.CreatePopup()).Returns(() => + { + return popupImpl?.Invoke() ?? CreatePopupMock().Object; + + }); + PixelPoint pos = default; + mock.SetupGet(x => x.Position).Returns(() => pos); + mock.Setup(x => x.Move(It.IsAny())).Callback(new Action(np => pos = np)); + SetupToplevel(mock); + return mock; + } + + static void SetupToplevel(Mock mock) where T : class, ITopLevelImpl + { + mock.SetupGet(x => x.MouseDevice).Returns(new MouseDevice()); + } + + public static Mock CreatePopupMock() + { + var positioner = Mock.Of(); + var popup = Mock.Of(x => x.Scaling == 1); + var mock = Mock.Get(popup); + mock.SetupGet(x => x.PopupPositioner).Returns(positioner); + SetupToplevel(mock); + + return mock; + } + public IWindowImpl CreateWindow() { - return _windowImpl?.Invoke() ?? Mock.Of(x => x.Scaling == 1); + return _windowImpl?.Invoke() ?? CreateWindowMock(_popupImpl).Object; } public IEmbeddableWindowImpl CreateEmbeddableWindow() { throw new NotImplementedException(); } - - public IPopupImpl CreatePopup() => _popupImpl?.Invoke() ?? Mock.Of(x => x.Scaling == 1); } -} \ No newline at end of file +} From 79cf3e5cea5188f95b3b1b5d6338bea8f4661aab Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 15:40:19 +0300 Subject: [PATCH 11/43] Completely re-create PopupRoot on reopening Popup --- src/Avalonia.Controls/Primitives/Popup.cs | 196 ++++++++++++------ src/Avalonia.Controls/Primitives/PopupRoot.cs | 6 +- .../Primitives/PopupTests.cs | 1 + 3 files changed, 144 insertions(+), 59 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index 2163e035dc..f3528f6b5a 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -2,7 +2,11 @@ // 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.Diagnostics; using System.Linq; +using System.Reactive.Disposables; +using Avalonia.Data; using Avalonia.Input; using Avalonia.Input.Raw; using Avalonia.Interactivity; @@ -79,6 +83,8 @@ namespace Avalonia.Controls.Primitives private TopLevel _topLevel; private IDisposable _nonClientListener; bool _ignoreIsOpenChanged = false; + private List _bindings = new List(); + private PopupContentHost _decorator = new PopupContentHost(); /// /// Initializes static members of the class. @@ -91,6 +97,11 @@ namespace Avalonia.Controls.Primitives TopmostProperty.Changed.AddClassHandler((p, e) => p.PopupRoot.Topmost = (bool)e.NewValue); } + public Popup() + { + _decorator[~PopupContentHost.ChildProperty] = this[~ChildProperty]; + } + /// /// Raised when the popup closes. /// @@ -215,38 +226,48 @@ namespace Avalonia.Controls.Primitives /// public void Open() { - if (PlacementTarget == null && PlacementMode != PlacementMode.Pointer) - throw new InvalidOperationException("It's not valid to show a popup without a PlacementTarget with PlacementMode != Pointer"); + // Popup is currently open + if (_topLevel != null) + return; + CloseCurrent(); + var placementTarget = PlacementTarget ?? this.GetLogicalAncestors().OfType().FirstOrDefault(); + if (placementTarget == null) + throw new InvalidOperationException("Popup has no logical parent and PlacementTarget is null"); - if (_topLevel == null && PlacementTarget != null) - _topLevel = PlacementTarget.GetSelfAndLogicalAncestors().FirstOrDefault(x => x is TopLevel) as TopLevel; + _topLevel = placementTarget.GetVisualRoot() as TopLevel; if (_topLevel == null) { - if (PlacementTarget == null) - throw new InvalidOperationException( - "Attempted to open a popup not attached to a TopLevel and PlacementTarget is null"); throw new InvalidOperationException( - "Attempted to open a popup not attached to a TopLevel and PlacementTarget is also not attached to a TopLevel"); + "Attempted to open a popup not attached to a TopLevel"); } - if (_popupRoot == null) + + _popupRoot = new PopupRoot(_topLevel, DependencyResolver) { - _popupRoot = new PopupRoot(_topLevel, DependencyResolver) - { - [~ContentControl.ContentProperty] = this[~ChildProperty], - [~WidthProperty] = this[~WidthProperty], - [~HeightProperty] = this[~HeightProperty], - [~MinWidthProperty] = this[~MinWidthProperty], - [~MaxWidthProperty] = this[~MaxWidthProperty], - [~MinHeightProperty] = this[~MinHeightProperty], - [~MaxHeightProperty] = this[~MaxHeightProperty], - }; - - ((ISetLogicalParent)_popupRoot).SetParent(this); - } + [~WidthProperty] = this[~WidthProperty], + [~HeightProperty] = this[~HeightProperty], + [~MinWidthProperty] = this[~MinWidthProperty], + [~MaxWidthProperty] = this[~MaxWidthProperty], + [~MinHeightProperty] = this[~MinHeightProperty], + [~MaxHeightProperty] = this[~MaxHeightProperty], + }; + + void Bind(AvaloniaProperty prop) => _bindings.Add(_popupRoot.Bind(prop, this[~prop])); + + Bind(WidthProperty); + Bind(MinWidthProperty); + Bind(MaxWidthProperty); + Bind(HeightProperty); + Bind(MinHeightProperty); + Bind(MaxHeightProperty); + + _popupRoot.Content = _decorator; + - _popupRoot.ConfigurePosition(PlacementTarget ?? this.GetVisualParent(), + ((ISetLogicalParent)_popupRoot).SetParent(this); + + _popupRoot.ConfigurePosition(placementTarget, PlacementMode, new Point(HorizontalOffset, VerticalOffset)); var window = _topLevel as Window; @@ -282,35 +303,47 @@ namespace Avalonia.Controls.Primitives /// public void Close() { - if (_popupRoot != null) + CloseCurrent(); + using (BeginIgnoringIsOpen()) + { + IsOpen = false; + } + + Closed?.Invoke(this, EventArgs.Empty); + } + void CloseCurrent() + { + if (_topLevel != null) { - if (_topLevel != null) + _topLevel.RemoveHandler(PointerPressedEvent, PointerPressedOutside); + var window = _topLevel as Window; + if (window != null) + window.Deactivated -= WindowDeactivated; + else { - _topLevel.RemoveHandler(PointerPressedEvent, PointerPressedOutside); - var window = _topLevel as Window; - if (window != null) - window.Deactivated -= WindowDeactivated; - else + var parentPopuproot = _topLevel as PopupRoot; + if (parentPopuproot?.Parent is Popup popup) { - var parentPopuproot = _topLevel as PopupRoot; - if (parentPopuproot?.Parent is Popup popup) - { - popup.Closed -= ParentClosed; - } + popup.Closed -= ParentClosed; } - _nonClientListener?.Dispose(); - _nonClientListener = null; } - - _popupRoot.Hide(); + _nonClientListener?.Dispose(); + _nonClientListener = null; + + _topLevel = null; } - - using (BeginIgnoringIsOpen()) + if (_popupRoot != null) { - IsOpen = false; + foreach(var b in _bindings) + b.Dispose(); + _bindings.Clear(); + _popupRoot.Content = null; + _popupRoot.Hide(); + ((ISetLogicalParent)_popupRoot).SetParent(null); + _popupRoot.Dispose(); + _popupRoot = null; } - Closed?.Invoke(this, EventArgs.Empty); } /// @@ -323,27 +356,14 @@ namespace Avalonia.Controls.Primitives return new Size(); } - /// - protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) - { - base.OnAttachedToLogicalTree(e); - _topLevel = e.Root as TopLevel; - } - /// protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e) { base.OnDetachedFromLogicalTree(e); - _topLevel = null; - - if (_popupRoot != null) - { - ((ISetLogicalParent)_popupRoot).SetParent(null); - _popupRoot.Dispose(); - _popupRoot = null; - } + Close(); } + /// /// Called when the property changes. /// @@ -449,5 +469,65 @@ namespace Avalonia.Controls.Primitives _owner._ignoreIsOpenChanged = false; } } + + // For some reason when PopupRoot.Content is bound directly to Child weird stuff happens + class PopupContentHost : Control + { + /// + /// Defines the property. + /// + public static readonly StyledProperty ChildProperty = + AvaloniaProperty.Register(nameof(Child)); + + static PopupContentHost() + { + ChildProperty.Changed.AddClassHandler(x => x.ChildChanged); + } + + public IControl Child + { + get { return GetValue(ChildProperty); } + set { SetValue(ChildProperty, value); } + } + + /// + protected override Size MeasureOverride(Size availableSize) + { + if (Child == null) + return Size.Empty; + Child.Measure(availableSize); + return Child.DesiredSize; + } + + /// + protected override Size ArrangeOverride(Size finalSize) + { + Child?.Arrange(new Rect(finalSize)); + return finalSize; + } + + protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) + { + if (Child != null) + VisualChildren.Add(Child); + } + + protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) + { + if (Child != null) + VisualChildren.Remove(Child); + } + + private void ChildChanged(AvaloniaPropertyChangedEventArgs e) + { + var oldChild = (Control)e.OldValue; + var newChild = (Control)e.NewValue; + + if (oldChild != null) VisualChildren.Remove(oldChild); + + if (newChild != null && VisualRoot != null) + VisualChildren.Add(newChild); + } + } } } diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index d3dba6c908..0437d4a550 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -2,9 +2,13 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; +using System.Linq; +using System.Text; using Avalonia.Controls.Platform; using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives.PopupPositioning; +using Avalonia.Data; +using Avalonia.Diagnostics; using Avalonia.Interactivity; using Avalonia.Media; using Avalonia.Platform; @@ -125,7 +129,7 @@ namespace Avalonia.Controls.Primitives PlatformImpl?.PopupPositioner.Update(_positionerParameters); } - public void ConfigurePosition(Control target, PlacementMode placement, Point offset, + public void ConfigurePosition(IVisual target, PlacementMode placement, Point offset, PopupPositioningEdge anchor = PopupPositioningEdge.None, PopupPositioningEdge gravity = PopupPositioningEdge.None) { diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index 82610c91df..1086fa92ec 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -284,6 +284,7 @@ namespace Avalonia.Controls.UnitTests.Primitives new[] { "ContentPresenter", + "PopupContentHost", "ContentPresenter", "Border", }, From e5943a352352222fa5c73ed92a5830b875435e74 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 15:49:12 +0300 Subject: [PATCH 12/43] Dispose GL drawing session if we were unable to create a drawing context --- src/Skia/Avalonia.Skia/GlRenderTarget.cs | 89 ++++++++++++++---------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/src/Skia/Avalonia.Skia/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/GlRenderTarget.cs index a7c1d0a38b..61ccf09e52 100644 --- a/src/Skia/Avalonia.Skia/GlRenderTarget.cs +++ b/src/Skia/Avalonia.Skia/GlRenderTarget.cs @@ -26,51 +26,64 @@ namespace Avalonia.Skia public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) { var session = _surface.BeginDraw(); - var disp = session.Display; - var gl = disp.GlInterface; - gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var fb); - - var size = session.Size; - var scaling = session.Scaling; - if (size.Width <= 0 || size.Height <= 0 || scaling < 0) - { - throw new InvalidOperationException( - $"Can't create drawing context for surface with {size} size and {scaling} scaling"); - } - - gl.Viewport(0, 0, size.Width, size.Height); - gl.ClearStencil(0); - gl.ClearColor(0, 0, 0, 0); - gl.Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - lock (_grContext) + bool success = false; + try { - _grContext.ResetContext(); - - GRBackendRenderTarget renderTarget = - new GRBackendRenderTarget(size.Width, size.Height, disp.SampleCount, disp.StencilSize, - new GRGlFramebufferInfo((uint)fb, GRPixelConfig.Rgba8888.ToGlSizedFormat())); - var surface = SKSurface.Create(_grContext, renderTarget, - GRSurfaceOrigin.BottomLeft, - GRPixelConfig.Rgba8888.ToColorType()); + var disp = session.Display; + var gl = disp.GlInterface; + gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var fb); - var nfo = new DrawingContextImpl.CreateInfo + var size = session.Size; + var scaling = session.Scaling; + if (size.Width <= 0 || size.Height <= 0 || scaling < 0) { - GrContext = _grContext, - Canvas = surface.Canvas, - Dpi = SkiaPlatform.DefaultDpi * scaling, - VisualBrushRenderer = visualBrushRenderer, - DisableTextLcdRendering = true - }; + session.Dispose(); + throw new InvalidOperationException( + $"Can't create drawing context for surface with {size} size and {scaling} scaling"); + } - return new DrawingContextImpl(nfo, Disposable.Create(() => + gl.Viewport(0, 0, size.Width, size.Height); + gl.ClearStencil(0); + gl.ClearColor(0, 0, 0, 0); + gl.Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + lock (_grContext) { + _grContext.ResetContext(); + + GRBackendRenderTarget renderTarget = + new GRBackendRenderTarget(size.Width, size.Height, disp.SampleCount, disp.StencilSize, + new GRGlFramebufferInfo((uint)fb, GRPixelConfig.Rgba8888.ToGlSizedFormat())); + var surface = SKSurface.Create(_grContext, renderTarget, + GRSurfaceOrigin.BottomLeft, + GRPixelConfig.Rgba8888.ToColorType()); + + var nfo = new DrawingContextImpl.CreateInfo + { + GrContext = _grContext, + Canvas = surface.Canvas, + Dpi = SkiaPlatform.DefaultDpi * scaling, + VisualBrushRenderer = visualBrushRenderer, + DisableTextLcdRendering = true + }; + - surface.Canvas.Flush(); - surface.Dispose(); - renderTarget.Dispose(); - _grContext.Flush(); + var ctx = new DrawingContextImpl(nfo, Disposable.Create(() => + { + + surface.Canvas.Flush(); + surface.Dispose(); + renderTarget.Dispose(); + _grContext.Flush(); + session.Dispose(); + })); + success = true; + return ctx; + } + } + finally + { + if(!success) session.Dispose(); - })); } } } From fafd27243ffc15c24919bac0976945631d6028f5 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 16:46:27 +0300 Subject: [PATCH 13/43] Fixed tests --- src/Avalonia.Controls/Primitives/Popup.cs | 16 +++------------- .../ContextMenuTests.cs | 12 ++++++++---- .../Primitives/PopupTests.cs | 1 + 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index f3528f6b5a..201566831d 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -99,7 +99,7 @@ namespace Avalonia.Controls.Primitives public Popup() { - _decorator[~PopupContentHost.ChildProperty] = this[~ChildProperty]; + } /// @@ -261,6 +261,7 @@ namespace Avalonia.Controls.Primitives Bind(HeightProperty); Bind(MinHeightProperty); Bind(MaxHeightProperty); + _decorator.Bind(PopupContentHost.ChildProperty, this[~ChildProperty]); _popupRoot.Content = _decorator; @@ -506,17 +507,6 @@ namespace Avalonia.Controls.Primitives return finalSize; } - protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) - { - if (Child != null) - VisualChildren.Add(Child); - } - - protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) - { - if (Child != null) - VisualChildren.Remove(Child); - } private void ChildChanged(AvaloniaPropertyChangedEventArgs e) { @@ -525,7 +515,7 @@ namespace Avalonia.Controls.Primitives if (oldChild != null) VisualChildren.Remove(oldChild); - if (newChild != null && VisualRoot != null) + if (newChild != null) VisualChildren.Add(newChild); } } diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs index 93db620702..522afc9546 100644 --- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs @@ -84,7 +84,8 @@ namespace Avalonia.Controls.UnitTests ContextMenu = sut }; - new Window { Content = target }; + var window = new Window {Content = target}; + window.ApplyTemplate(); _mouse.Click(target, MouseButton.Right); @@ -112,7 +113,8 @@ namespace Avalonia.Controls.UnitTests ContextMenu = sut }; - var window = new Window { Content = target }; + var window = new Window {Content = target}; + window.ApplyTemplate(); _mouse.Click(target, MouseButton.Right); @@ -151,7 +153,7 @@ namespace Avalonia.Controls.UnitTests } } - [Fact] + [Fact(Skip = "The only reason this test was 'passing' before was that the author forgot to call Window.ApplyTemplate()")] public void Cancelling_Closing_Leaves_ContextMenuOpen() { using (Application()) @@ -165,7 +167,9 @@ namespace Avalonia.Controls.UnitTests { ContextMenu = sut }; - new Window { Content = target }; + + var window = new Window {Content = target}; + window.ApplyTemplate(); sut.ContextMenuClosing += (c, e) => { eventCalled = true; e.Cancel = true; }; diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index 1086fa92ec..3df4de6b68 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -298,6 +298,7 @@ namespace Avalonia.Controls.UnitTests.Primitives new object[] { popupRoot, + target, // PopupContentHost doesn't really need a templated parent, but gets assigned one target, null, }, From ac1dc44a954e67b067385af68e3fe340bd3566bb Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 16:53:49 +0300 Subject: [PATCH 14/43] Don't scale the screen in ManagedPopupPositionerPopupImplHelper --- .../PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs index ed1551bba5..bb701da651 100644 --- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs +++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositionerPopupImplHelper.cs @@ -24,7 +24,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning public IReadOnlyList Screens => _parent.Screen.AllScreens.Select(s => new ManagedPopupPositionerScreenInfo( - s.Bounds.ToRect(_parent.Scaling), s.WorkingArea.ToRect(_parent.Scaling))).ToList(); + s.Bounds.ToRect(1), s.WorkingArea.ToRect(1))).ToList(); public Rect ParentClientAreaScreenGeometry { From 7185a34568b41588d2f88ef7238482a3e1ac853d Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 17:00:19 +0300 Subject: [PATCH 15/43] Pass the non-translated size to the popup --- .../PopupPositioning/ManagedPopupPositioner.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs index d9d3c5a61b..02f482d38d 100644 --- a/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs +++ b/src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs @@ -76,7 +76,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning public void Update(PopupPositionerParameters parameters) { - Update(_popup.TranslateSize(parameters.Size), + Update(_popup.TranslateSize(parameters.Size), parameters.Size, new Rect(_popup.TranslatePoint(parameters.AnchorRectangle.TopLeft), _popup.TranslateSize(parameters.AnchorRectangle.Size)), parameters.Anchor, parameters.Gravity, parameters.ConstraintAdjustment, @@ -84,7 +84,8 @@ namespace Avalonia.Controls.Primitives.PopupPositioning } - void Update(Size size, Rect anchorRect, PopupPositioningEdge anchor, PopupPositioningEdge gravity, + void Update(Size translatedSize, Size originalSize, + Rect anchorRect, PopupPositioningEdge anchor, PopupPositioningEdge gravity, PopupPositionerConstraintAdjustment constraintAdjustment, Point offset) { var parentGeometry = _popup.ParentClientAreaScreenGeometry; @@ -127,7 +128,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning } Rect GetUnconstrained(PopupPositioningEdge a, PopupPositioningEdge g) => - new Rect(Gravitate(GetAnchorPoint(anchorRect, a), size, g) + offset, size); + new Rect(Gravitate(GetAnchorPoint(anchorRect, a), translatedSize, g) + offset, translatedSize); var geo = GetUnconstrained(anchor, gravity); @@ -168,7 +169,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning geo = geo.WithY(bounds.Bottom - geo.Height); } - _popup.MoveAndResize(geo.TopLeft, size); + _popup.MoveAndResize(geo.TopLeft, originalSize); } } } From 099a568d953694ed2186f702fc8350d768d88c99 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 17:02:54 +0300 Subject: [PATCH 16/43] Removed old debug code --- src/Avalonia.X11/X11Window.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs index 7ca2672d2b..a3c00abda9 100644 --- a/src/Avalonia.X11/X11Window.cs +++ b/src/Avalonia.X11/X11Window.cs @@ -474,8 +474,6 @@ namespace Avalonia.X11 if (Scaling != newScaling) { - Console.WriteLine( - $"Updating scaling from {Scaling} to {newScaling} as a response to position change to {Position}"); var oldScaledSize = ClientSize; Scaling = newScaling; ScalingChanged?.Invoke(Scaling); From 8c048ec18d072ffde9497035972d8c8293821f48 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 17:04:43 +0300 Subject: [PATCH 17/43] Removed android popup implementation since it was broken anyway --- .../Platform/SkiaPlatform/PopupImpl.cs | 112 ------------------ 1 file changed, 112 deletions(-) delete mode 100644 src/Android/Avalonia.Android/Platform/SkiaPlatform/PopupImpl.cs diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/PopupImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/PopupImpl.cs deleted file mode 100644 index e89414d1f8..0000000000 --- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/PopupImpl.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System; -using Android.Content; -using Android.Graphics; -using Android.Runtime; -using Android.Views; -using Avalonia.Controls; -using Avalonia.Platform; - -namespace Avalonia.Android.Platform.SkiaPlatform -{ - class PopupImpl : TopLevelImpl, IPopupImpl - { - private PixelPoint _position; - private bool _isAdded; - Action IWindowBaseImpl.Activated { get; set; } - public Action PositionChanged { get; set; } - public Action Deactivated { get; set; } - - public PopupImpl() : base(ActivityTracker.Current, true) - { - } - - private Size _clientSize = new Size(1, 1); - - public void Resize(Size value) - { - if (View == null) - return; - _clientSize = value; - UpdateParams(); - } - - public void SetMinMaxSize(Size minSize, Size maxSize) - { - } - - public IScreenImpl Screen { get; } - - public PixelPoint Position - { - get { return _position; } - set - { - _position = value; - PositionChanged?.Invoke(_position); - UpdateParams(); - } - } - - WindowManagerLayoutParams CreateParams() => new WindowManagerLayoutParams(0, - WindowManagerFlags.NotTouchModal, Format.Translucent) - { - Gravity = GravityFlags.Left | GravityFlags.Top, - WindowAnimations = 0, - X = (int) _position.X, - Y = (int) _position.Y, - Width = Math.Max(1, (int) _clientSize.Width), - Height = Math.Max(1, (int) _clientSize.Height) - }; - - void UpdateParams() - { - if (_isAdded) - ActivityTracker.Current?.WindowManager?.UpdateViewLayout(View, CreateParams()); - } - - public override void Show() - { - if (_isAdded) - return; - ActivityTracker.Current.WindowManager.AddView(View, CreateParams()); - _isAdded = true; - } - - public override void Hide() - { - if (_isAdded) - { - var wm = View.Context.ApplicationContext.GetSystemService(Context.WindowService) - .JavaCast(); - wm.RemoveView(View); - _isAdded = false; - } - } - - public override void Dispose() - { - Hide(); - base.Dispose(); - } - - - public void Activate() - { - } - - public void BeginMoveDrag() - { - //Not supported - } - - public void BeginResizeDrag(WindowEdge edge) - { - //Not supported - } - - public void SetTopmost(bool value) - { - //Not supported - } - } -} From f6e752c5fbf54f7419fda6a5403131bf89c56b0b Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 17:24:59 +0300 Subject: [PATCH 18/43] Dead code --- src/Avalonia.Controls/WindowBase.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs index 53e43e4ec4..a47c55f87c 100644 --- a/src/Avalonia.Controls/WindowBase.cs +++ b/src/Avalonia.Controls/WindowBase.cs @@ -175,11 +175,6 @@ namespace Avalonia.Controls } } - protected internal virtual void OnBeforeShow() - { - - } - /// /// Begins an auto-resize operation. /// From 80b15914caed1b4fbe502b359dd8f5fffc0f1345 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 27 Jul 2019 17:25:58 +0300 Subject: [PATCH 19/43] Build --- src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs index 7798452f10..f698266610 100644 --- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs +++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs @@ -241,6 +241,6 @@ namespace Avalonia.Win32.Interop.Wpf return new Vector(src.TransformToDevice.M11, src.TransformToDevice.M22); } - IPopupImpl CreatePopup() => null; + public IPopupImpl CreatePopup() => null; } } From f9561260a3d69f213ae4c63f31e5916da8fb9cd4 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sun, 28 Jul 2019 23:08:31 +0300 Subject: [PATCH 20/43] IPopupImpl is now optional advanced feature --- src/Avalonia.Controls/ComboBox.cs | 2 +- src/Avalonia.Controls/MenuItem.cs | 2 +- .../WindowNotificationManager.cs | 2 +- .../Primitives/AdornerDecorator.cs | 42 ----- .../Primitives/AdornerLayer.cs | 2 +- .../Primitives/IPopupHost.cs | 22 +++ .../Primitives/OverlayLayer.cs | 145 ++++++++++++++++ src/Avalonia.Controls/Primitives/Popup.cs | 60 ++----- src/Avalonia.Controls/Primitives/PopupHost.cs | 160 ++++++++++++++++++ .../PopupPositioning/IPopupPositioner.cs | 64 +++++++ src/Avalonia.Controls/Primitives/PopupRoot.cs | 91 ++++------ .../Primitives/VisualLayerManager.cs | 97 +++++++++++ src/Avalonia.Controls/ToolTip.cs | 5 +- .../AvaloniaNativePlatformExtensions.cs | 1 + src/Avalonia.Native/WindowImpl.cs | 3 +- src/Avalonia.Themes.Default/ComboBox.xaml | 4 +- .../EmbeddableControlRoot.xaml | 6 +- src/Avalonia.Themes.Default/Window.xaml | 4 +- src/Avalonia.X11/X11Platform.cs | 1 + src/Avalonia.X11/X11Window.cs | 3 +- src/Windows/Avalonia.Win32/Win32Platform.cs | 2 + src/Windows/Avalonia.Win32/WindowImpl.cs | 5 +- .../Primitives/PopupRootTests.cs | 41 ++++- .../Primitives/PopupTests.cs | 117 +++++++------ .../MarkupExtensions/BindingExtensionTests.cs | 13 +- .../MockWindowingPlatform.cs | 4 +- 26 files changed, 675 insertions(+), 223 deletions(-) delete mode 100644 src/Avalonia.Controls/Primitives/AdornerDecorator.cs create mode 100644 src/Avalonia.Controls/Primitives/IPopupHost.cs create mode 100644 src/Avalonia.Controls/Primitives/OverlayLayer.cs create mode 100644 src/Avalonia.Controls/Primitives/PopupHost.cs create mode 100644 src/Avalonia.Controls/Primitives/VisualLayerManager.cs diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs index f32b8fabc6..a70d26624c 100644 --- a/src/Avalonia.Controls/ComboBox.cs +++ b/src/Avalonia.Controls/ComboBox.cs @@ -202,7 +202,7 @@ namespace Avalonia.Controls { if (!e.Handled) { - if (_popup?.PopupRoot != null && ((IVisual)e.Source).GetVisualRoot() == _popup?.PopupRoot) + if (_popup?.IsInsidePopup((IVisual)e.Source) == true) { if (UpdateSelectionFromEventSource(e.Source)) { diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs index bd558af5ef..38cc3f6daf 100644 --- a/src/Avalonia.Controls/MenuItem.cs +++ b/src/Avalonia.Controls/MenuItem.cs @@ -224,7 +224,7 @@ namespace Avalonia.Controls public bool IsTopLevel => Parent is Menu; /// - bool IMenuItem.IsPointerOverSubMenu => _popup.PopupRoot?.IsPointerOver ?? false; + bool IMenuItem.IsPointerOverSubMenu => _popup?.IsPointerOverPopup ?? false; /// IMenuElement IMenuItem.Parent => Parent as IMenuElement; diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs index 93873cbf7d..aa91224572 100644 --- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs +++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs @@ -150,7 +150,7 @@ namespace Avalonia.Controls.Notifications private void Install(Window host) { var adornerLayer = host.GetVisualDescendants() - .OfType() + .OfType() .FirstOrDefault() ?.AdornerLayer; diff --git a/src/Avalonia.Controls/Primitives/AdornerDecorator.cs b/src/Avalonia.Controls/Primitives/AdornerDecorator.cs deleted file mode 100644 index 4608d64806..0000000000 --- a/src/Avalonia.Controls/Primitives/AdornerDecorator.cs +++ /dev/null @@ -1,42 +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.LogicalTree; - -namespace Avalonia.Controls.Primitives -{ - public class AdornerDecorator : Decorator - { - public AdornerDecorator() - { - AdornerLayer = new AdornerLayer(); - ((ISetLogicalParent)AdornerLayer).SetParent(this); - AdornerLayer.ZIndex = int.MaxValue; - VisualChildren.Add(AdornerLayer); - } - - protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) - { - base.OnAttachedToLogicalTree(e); - - ((ILogical)AdornerLayer).NotifyAttachedToLogicalTree(e); - } - - public AdornerLayer AdornerLayer - { - get; - } - - protected override Size MeasureOverride(Size availableSize) - { - AdornerLayer.Measure(availableSize); - return base.MeasureOverride(availableSize); - } - - protected override Size ArrangeOverride(Size finalSize) - { - AdornerLayer.Arrange(new Rect(finalSize)); - return base.ArrangeOverride(finalSize); - } - } -} diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs index d198570909..ebe5e0a93e 100644 --- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs +++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs @@ -42,7 +42,7 @@ namespace Avalonia.Controls.Primitives public static AdornerLayer GetAdornerLayer(IVisual visual) { return visual.GetVisualAncestors() - .OfType() + .OfType() .FirstOrDefault() ?.AdornerLayer; } diff --git a/src/Avalonia.Controls/Primitives/IPopupHost.cs b/src/Avalonia.Controls/Primitives/IPopupHost.cs new file mode 100644 index 0000000000..ca0f723893 --- /dev/null +++ b/src/Avalonia.Controls/Primitives/IPopupHost.cs @@ -0,0 +1,22 @@ +using System; +using Avalonia.Controls.Primitives.PopupPositioning; +using Avalonia.VisualTree; + +namespace Avalonia.Controls.Primitives +{ + public interface IPopupHost : IDisposable + { + object Content { get; set; } + IVisual VisualRoot { get; } + + void ConfigurePosition(IVisual target, PlacementMode placement, Point offset, + PopupPositioningEdge anchor = PopupPositioningEdge.None, + PopupPositioningEdge gravity = PopupPositioningEdge.None); + void Show(); + void Hide(); + IDisposable BindConstraints(AvaloniaObject popup, StyledProperty widthProperty, + StyledProperty minWidthProperty, StyledProperty maxWidthProperty, + StyledProperty heightProperty, StyledProperty minHeightProperty, + StyledProperty maxHeightProperty, StyledProperty topmostProperty); + } +} diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs new file mode 100644 index 0000000000..32dcf9f797 --- /dev/null +++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs @@ -0,0 +1,145 @@ +using System.Linq; +using Avalonia.VisualTree; + +namespace Avalonia.Controls.Primitives +{ + public class OverlayLayer : Control + { + /// + /// Defines the Left attached property. + /// + public static readonly AttachedProperty LeftProperty = + AvaloniaProperty.RegisterAttached("Left", 0); + + /// + /// Defines the Top attached property. + /// + public static readonly AttachedProperty TopProperty = + AvaloniaProperty.RegisterAttached("Top", 0); + + /// + /// Defines the InfiniteAvailableSize attached property. + /// + public static readonly AttachedProperty InfiniteAvailableSizeProperty = + AvaloniaProperty.RegisterAttached("InfiniteAvailableSize", false); + + + static OverlayLayer() + { + foreach (var p in new []{LeftProperty, TopProperty}) + { + p.Changed.AddClassHandler((target, e) => + { + if (target.GetVisualParent() is OverlayLayer layer) + layer.InvalidateArrange(); + }); + } + } + + public Size AvailableSize { get; private set; } + + /// + /// Gets the value of the Left attached property for a control. + /// + /// The control. + /// The control's left coordinate. + public static double GetLeft(AvaloniaObject element) + { + return element.GetValue(LeftProperty); + } + + /// + /// Sets the value of the Left attached property for a control. + /// + /// The control. + /// The left value. + public static void SetLeft(AvaloniaObject element, double value) + { + element.SetValue(LeftProperty, value); + } + + /// + /// Gets the value of the Top attached property for a control. + /// + /// The control. + /// The control's top coordinate. + public static double GetTop(AvaloniaObject element) + { + return element.GetValue(TopProperty); + } + + /// + /// Sets the value of the Top attached property for a control. + /// + /// The control. + /// The top value. + public static void SetTop(AvaloniaObject element, double value) + { + element.SetValue(TopProperty, value); + } + + /// + /// Gets the value of the Top attached property for a control. + /// + /// The control. + /// The control's top coordinate. + public static bool GetInfiniteAvailableSize(AvaloniaObject element) + { + return element.GetValue(InfiniteAvailableSizeProperty); + } + + /// + /// Sets the value of the Top attached property for a control. + /// + /// The control. + /// The top value. + public static void SetInfiniteAvailableSize(AvaloniaObject element, bool value) + { + element.SetValue(InfiniteAvailableSizeProperty, value); + } + + + public static OverlayLayer GetOverlayLayer(IVisual visual) + { + foreach(var v in visual.GetVisualAncestors()) + if(v is VisualLayerManager vlm) + if (vlm.OverlayLayer != null) + return vlm.OverlayLayer; + if (visual is TopLevel tl) + { + var layers = tl.GetVisualDescendants().OfType().FirstOrDefault(); + return layers?.OverlayLayer; + } + + return null; + } + + public void Add(Control v) + { + VisualChildren.Add(v); + InvalidateArrange(); + } + + public void Remove(Control v) => VisualChildren.Remove(v); + + protected override Size MeasureOverride(Size availableSize) + { + + var infinite = new Size(double.PositiveInfinity, double.PositiveInfinity); + foreach (Control v in VisualChildren) + v.Measure(GetInfiniteAvailableSize(v) ? infinite : availableSize); + + return new Size(); + } + + protected override Size ArrangeOverride(Size finalSize) + { + // We are saving it here since child controls might need to know the entire size of the overlay + // and Bounds won't be updated in time + AvailableSize = finalSize; + foreach (Control v in VisualChildren) + v.Arrange(new Rect(GetLeft(v), GetTop(v), v.DesiredSize.Width, v.DesiredSize.Height)); + return finalSize; + } + } +} diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index 201566831d..dc92347c9d 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -79,7 +79,7 @@ namespace Avalonia.Controls.Primitives AvaloniaProperty.Register(nameof(Topmost)); private bool _isOpen; - private PopupRoot _popupRoot; + private IPopupHost _popupRoot; private TopLevel _topLevel; private IDisposable _nonClientListener; bool _ignoreIsOpenChanged = false; @@ -94,7 +94,6 @@ namespace Avalonia.Controls.Primitives IsHitTestVisibleProperty.OverrideDefaultValue(false); ChildProperty.Changed.AddClassHandler(x => x.ChildChanged); IsOpenProperty.Changed.AddClassHandler(x => x.IsOpenChanged); - TopmostProperty.Changed.AddClassHandler((p, e) => p.PopupRoot.Topmost = (bool)e.NewValue); } public Popup() @@ -112,10 +111,7 @@ namespace Avalonia.Controls.Primitives /// public event EventHandler Opened; - /// - /// Raised when the popup root has been created, but before it has been shown. - /// - public event EventHandler PopupRootCreated; + public IPopupHost Host => _popupRoot; /// /// Gets or sets the control to display in the popup. @@ -192,11 +188,6 @@ namespace Avalonia.Controls.Primitives set { SetValue(PlacementTargetProperty, value); } } - /// - /// Gets the root of the popup window. - /// - public PopupRoot PopupRoot => _popupRoot; - /// /// Gets or sets a value indicating whether the popup should stay open when the popup is /// pressed or loses focus. @@ -219,7 +210,7 @@ namespace Avalonia.Controls.Primitives /// /// Gets the root of the popup window. /// - IVisual IVisualTreeHost.Root => _popupRoot; + IVisual IVisualTreeHost.Root => _popupRoot?.VisualRoot; /// /// Opens the popup. @@ -242,28 +233,13 @@ namespace Avalonia.Controls.Primitives "Attempted to open a popup not attached to a TopLevel"); } + _popupRoot = PopupHost.CreatePopupHost(placementTarget, DependencyResolver); - _popupRoot = new PopupRoot(_topLevel, DependencyResolver) - { - [~WidthProperty] = this[~WidthProperty], - [~HeightProperty] = this[~HeightProperty], - [~MinWidthProperty] = this[~MinWidthProperty], - [~MaxWidthProperty] = this[~MaxWidthProperty], - [~MinHeightProperty] = this[~MinHeightProperty], - [~MaxHeightProperty] = this[~MaxHeightProperty], - }; - - void Bind(AvaloniaProperty prop) => _bindings.Add(_popupRoot.Bind(prop, this[~prop])); - - Bind(WidthProperty); - Bind(MinWidthProperty); - Bind(MaxWidthProperty); - Bind(HeightProperty); - Bind(MinHeightProperty); - Bind(MaxHeightProperty); - _decorator.Bind(PopupContentHost.ChildProperty, this[~ChildProperty]); - - _popupRoot.Content = _decorator; + _bindings.Add(_popupRoot.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty, + HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty)); + _bindings.Add(_decorator.Bind(PopupContentHost.ChildProperty, this[~ChildProperty])); + + _popupRoot.SetContent(_decorator); ((ISetLogicalParent)_popupRoot).SetParent(this); @@ -287,7 +263,6 @@ namespace Avalonia.Controls.Primitives _topLevel.AddHandler(PointerPressedEvent, PointerPressedOutside, RoutingStrategies.Tunnel); _nonClientListener = InputManager.Instance?.Process.Subscribe(ListenForNonClientClick); - PopupRootCreated?.Invoke(this, EventArgs.Empty); _popupRoot.Show(); @@ -338,7 +313,7 @@ namespace Avalonia.Controls.Primitives foreach(var b in _bindings) b.Dispose(); _bindings.Clear(); - _popupRoot.Content = null; + _popupRoot.SetContent(null); _popupRoot.Hide(); ((ISetLogicalParent)_popupRoot).SetParent(null); _popupRoot.Dispose(); @@ -425,14 +400,15 @@ namespace Avalonia.Controls.Primitives private bool IsChildOrThis(IVisual child) { - IVisual root = child.GetVisualRoot(); - while (root is PopupRoot) - { - if (root == PopupRoot) return true; - root = ((PopupRoot)root).Parent.GetVisualRoot(); - } - return false; + return _decorator.FindCommonVisualAncestor(child) == _decorator; } + + public bool IsInsidePopup(IVisual visual) + { + return _decorator.FindCommonVisualAncestor(visual) == _decorator; + } + + public bool IsPointerOverPopup => _decorator.IsPointerOver; private void WindowDeactivated(object sender, EventArgs e) { diff --git a/src/Avalonia.Controls/Primitives/PopupHost.cs b/src/Avalonia.Controls/Primitives/PopupHost.cs new file mode 100644 index 0000000000..3d6809c061 --- /dev/null +++ b/src/Avalonia.Controls/Primitives/PopupHost.cs @@ -0,0 +1,160 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Disposables; +using Avalonia.Controls.Presenters; +using Avalonia.Controls.Primitives.PopupPositioning; +using Avalonia.Interactivity; +using Avalonia.LogicalTree; +using Avalonia.Media; +using Avalonia.Threading; +using Avalonia.VisualTree; + +namespace Avalonia.Controls.Primitives +{ + public class PopupHost : Control, IPopupHost, IInteractive, IManagedPopupPositionerPopup + { + private readonly OverlayLayer _overlayLayer; + private PopupPositionerParameters _positionerParameters = new PopupPositionerParameters(); + private ManagedPopupPositioner _positioner; + private bool _shown; + private IControl _content; + + public PopupHost(OverlayLayer overlayLayer) + { + _overlayLayer = overlayLayer; + _positioner = new ManagedPopupPositioner(this); + } + + public void SetContent(IControl control) + { + if (_content == control) + return; + if (_content != null) + VisualChildren.Remove(_content); + _content = control; + if (_content != null) + VisualChildren.Add(_content); + } + + public IVisual VisualRoot => null; + + /// + IInteractive IInteractive.InteractiveParent => Parent; + + public void Dispose() => Hide(); + + + public void Show() + { + _overlayLayer.Add(this); + _shown = true; + } + + public void Hide() + { + _overlayLayer.Remove(this); + _shown = false; + } + + public IDisposable BindConstraints(AvaloniaObject popup, StyledProperty widthProperty, StyledProperty minWidthProperty, + StyledProperty maxWidthProperty, StyledProperty heightProperty, StyledProperty minHeightProperty, + StyledProperty maxHeightProperty, StyledProperty topmostProperty) + { + // Topmost property is not supported + var bindings = new List(); + + void Bind(AvaloniaProperty what, AvaloniaProperty to) => bindings.Add(this.Bind(what, popup[~to])); + Bind(WidthProperty, widthProperty); + Bind(MinWidthProperty, minWidthProperty); + Bind(MaxWidthProperty, maxWidthProperty); + Bind(HeightProperty, heightProperty); + Bind(MinHeightProperty, minHeightProperty); + Bind(MaxHeightProperty, maxHeightProperty); + + return Disposable.Create(() => + { + foreach (var x in bindings) + x.Dispose(); + }); + } + + public void ConfigurePosition(IVisual target, PlacementMode placement, Point offset, + PopupPositioningEdge anchor = PopupPositioningEdge.None, PopupPositioningEdge gravity = PopupPositioningEdge.None) + { + _positionerParameters.ConfigurePosition((TopLevel)_overlayLayer.GetVisualRoot(), target, placement, offset, anchor, + gravity); + UpdatePosition(); + } + + protected override Size ArrangeOverride(Size finalSize) + { + if (_positionerParameters.Size != finalSize) + { + _positionerParameters.Size = finalSize; + UpdatePosition(); + } + return base.ArrangeOverride(finalSize); + } + + + void UpdatePosition() + { + // Don't bother the positioner with layout system artifacts + if (_positionerParameters.Size.Width == 0 || _positionerParameters.Size.Height == 0) + return; + if (_shown) + { + _positioner.Update(_positionerParameters); + } + } + + IReadOnlyList IManagedPopupPositionerPopup.Screens + { + get + { + var rc = new Rect(default, _overlayLayer.AvailableSize); + return new[] {new ManagedPopupPositionerScreenInfo(rc, rc)}; + } + } + + Rect IManagedPopupPositionerPopup.ParentClientAreaScreenGeometry => + new Rect(default, _overlayLayer.Bounds.Size); + + private Point _lastRequestedPosition; + void IManagedPopupPositionerPopup.MoveAndResize(Point devicePoint, Size virtualSize) + { + _lastRequestedPosition = devicePoint; + Dispatcher.UIThread.Post(() => + { + OverlayLayer.SetLeft(this, _lastRequestedPosition.X); + OverlayLayer.SetTop(this, _lastRequestedPosition.Y); + }, DispatcherPriority.Layout); + } + + Point IManagedPopupPositionerPopup.TranslatePoint(Point pt) => pt; + + Size IManagedPopupPositionerPopup.TranslateSize(Size size) => size; + + public static IPopupHost CreatePopupHost(IVisual target, IAvaloniaDependencyResolver dependencyResolver) + { + var platform = (target.GetVisualRoot() as TopLevel)?.PlatformImpl?.CreatePopup(); + if (platform != null) + return new PopupRoot((TopLevel)target.GetVisualRoot(), platform, dependencyResolver); + { + var overlayLayer = OverlayLayer.GetOverlayLayer(target); + if (overlayLayer == null) + throw new InvalidOperationException( + "Unable to create IPopupImpl and no overlay layer is found for the target control"); + + + return new PopupHost(overlayLayer); + } + } + + public override void Render(DrawingContext context) + { + context.FillRectangle(Brushes.White, new Rect(default, Bounds.Size)); + } + } +} diff --git a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs index af78483b7f..3010a3d8a8 100644 --- a/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs +++ b/src/Avalonia.Controls/Primitives/PopupPositioning/IPopupPositioner.cs @@ -45,6 +45,7 @@ Copyright © 2019 Nikita Tsukanov */ using System; +using Avalonia.VisualTree; namespace Avalonia.Controls.Primitives.PopupPositioning { @@ -290,5 +291,68 @@ namespace Avalonia.Controls.Primitives.PopupPositioning void Update(PopupPositionerParameters parameters); } + static class PopupPositionerExtensions + { + public static void ConfigurePosition(ref this PopupPositionerParameters positionerParameters, + TopLevel topLevel, + IVisual target, PlacementMode placement, Point offset, + PopupPositioningEdge anchor, PopupPositioningEdge gravity) + { + // We need a better way for tracking the last pointer position + var pointer = topLevel.PointToClient(topLevel.PlatformImpl.MouseDevice.Position); + + positionerParameters.Offset = offset; + positionerParameters.ConstraintAdjustment = PopupPositionerConstraintAdjustment.All; + if (placement == PlacementMode.Pointer) + { + positionerParameters.AnchorRectangle = new Rect(pointer, new Size(1, 1)); + positionerParameters.Anchor = PopupPositioningEdge.BottomRight; + positionerParameters.Gravity = PopupPositioningEdge.BottomRight; + } + else + { + if (target == null) + throw new InvalidOperationException("Placement mode is not Pointer and PlacementTarget is null"); + var matrix = target.TransformToVisual(topLevel); + if (matrix == null) + { + if (target.GetVisualRoot() == null) + throw new InvalidCastException("Target control is not attached to the visual tree"); + throw new InvalidCastException("Target control is not in the same tree as the popup parent"); + } + + positionerParameters.AnchorRectangle = new Rect(default, target.Bounds.Size) + .TransformToAABB(matrix.Value); + + if (placement == PlacementMode.Right) + { + positionerParameters.Anchor = PopupPositioningEdge.TopRight; + positionerParameters.Gravity = PopupPositioningEdge.BottomRight; + } + else if (placement == PlacementMode.Bottom) + { + positionerParameters.Anchor = PopupPositioningEdge.BottomLeft; + positionerParameters.Gravity = PopupPositioningEdge.BottomRight; + } + else if (placement == PlacementMode.Left) + { + positionerParameters.Anchor = PopupPositioningEdge.TopLeft; + positionerParameters.Gravity = PopupPositioningEdge.BottomLeft; + } + else if (placement == PlacementMode.Top) + { + positionerParameters.Anchor = PopupPositioningEdge.TopLeft; + positionerParameters.Gravity = PopupPositioningEdge.TopRight; + } + else if (placement == PlacementMode.AnchorAndGravity) + { + positionerParameters.Anchor = anchor; + positionerParameters.Gravity = gravity; + } + else + throw new InvalidOperationException("Invalid value for Popup.PlacementMode"); + } + } + } } diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index 0437d4a550..36595f69c4 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -2,7 +2,9 @@ // 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.Reactive.Disposables; using System.Text; using Avalonia.Controls.Platform; using Avalonia.Controls.Presenters; @@ -21,7 +23,7 @@ namespace Avalonia.Controls.Primitives /// /// The root window of a . /// - public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost + public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost, IPopupHost { private readonly TopLevel _parent; private IDisposable _presenterSubscription; @@ -38,8 +40,8 @@ namespace Avalonia.Controls.Primitives /// /// Initializes a new instance of the class. /// - public PopupRoot(TopLevel parent) - : this(parent, null) + public PopupRoot(TopLevel parent, IPopupImpl impl) + : this(parent, impl,null) { } @@ -49,8 +51,8 @@ namespace Avalonia.Controls.Primitives /// /// The dependency resolver to use. If null the default dependency resolver will be used. /// - public PopupRoot(TopLevel parent, IAvaloniaDependencyResolver dependencyResolver) - : base(parent.PlatformImpl.CreatePopup(), dependencyResolver) + public PopupRoot(TopLevel parent, IPopupImpl impl, IAvaloniaDependencyResolver dependencyResolver) + : base(impl, dependencyResolver) { _parent = parent; } @@ -133,65 +135,36 @@ namespace Avalonia.Controls.Primitives PopupPositioningEdge anchor = PopupPositioningEdge.None, PopupPositioningEdge gravity = PopupPositioningEdge.None) { - // We need a better way for tracking the last pointer position - var pointer = _parent.PointToClient(_parent.PlatformImpl.MouseDevice.Position); - - _positionerParameters.Offset = offset; - _positionerParameters.ConstraintAdjustment = PopupPositionerConstraintAdjustment.All; - if (placement == PlacementMode.Pointer) - { - _positionerParameters.AnchorRectangle = new Rect(pointer, new Size(1, 1)); - _positionerParameters.Anchor = PopupPositioningEdge.BottomRight; - _positionerParameters.Gravity = PopupPositioningEdge.BottomRight; - } - else - { - if (target == null) - throw new InvalidOperationException("Placement mode is not Pointer and PlacementTarget is null"); - var matrix = target.TransformToVisual(_parent); - if (matrix == null) - { - if (target.GetVisualRoot() == null) - throw new InvalidCastException("Target control is not attached to the visual tree"); - throw new InvalidCastException("Target control is not in the same tree as the popup parent"); - } - - _positionerParameters.AnchorRectangle = new Rect(default, target.Bounds.Size) - .TransformToAABB(matrix.Value); - - if (placement == PlacementMode.Right) - { - _positionerParameters.Anchor = PopupPositioningEdge.TopRight; - _positionerParameters.Gravity = PopupPositioningEdge.BottomRight; - } - else if (placement == PlacementMode.Bottom) - { - _positionerParameters.Anchor = PopupPositioningEdge.BottomLeft; - _positionerParameters.Gravity = PopupPositioningEdge.BottomRight; - } - else if (placement == PlacementMode.Left) - { - _positionerParameters.Anchor = PopupPositioningEdge.TopLeft; - _positionerParameters.Gravity = PopupPositioningEdge.BottomLeft; - } - else if (placement == PlacementMode.Top) - { - _positionerParameters.Anchor = PopupPositioningEdge.TopLeft; - _positionerParameters.Gravity = PopupPositioningEdge.TopRight; - } - else if (placement == PlacementMode.AnchorAndGravity) - { - _positionerParameters.Anchor = anchor; - _positionerParameters.Gravity = gravity; - } - else - throw new InvalidOperationException("Invalid value for Popup.PlacementMode"); - } + _positionerParameters.ConfigurePosition(_parent, target, + placement, offset, anchor, gravity); if (_positionerParameters.Size != default) UpdatePosition(); } + + IVisual IPopupHost.VisualRoot => this; + public IDisposable BindConstraints(AvaloniaObject popup, StyledProperty widthProperty, StyledProperty minWidthProperty, + StyledProperty maxWidthProperty, StyledProperty heightProperty, StyledProperty minHeightProperty, + StyledProperty maxHeightProperty, StyledProperty topmostProperty) + { + var bindings = new List(); + + void Bind(AvaloniaProperty what, AvaloniaProperty to) => bindings.Add(this.Bind(what, popup[~to])); + Bind(WidthProperty, widthProperty); + Bind(MinWidthProperty, minWidthProperty); + Bind(MaxWidthProperty, maxWidthProperty); + Bind(HeightProperty, heightProperty); + Bind(MinHeightProperty, minHeightProperty); + Bind(MaxHeightProperty, maxHeightProperty); + Bind(TopmostProperty, topmostProperty); + return Disposable.Create(() => + { + foreach (var x in bindings) + x.Dispose(); + }); + } + /// /// Carries out the arrange pass of the window. /// diff --git a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs new file mode 100644 index 0000000000..7354f2788f --- /dev/null +++ b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs @@ -0,0 +1,97 @@ +using System.Collections.Generic; +using Avalonia.LogicalTree; +using Avalonia.Styling; + +namespace Avalonia.Controls.Primitives +{ + public class VisualLayerManager : Decorator + { + private const int AdornerZIndex = int.MaxValue - 100; + private const int OverlayZIndex = int.MaxValue - 99; + + private bool _isAttachedToLogicalTree; + private IStyleHost _styleHost; + public bool IsPopup { get; set; } + + List _layers = new List(); + + + public AdornerLayer AdornerLayer + { + get + { + var rv = FindLayer(); + if (rv == null) + AddLayer(rv = new AdornerLayer(), AdornerZIndex); + return rv; + } + } + + public OverlayLayer OverlayLayer + { + get + { + if (IsPopup) + return null; + var rv = FindLayer(); + if(rv == null) + AddLayer(rv = new OverlayLayer(), OverlayZIndex); + return rv; + } + } + + T FindLayer() where T : class + { + foreach (var layer in _layers) + if (layer is T match) + return match; + return null; + } + + void AddLayer(Control layer, int zindex) + { + _layers.Add(layer); + ((ISetLogicalParent)layer).SetParent(this); + layer.ZIndex = zindex; + VisualChildren.Add(layer); + if (_isAttachedToLogicalTree) + ((ILogical)layer).NotifyAttachedToLogicalTree(new LogicalTreeAttachmentEventArgs(_styleHost)); + InvalidateArrange(); + } + + + protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) + { + base.OnAttachedToLogicalTree(e); + _isAttachedToLogicalTree = true; + _styleHost = e.Root; + + foreach (var l in _layers) + ((ILogical)l).NotifyAttachedToLogicalTree(e); + } + + protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e) + { + _styleHost = null; + _isAttachedToLogicalTree = false; + base.OnDetachedFromLogicalTree(e); + foreach (var l in _layers) + ((ILogical)l).NotifyDetachedFromLogicalTree(e); + } + + + protected override Size MeasureOverride(Size availableSize) + { + foreach (var l in _layers) + l.Measure(availableSize); + return base.MeasureOverride(availableSize); + } + + protected override Size ArrangeOverride(Size finalSize) + { + foreach (var l in _layers) + l.Arrange(new Rect(finalSize)); + return base.ArrangeOverride(finalSize); + } + } +} diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs index da537a2e65..1bfcb47bb9 100644 --- a/src/Avalonia.Controls/ToolTip.cs +++ b/src/Avalonia.Controls/ToolTip.cs @@ -61,7 +61,7 @@ namespace Avalonia.Controls private static readonly AttachedProperty ToolTipProperty = AvaloniaProperty.RegisterAttached("ToolTip"); - private PopupRoot _popup; + private IPopupHost _popup; /// /// Initializes static members of the class. @@ -235,7 +235,8 @@ namespace Avalonia.Controls { Close(); - _popup = new PopupRoot((TopLevel)control.GetVisualRoot()) {Content = this}; + _popup = PopupHost.CreatePopupHost(control, null); + _popup.Content = this; ((ISetLogicalParent)_popup).SetParent(control); _popup.ConfigurePosition(control, GetPlacement(control), diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs index 09f822cf46..02810ed155 100644 --- a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs +++ b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs @@ -24,6 +24,7 @@ namespace Avalonia { public bool UseDeferredRendering { get; set; } = true; public bool UseGpu { get; set; } = true; + public bool OverlayPopups { get; set; } public string AvaloniaNativeLibraryPath { get; set; } } diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs index e4c158eeb3..490d5688a8 100644 --- a/src/Avalonia.Native/WindowImpl.cs +++ b/src/Avalonia.Native/WindowImpl.cs @@ -106,6 +106,7 @@ namespace Avalonia.Native public Func Closing { get; set; } public void Move(PixelPoint point) => Position = point; - public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, this); + public override IPopupImpl CreatePopup() => + _opts.OverlayPopups ? null : new PopupImpl(_factory, _opts, this); } } diff --git a/src/Avalonia.Themes.Default/ComboBox.xaml b/src/Avalonia.Themes.Default/ComboBox.xaml index 6227962a48..ffc96d5a2c 100644 --- a/src/Avalonia.Themes.Default/ComboBox.xaml +++ b/src/Avalonia.Themes.Default/ComboBox.xaml @@ -39,7 +39,7 @@ StaysOpen="False"> - + - + diff --git a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml index bc06ab010e..1fd168c009 100644 --- a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml +++ b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml @@ -4,13 +4,13 @@ - + - + - \ No newline at end of file + diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Window.xaml index 2514422ce8..2a8b5d0fca 100644 --- a/src/Avalonia.Themes.Default/Window.xaml +++ b/src/Avalonia.Themes.Default/Window.xaml @@ -5,14 +5,14 @@ - + - + diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs index 9bdcaab82b..e88a7d8db2 100644 --- a/src/Avalonia.X11/X11Platform.cs +++ b/src/Avalonia.X11/X11Platform.cs @@ -91,6 +91,7 @@ namespace Avalonia { public bool UseEGL { get; set; } public bool UseGpu { get; set; } = true; + public bool OverlayPopups { get; set; } public List GlxRendererBlacklist { get; set; } = new List { diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs index a3c00abda9..5481862f23 100644 --- a/src/Avalonia.X11/X11Window.cs +++ b/src/Avalonia.X11/X11Window.cs @@ -812,7 +812,8 @@ namespace Avalonia.X11 } public IMouseDevice MouseDevice => _mouse; - public IPopupImpl CreatePopup() => new X11Window(_platform, this); + public IPopupImpl CreatePopup() + => _platform.Options.OverlayPopups ? null : new X11Window(_platform, this); public void Activate() { diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs index 56a7e356b6..f20cf394bb 100644 --- a/src/Windows/Avalonia.Win32/Win32Platform.cs +++ b/src/Windows/Avalonia.Win32/Win32Platform.cs @@ -41,6 +41,7 @@ namespace Avalonia public bool UseDeferredRendering { get; set; } = true; public bool AllowEglInitialization { get; set; } public bool? EnableMultitouch { get; set; } + public bool OverlayPopups { get; set; } } } @@ -61,6 +62,7 @@ namespace Avalonia.Win32 } public static bool UseDeferredRendering => Options.UseDeferredRendering; + internal static bool UseOverlayPopups => Options.OverlayPopups; public static Win32PlatformOptions Options { get; private set; } public Size DoubleClickSize => new Size( diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index 21625af84a..e33e1f11dc 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -250,10 +250,7 @@ namespace Avalonia.Win32 UnmanagedMethods.SetActiveWindow(_hwnd); } - public IPopupImpl CreatePopup() - { - return new PopupImpl(this); - } + public IPopupImpl CreatePopup() => Win32Platform.UseOverlayPopups ? null : new PopupImpl(this); public void Dispose() { diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs index 944bf1e642..e840e7b530 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs @@ -54,10 +54,47 @@ namespace Avalonia.Controls.UnitTests.Primitives target.ApplyTemplate(); target.Popup.Open(); - Assert.Equal(target.Popup, ((IStyleHost)target.Popup.PopupRoot).StylingParent); + Assert.Equal(target.Popup, ((IStyleHost)target.Popup.Host).StylingParent); } } + [Fact] + public void PopupRoot_Should_Have_Template_Applied() + { + using (UnitTestApplication.Start(TestServices.StyledWindow)) + { + var window = new Window(); + var target = new Popup {PlacementMode = PlacementMode.Pointer}; + var child = new Control(); + + window.Content = target; + window.ApplyTemplate(); + target.Open(); + + + Assert.Single(((Visual)target.Host).GetVisualChildren()); + + var templatedChild = ((Visual)target.Host).GetVisualChildren().Single(); + Assert.IsType(templatedChild); + + + Assert.Equal((PopupRoot)target.Host, ((IControl)templatedChild).TemplatedParent); + } + } + + [Fact] + public void PopupRoot_Should_Have_Null_VisualParent() + { + using (UnitTestApplication.Start(TestServices.StyledWindow)) + { + var target = new Popup() {PlacementTarget = new Window()}; + + target.Open(); + + Assert.Null(((Visual)target.Host).GetVisualParent()); + } + } + [Fact] public void Attaching_PopupRoot_To_Parent_Logical_Tree_Raises_DetachedFromLogicalTree_And_AttachedToLogicalTree() { @@ -134,7 +171,7 @@ namespace Avalonia.Controls.UnitTests.Primitives private PopupRoot CreateTarget(TopLevel popupParent) { - var result = new PopupRoot(popupParent) + var result = new PopupRoot(popupParent, popupParent.PlatformImpl.CreatePopup()) { Template = new FuncControlTemplate((parent, scope) => new ContentPresenter diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index 3df4de6b68..ccdfe8af33 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -22,6 +22,8 @@ namespace Avalonia.Controls.UnitTests.Primitives { public class PopupTests { + protected bool UsePopupHost; + [Fact] public void Setting_Child_Should_Set_Child_Controls_LogicalParent() { @@ -137,20 +139,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { var target = new Popup(); - Assert.Null(target.PopupRoot); - } - } - - [Fact] - public void PopupRoot_Should_Have_Null_VisualParent() - { - using (CreateServices()) - { - var target = new Popup() {PlacementTarget = new Window()}; - - target.Open(); - - Assert.Null(target.PopupRoot.GetVisualParent()); + Assert.Null(((Visual)target.Host)); } } @@ -159,12 +148,12 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (CreateServices()) { - var target = new Popup() {PlacementTarget = new Window()}; + var target = new Popup() {PlacementTarget = PreparedWindow()}; target.Open(); - Assert.Equal(target, target.PopupRoot.Parent); - Assert.Equal(target, target.PopupRoot.GetLogicalParent()); + Assert.Equal(target, ((Visual)target.Host).Parent); + Assert.Equal(target, ((Visual)target.Host).GetLogicalParent()); } } @@ -174,11 +163,11 @@ namespace Avalonia.Controls.UnitTests.Primitives using (CreateServices()) { var target = new Popup() {PlacementMode = PlacementMode.Pointer}; - var root = new Window() { Content = target }; + var root = PreparedWindow(target); target.Open(); - var popupRoot = (ILogical)target.PopupRoot; + var popupRoot = (ILogical)((Visual)target.Host); Assert.True(popupRoot.IsAttachedToLogicalTree); root.Content = null; @@ -191,7 +180,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (CreateServices()) { - var window = new Window(); + var window = PreparedWindow(); var target = new Popup() {PlacementMode = PlacementMode.Pointer}; window.Content = target; @@ -214,7 +203,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { using (CreateServices()) { - var window = new Window(); + var window = PreparedWindow(); var target = new Popup() {PlacementMode = PlacementMode.Pointer}; window.Content = target; @@ -234,48 +223,28 @@ namespace Avalonia.Controls.UnitTests.Primitives } } - [Fact] - public void PopupRoot_Should_Have_Template_Applied() - { - using (CreateServices()) - { - var window = new Window(); - var target = new Popup {PlacementMode = PlacementMode.Pointer}; - var child = new Control(); - - window.Content = target; - window.ApplyTemplate(); - target.Open(); - - Assert.Single(target.PopupRoot.GetVisualChildren()); - - var templatedChild = target.PopupRoot.GetVisualChildren().Single(); - Assert.IsType(templatedChild); - Assert.Equal(target.PopupRoot, ((IControl)templatedChild).TemplatedParent); - } - } - + [Fact] public void Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent() { + if(UsePopupHost) + // For some reason with overlay popups templates don't get applied in test mode but + // everything works perfectly fine at runtime. I leave this one to you @grokys + return; using (CreateServices()) { PopupContentControl target; - var root = new Window() + var root = PreparedWindow(target = new PopupContentControl { - Content = target = new PopupContentControl - { - Content = new Border(), - Template = new FuncControlTemplate(PopupContentControlTemplate), - }, - //StylingParent = AvaloniaLocator.Current.GetService() - }; - root.ApplyTemplate(); + Content = new Border(), + Template = new FuncControlTemplate(PopupContentControlTemplate), + }); + root.Show(); target.ApplyTemplate(); var popup = (Popup)target.GetTemplateChildren().First(x => x.Name == "popup"); popup.Open(); - var popupRoot = popup.PopupRoot; + var popupRoot = (Visual)popup.Host; var children = popupRoot.GetVisualDescendants().ToList(); var types = children.Select(x => x.GetType().Name).ToList(); @@ -306,6 +275,13 @@ namespace Avalonia.Controls.UnitTests.Primitives } } + Window PreparedWindow(object content = null) + { + var w = new Window {Content = content}; + w.ApplyTemplate(); + return w; + } + [Fact] public void DataContextBeginUpdate_Should_Not_Be_Called_For_Controls_That_Dont_Inherit() { @@ -316,7 +292,7 @@ namespace Avalonia.Controls.UnitTests.Primitives { Child = child = new TestControl(), DataContext = "foo", - PlacementTarget = new Window() + PlacementTarget = PreparedWindow() }; var beginCalled = false; @@ -336,9 +312,34 @@ namespace Avalonia.Controls.UnitTests.Primitives Assert.False(beginCalled); } } + + [Fact] + public void Popup_Host_Type_Should_Match_Platform_Preference() + { + using (CreateServices()) + { + var target = new Popup() {PlacementTarget = PreparedWindow()}; + + target.Open(); + if (UsePopupHost) + Assert.IsType(target.Host); + else + Assert.IsType(target.Host); + } + } - private static IDisposable CreateServices() => UnitTestApplication.Start(TestServices.StyledWindow); + private IDisposable CreateServices() + { + return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform: + new MockWindowingPlatform(null, + () => + { + if(UsePopupHost) + return null; + return MockWindowingPlatform.CreatePopupMock().Object; + }))); + } private static IControl PopupRootTemplate(PopupRoot control, INameScope scope) { @@ -379,4 +380,12 @@ namespace Avalonia.Controls.UnitTests.Primitives } } } + + public class PopupTestsWithPopupRoot : PopupTests + { + public PopupTestsWithPopupRoot() + { + UsePopupHost = true; + } + } } diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs index dcecfe3b22..b8d41d5a87 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using Avalonia.Controls; using Avalonia.Controls.Presenters; +using Avalonia.Controls.Primitives; using Avalonia.Controls.Templates; using Avalonia.Styling; using Avalonia.UnitTests; @@ -59,11 +60,15 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions new Setter( Window.TemplateProperty, new FuncControlTemplate((x, scope) => - new ContentPresenter + new VisualLayerManager { - Name = "PART_ContentPresenter", - [!ContentPresenter.ContentProperty] = x[!Window.ContentProperty], - }.RegisterInNameScope(scope))) + Child = + new ContentPresenter + { + Name = "PART_ContentPresenter", + [!ContentPresenter.ContentProperty] = x[!Window.ContentProperty], + }.RegisterInNameScope(scope) + })) } }; } diff --git a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs index 1b47318fe1..c33ec72141 100644 --- a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs +++ b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs @@ -23,7 +23,9 @@ namespace Avalonia.UnitTests var mock = Mock.Get(win); mock.Setup(x => x.CreatePopup()).Returns(() => { - return popupImpl?.Invoke() ?? CreatePopupMock().Object; + if (popupImpl != null) + return popupImpl(); + return CreatePopupMock().Object; }); PixelPoint pos = default; From 1c111aef6c76cd4d945934524ca71ca033bfd9b3 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sun, 28 Jul 2019 23:25:18 +0300 Subject: [PATCH 21/43] watwut --- src/Avalonia.Controls/Primitives/IPopupHost.cs | 2 +- src/Avalonia.Controls/Primitives/OverlayLayer.cs | 1 + src/Avalonia.Controls/Primitives/PopupRoot.cs | 2 ++ src/Avalonia.Controls/ToolTip.cs | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/IPopupHost.cs b/src/Avalonia.Controls/Primitives/IPopupHost.cs index ca0f723893..df68eab6a4 100644 --- a/src/Avalonia.Controls/Primitives/IPopupHost.cs +++ b/src/Avalonia.Controls/Primitives/IPopupHost.cs @@ -6,7 +6,7 @@ namespace Avalonia.Controls.Primitives { public interface IPopupHost : IDisposable { - object Content { get; set; } + void SetContent(IControl control); IVisual VisualRoot { get; } void ConfigurePosition(IVisual target, PlacementMode placement, Point offset, diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs index 32dcf9f797..2294c70e9b 100644 --- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs +++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs @@ -117,6 +117,7 @@ namespace Avalonia.Controls.Primitives public void Add(Control v) { VisualChildren.Add(v); + InvalidateMeasure(); InvalidateArrange(); } diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index 36595f69c4..0955800263 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -142,6 +142,8 @@ namespace Avalonia.Controls.Primitives UpdatePosition(); } + public void SetContent(IControl control) => Content = control; + IVisual IPopupHost.VisualRoot => this; public IDisposable BindConstraints(AvaloniaObject popup, StyledProperty widthProperty, StyledProperty minWidthProperty, diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs index 1bfcb47bb9..682f7cdd70 100644 --- a/src/Avalonia.Controls/ToolTip.cs +++ b/src/Avalonia.Controls/ToolTip.cs @@ -236,7 +236,7 @@ namespace Avalonia.Controls Close(); _popup = PopupHost.CreatePopupHost(control, null); - _popup.Content = this; + _popup.SetContent(this); ((ISetLogicalParent)_popup).SetParent(control); _popup.ConfigurePosition(control, GetPlacement(control), @@ -248,7 +248,7 @@ namespace Avalonia.Controls { if (_popup != null) { - _popup.Content = null; + _popup.SetContent(null); _popup.Hide(); _popup = null; } From 04bc3a88b115aa9acd86eaba29c27b56aab7b8c5 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Mon, 29 Jul 2019 11:59:44 +0300 Subject: [PATCH 22/43] Defensive check for Menu==null --- src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs index 5f63a44717..b0dfa4185e 100644 --- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs +++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs @@ -396,7 +396,7 @@ namespace Avalonia.Controls.Platform protected internal virtual void WindowDeactivated(object sender, EventArgs e) { - Menu.Close(); + Menu?.Close(); } protected void Click(IMenuItem item) From 52aff15ed3db325e5c69fc514acc3fae69dbcac4 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Mon, 29 Jul 2019 13:35:04 +0300 Subject: [PATCH 23/43] OverlayLayer is now a glorified Canvas --- .../Primitives/OverlayLayer.cs | 118 +----------------- src/Avalonia.Controls/Primitives/PopupHost.cs | 14 +-- 2 files changed, 6 insertions(+), 126 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs index 2294c70e9b..231743bd0c 100644 --- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs +++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs @@ -3,102 +3,9 @@ using Avalonia.VisualTree; namespace Avalonia.Controls.Primitives { - public class OverlayLayer : Control + public class OverlayLayer : Canvas { - /// - /// Defines the Left attached property. - /// - public static readonly AttachedProperty LeftProperty = - AvaloniaProperty.RegisterAttached("Left", 0); - - /// - /// Defines the Top attached property. - /// - public static readonly AttachedProperty TopProperty = - AvaloniaProperty.RegisterAttached("Top", 0); - - /// - /// Defines the InfiniteAvailableSize attached property. - /// - public static readonly AttachedProperty InfiniteAvailableSizeProperty = - AvaloniaProperty.RegisterAttached("InfiniteAvailableSize", false); - - - static OverlayLayer() - { - foreach (var p in new []{LeftProperty, TopProperty}) - { - p.Changed.AddClassHandler((target, e) => - { - if (target.GetVisualParent() is OverlayLayer layer) - layer.InvalidateArrange(); - }); - } - } - public Size AvailableSize { get; private set; } - - /// - /// Gets the value of the Left attached property for a control. - /// - /// The control. - /// The control's left coordinate. - public static double GetLeft(AvaloniaObject element) - { - return element.GetValue(LeftProperty); - } - - /// - /// Sets the value of the Left attached property for a control. - /// - /// The control. - /// The left value. - public static void SetLeft(AvaloniaObject element, double value) - { - element.SetValue(LeftProperty, value); - } - - /// - /// Gets the value of the Top attached property for a control. - /// - /// The control. - /// The control's top coordinate. - public static double GetTop(AvaloniaObject element) - { - return element.GetValue(TopProperty); - } - - /// - /// Sets the value of the Top attached property for a control. - /// - /// The control. - /// The top value. - public static void SetTop(AvaloniaObject element, double value) - { - element.SetValue(TopProperty, value); - } - - /// - /// Gets the value of the Top attached property for a control. - /// - /// The control. - /// The control's top coordinate. - public static bool GetInfiniteAvailableSize(AvaloniaObject element) - { - return element.GetValue(InfiniteAvailableSizeProperty); - } - - /// - /// Sets the value of the Top attached property for a control. - /// - /// The control. - /// The top value. - public static void SetInfiniteAvailableSize(AvaloniaObject element, bool value) - { - element.SetValue(InfiniteAvailableSizeProperty, value); - } - - public static OverlayLayer GetOverlayLayer(IVisual visual) { foreach(var v in visual.GetVisualAncestors()) @@ -113,34 +20,13 @@ namespace Avalonia.Controls.Primitives return null; } - - public void Add(Control v) - { - VisualChildren.Add(v); - InvalidateMeasure(); - InvalidateArrange(); - } - - public void Remove(Control v) => VisualChildren.Remove(v); - protected override Size MeasureOverride(Size availableSize) - { - - var infinite = new Size(double.PositiveInfinity, double.PositiveInfinity); - foreach (Control v in VisualChildren) - v.Measure(GetInfiniteAvailableSize(v) ? infinite : availableSize); - - return new Size(); - } - protected override Size ArrangeOverride(Size finalSize) { // We are saving it here since child controls might need to know the entire size of the overlay // and Bounds won't be updated in time AvailableSize = finalSize; - foreach (Control v in VisualChildren) - v.Arrange(new Rect(GetLeft(v), GetTop(v), v.DesiredSize.Width, v.DesiredSize.Height)); - return finalSize; + return base.ArrangeOverride(finalSize); } } } diff --git a/src/Avalonia.Controls/Primitives/PopupHost.cs b/src/Avalonia.Controls/Primitives/PopupHost.cs index 3d6809c061..a9dcb56ecb 100644 --- a/src/Avalonia.Controls/Primitives/PopupHost.cs +++ b/src/Avalonia.Controls/Primitives/PopupHost.cs @@ -12,7 +12,7 @@ using Avalonia.VisualTree; namespace Avalonia.Controls.Primitives { - public class PopupHost : Control, IPopupHost, IInteractive, IManagedPopupPositionerPopup + public class PopupHost : Decorator, IPopupHost, IInteractive, IManagedPopupPositionerPopup { private readonly OverlayLayer _overlayLayer; private PopupPositionerParameters _positionerParameters = new PopupPositionerParameters(); @@ -28,13 +28,7 @@ namespace Avalonia.Controls.Primitives public void SetContent(IControl control) { - if (_content == control) - return; - if (_content != null) - VisualChildren.Remove(_content); - _content = control; - if (_content != null) - VisualChildren.Add(_content); + Child = control; } public IVisual VisualRoot => null; @@ -47,13 +41,13 @@ namespace Avalonia.Controls.Primitives public void Show() { - _overlayLayer.Add(this); + _overlayLayer.Children.Add(this); _shown = true; } public void Hide() { - _overlayLayer.Remove(this); + _overlayLayer.Children.Remove(this); _shown = false; } From 81ac23066e919890e047b2ce548a171c1e80f184 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Mon, 29 Jul 2019 13:57:49 +0300 Subject: [PATCH 24/43] Added custom hit-testing for ImmediateRenderer to OverlayLayer --- src/Avalonia.Controls/Primitives/OverlayLayer.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs index 231743bd0c..487a5e91e4 100644 --- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs +++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs @@ -1,9 +1,10 @@ using System.Linq; +using Avalonia.Rendering; using Avalonia.VisualTree; namespace Avalonia.Controls.Primitives { - public class OverlayLayer : Canvas + public class OverlayLayer : Canvas, ICustomSimpleHitTest { public Size AvailableSize { get; private set; } public static OverlayLayer GetOverlayLayer(IVisual visual) @@ -21,6 +22,11 @@ namespace Avalonia.Controls.Primitives return null; } + public bool HitTest(Point point) + { + return Children.Any(ctrl => ctrl.TransformedBounds?.Contains(point) == true); + } + protected override Size ArrangeOverride(Size finalSize) { // We are saving it here since child controls might need to know the entire size of the overlay From 2697104dbb886a193ae5344067254261b6392174 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 29 Jul 2019 14:43:56 +0200 Subject: [PATCH 25/43] Make `PopupHost` a templated control. --- src/Avalonia.Controls/Primitives/PopupHost.cs | 8 ++------ src/Avalonia.Themes.Default/DefaultTheme.xaml | 1 + src/Avalonia.Themes.Default/PopupHost.xaml | 12 ++++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 src/Avalonia.Themes.Default/PopupHost.xaml diff --git a/src/Avalonia.Controls/Primitives/PopupHost.cs b/src/Avalonia.Controls/Primitives/PopupHost.cs index a9dcb56ecb..5805bcb44c 100644 --- a/src/Avalonia.Controls/Primitives/PopupHost.cs +++ b/src/Avalonia.Controls/Primitives/PopupHost.cs @@ -1,24 +1,20 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reactive.Disposables; -using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives.PopupPositioning; using Avalonia.Interactivity; -using Avalonia.LogicalTree; using Avalonia.Media; using Avalonia.Threading; using Avalonia.VisualTree; namespace Avalonia.Controls.Primitives { - public class PopupHost : Decorator, IPopupHost, IInteractive, IManagedPopupPositionerPopup + public class PopupHost : ContentControl, IPopupHost, IInteractive, IManagedPopupPositionerPopup { private readonly OverlayLayer _overlayLayer; private PopupPositionerParameters _positionerParameters = new PopupPositionerParameters(); private ManagedPopupPositioner _positioner; private bool _shown; - private IControl _content; public PopupHost(OverlayLayer overlayLayer) { @@ -28,7 +24,7 @@ namespace Avalonia.Controls.Primitives public void SetContent(IControl control) { - Child = control; + Content = control; } public IVisual VisualRoot => null; diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml index 9c60b29193..75dc5edd94 100644 --- a/src/Avalonia.Themes.Default/DefaultTheme.xaml +++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml @@ -19,6 +19,7 @@ + diff --git a/src/Avalonia.Themes.Default/PopupHost.xaml b/src/Avalonia.Themes.Default/PopupHost.xaml new file mode 100644 index 0000000000..21d99e5305 --- /dev/null +++ b/src/Avalonia.Themes.Default/PopupHost.xaml @@ -0,0 +1,12 @@ + From 669c6511d6158c6f7440ea4927f36971134251d1 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 29 Jul 2019 18:39:36 +0200 Subject: [PATCH 26/43] Reset inheritance parent in ContentPresenter. Previously a dangling reference to `ContentPresenter` was left in place in the ex-child control's `InheritanceParent`. When the child is removed from the `ContentPresenter`, reset the value to the control's logical parent. --- .../Presenters/ContentPresenter.cs | 1 + .../ContentPresenterTests_InTemplate.cs | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs index c2690d503d..e2e73bd465 100644 --- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs +++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs @@ -229,6 +229,7 @@ namespace Avalonia.Controls.Presenters if (oldChild != null) { VisualChildren.Remove(oldChild); + ((ISetInheritanceParent)oldChild).SetParent(oldChild.Parent); } if (oldChild?.Parent == this) diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs index 7d05547799..952180d21b 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs +++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs @@ -281,6 +281,37 @@ namespace Avalonia.Controls.UnitTests.Presenters target.Content = 42; } + [Fact] + public void Should_Set_InheritanceParent_Even_When_LogicalParent_Is_Already_Set() + { + var logicalParent = new Canvas(); + var child = new TextBlock(); + var (target, host) = CreateTarget(); + + ((ISetLogicalParent)child).SetParent(logicalParent); + target.Content = child; + + Assert.Same(logicalParent, child.Parent); + + // InheritanceParent is exposed via StylingParent. + Assert.Same(target, ((IStyledElement)child).StylingParent); + } + + [Fact] + public void Should_Reset_InheritanceParent_When_Child_Removed() + { + var logicalParent = new Canvas(); + var child = new TextBlock(); + var (target, _) = CreateTarget(); + + ((ISetLogicalParent)child).SetParent(logicalParent); + target.Content = child; + target.Content = null; + + // InheritanceParent is exposed via StylingParent. + Assert.Same(logicalParent, ((IStyledElement)child).StylingParent); + } + (ContentPresenter presenter, ContentControl templatedParent) CreateTarget() { var templatedParent = new ContentControl From 6caa06f52b93c17cb2cd3fcb154fc8610788921d Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 29 Jul 2019 18:48:44 +0200 Subject: [PATCH 27/43] Remove PopupContentHost. It's no longer needed now the bug fix in 669c6511d6158c6f7440ea4927f36971134251d1 is in place. --- src/Avalonia.Controls/Primitives/Popup.cs | 60 ++----------------- .../Primitives/PopupTests.cs | 2 - 2 files changed, 4 insertions(+), 58 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index dc92347c9d..18d90c0315 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -84,7 +84,6 @@ namespace Avalonia.Controls.Primitives private IDisposable _nonClientListener; bool _ignoreIsOpenChanged = false; private List _bindings = new List(); - private PopupContentHost _decorator = new PopupContentHost(); /// /// Initializes static members of the class. @@ -237,10 +236,8 @@ namespace Avalonia.Controls.Primitives _bindings.Add(_popupRoot.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty, HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty)); - _bindings.Add(_decorator.Bind(PopupContentHost.ChildProperty, this[~ChildProperty])); - _popupRoot.SetContent(_decorator); - + _popupRoot.SetContent(Child); ((ISetLogicalParent)_popupRoot).SetParent(this); @@ -400,15 +397,15 @@ namespace Avalonia.Controls.Primitives private bool IsChildOrThis(IVisual child) { - return _decorator.FindCommonVisualAncestor(child) == _decorator; + return ((IVisual)_popupRoot)?.FindCommonVisualAncestor(child) == _popupRoot; } public bool IsInsidePopup(IVisual visual) { - return _decorator.FindCommonVisualAncestor(visual) == _decorator; + return ((IVisual)_popupRoot)?.FindCommonVisualAncestor(visual) == _popupRoot; } - public bool IsPointerOverPopup => _decorator.IsPointerOver; + public bool IsPointerOverPopup => ((IInputElement)_popupRoot).IsPointerOver; private void WindowDeactivated(object sender, EventArgs e) { @@ -446,54 +443,5 @@ namespace Avalonia.Controls.Primitives _owner._ignoreIsOpenChanged = false; } } - - // For some reason when PopupRoot.Content is bound directly to Child weird stuff happens - class PopupContentHost : Control - { - /// - /// Defines the property. - /// - public static readonly StyledProperty ChildProperty = - AvaloniaProperty.Register(nameof(Child)); - - static PopupContentHost() - { - ChildProperty.Changed.AddClassHandler(x => x.ChildChanged); - } - - public IControl Child - { - get { return GetValue(ChildProperty); } - set { SetValue(ChildProperty, value); } - } - - /// - protected override Size MeasureOverride(Size availableSize) - { - if (Child == null) - return Size.Empty; - Child.Measure(availableSize); - return Child.DesiredSize; - } - - /// - protected override Size ArrangeOverride(Size finalSize) - { - Child?.Arrange(new Rect(finalSize)); - return finalSize; - } - - - private void ChildChanged(AvaloniaPropertyChangedEventArgs e) - { - var oldChild = (Control)e.OldValue; - var newChild = (Control)e.NewValue; - - if (oldChild != null) VisualChildren.Remove(oldChild); - - if (newChild != null) - VisualChildren.Add(newChild); - } - } } } diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index ccdfe8af33..c61e3d1f68 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -253,7 +253,6 @@ namespace Avalonia.Controls.UnitTests.Primitives new[] { "ContentPresenter", - "PopupContentHost", "ContentPresenter", "Border", }, @@ -267,7 +266,6 @@ namespace Avalonia.Controls.UnitTests.Primitives new object[] { popupRoot, - target, // PopupContentHost doesn't really need a templated parent, but gets assigned one target, null, }, From c65b5de959382713d8869ad2670ac22a3d2b5140 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 29 Jul 2019 22:53:42 +0200 Subject: [PATCH 28/43] Move setting popup TemplatedParent... ...out of `PopupRoot` and into `Popup`. Fixes styling problems in `Popups` hosted in control templates. --- .../Primitives/IPopupHost.cs | 4 + src/Avalonia.Controls/Primitives/Popup.cs | 93 +++++++++++++++---- src/Avalonia.Controls/Primitives/PopupRoot.cs | 49 ---------- .../Primitives/PopupTests.cs | 20 +--- 4 files changed, 82 insertions(+), 84 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/IPopupHost.cs b/src/Avalonia.Controls/Primitives/IPopupHost.cs index df68eab6a4..912879af03 100644 --- a/src/Avalonia.Controls/Primitives/IPopupHost.cs +++ b/src/Avalonia.Controls/Primitives/IPopupHost.cs @@ -1,4 +1,5 @@ using System; +using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives.PopupPositioning; using Avalonia.VisualTree; @@ -7,8 +8,11 @@ namespace Avalonia.Controls.Primitives public interface IPopupHost : IDisposable { void SetContent(IControl control); + IContentPresenter Presenter { get; } IVisual VisualRoot { get; } + event EventHandler TemplateApplied; + void ConfigurePosition(IVisual target, PlacementMode placement, Point offset, PopupPositioningEdge anchor = PopupPositioningEdge.None, PopupPositioningEdge gravity = PopupPositioningEdge.None); diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index 18d90c0315..2537f239fe 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Reactive.Disposables; +using Avalonia.Controls.Presenters; using Avalonia.Data; using Avalonia.Input; using Avalonia.Input.Raw; @@ -79,9 +80,10 @@ namespace Avalonia.Controls.Primitives AvaloniaProperty.Register(nameof(Topmost)); private bool _isOpen; - private IPopupHost _popupRoot; + private IPopupHost _popupHost; private TopLevel _topLevel; private IDisposable _nonClientListener; + private IDisposable _presenterSubscription; bool _ignoreIsOpenChanged = false; private List _bindings = new List(); @@ -110,7 +112,7 @@ namespace Avalonia.Controls.Primitives /// public event EventHandler Opened; - public IPopupHost Host => _popupRoot; + public IPopupHost Host => _popupHost; /// /// Gets or sets the control to display in the popup. @@ -209,7 +211,7 @@ namespace Avalonia.Controls.Primitives /// /// Gets the root of the popup window. /// - IVisual IVisualTreeHost.Root => _popupRoot?.VisualRoot; + IVisual IVisualTreeHost.Root => _popupHost?.VisualRoot; /// /// Opens the popup. @@ -232,17 +234,16 @@ namespace Avalonia.Controls.Primitives "Attempted to open a popup not attached to a TopLevel"); } - _popupRoot = PopupHost.CreatePopupHost(placementTarget, DependencyResolver); + _popupHost = PopupHost.CreatePopupHost(placementTarget, DependencyResolver); - _bindings.Add(_popupRoot.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty, + _bindings.Add(_popupHost.BindConstraints(this, WidthProperty, MinWidthProperty, MaxWidthProperty, HeightProperty, MinHeightProperty, MaxHeightProperty, TopmostProperty)); - _popupRoot.SetContent(Child); - - ((ISetLogicalParent)_popupRoot).SetParent(this); - - _popupRoot.ConfigurePosition(placementTarget, + _popupHost.SetContent(Child); + ((ISetLogicalParent)_popupHost).SetParent(this); + _popupHost.ConfigurePosition(placementTarget, PlacementMode, new Point(HorizontalOffset, VerticalOffset)); + _popupHost.TemplateApplied += RootTemplateApplied; var window = _topLevel as Window; if (window != null) @@ -261,7 +262,7 @@ namespace Avalonia.Controls.Primitives _nonClientListener = InputManager.Instance?.Process.Subscribe(ListenForNonClientClick); - _popupRoot.Show(); + _popupHost.Show(); using (BeginIgnoringIsOpen()) { @@ -276,6 +277,13 @@ namespace Avalonia.Controls.Primitives /// public void Close() { + if (_popupHost != null) + { + _popupHost.TemplateApplied -= RootTemplateApplied; + } + + _presenterSubscription?.Dispose(); + CloseCurrent(); using (BeginIgnoringIsOpen()) { @@ -284,6 +292,7 @@ namespace Avalonia.Controls.Primitives Closed?.Invoke(this, EventArgs.Empty); } + void CloseCurrent() { if (_topLevel != null) @@ -305,16 +314,16 @@ namespace Avalonia.Controls.Primitives _topLevel = null; } - if (_popupRoot != null) + if (_popupHost != null) { foreach(var b in _bindings) b.Dispose(); _bindings.Clear(); - _popupRoot.SetContent(null); - _popupRoot.Hide(); - ((ISetLogicalParent)_popupRoot).SetParent(null); - _popupRoot.Dispose(); - _popupRoot = null; + _popupHost.SetContent(null); + _popupHost.Hide(); + ((ISetLogicalParent)_popupHost).SetParent(null); + _popupHost.Dispose(); + _popupHost = null; } } @@ -395,17 +404,61 @@ namespace Avalonia.Controls.Primitives } } + private void RootTemplateApplied(object sender, TemplateAppliedEventArgs e) + { + _popupHost.TemplateApplied -= RootTemplateApplied; + + if (_presenterSubscription != null) + { + _presenterSubscription.Dispose(); + _presenterSubscription = null; + } + + // If the Popup appears in a control template, then the child controls + // that appear in the popup host need to have their TemplatedParent + // properties set. + if (TemplatedParent != null) + { + _popupHost.Presenter?.ApplyTemplate(); + _popupHost.Presenter?.GetObservable(ContentPresenter.ChildProperty) + .Subscribe(SetTemplatedParentAndApplyChildTemplates); + } + } + + private void SetTemplatedParentAndApplyChildTemplates(IControl control) + { + if (control != null) + { + var templatedParent = TemplatedParent; + + if (control.TemplatedParent == null) + { + control.SetValue(TemplatedParentProperty, templatedParent); + } + + control.ApplyTemplate(); + + if (!(control is IPresenter) && control.TemplatedParent == templatedParent) + { + foreach (IControl child in control.GetVisualChildren()) + { + SetTemplatedParentAndApplyChildTemplates(child); + } + } + } + } + private bool IsChildOrThis(IVisual child) { - return ((IVisual)_popupRoot)?.FindCommonVisualAncestor(child) == _popupRoot; + return ((IVisual)_popupHost)?.FindCommonVisualAncestor(child) == _popupHost; } public bool IsInsidePopup(IVisual visual) { - return ((IVisual)_popupRoot)?.FindCommonVisualAncestor(visual) == _popupRoot; + return ((IVisual)_popupHost)?.FindCommonVisualAncestor(visual) == _popupHost; } - public bool IsPointerOverPopup => ((IInputElement)_popupRoot).IsPointerOver; + public bool IsPointerOverPopup => ((IInputElement)_popupHost).IsPointerOver; private void WindowDeactivated(object sender, EventArgs e) { diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index 0955800263..8c4fbc7370 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -3,14 +3,8 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reactive.Disposables; -using System.Text; -using Avalonia.Controls.Platform; -using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives.PopupPositioning; -using Avalonia.Data; -using Avalonia.Diagnostics; using Avalonia.Interactivity; using Avalonia.Media; using Avalonia.Platform; @@ -26,7 +20,6 @@ namespace Avalonia.Controls.Primitives public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost, IPopupHost { private readonly TopLevel _parent; - private IDisposable _presenterSubscription; private PopupPositionerParameters _positionerParameters; /// @@ -84,48 +77,6 @@ namespace Avalonia.Controls.Primitives /// public void Dispose() => PlatformImpl?.Dispose(); - /// - protected override void OnTemplateApplied(TemplateAppliedEventArgs e) - { - base.OnTemplateApplied(e); - - if (Parent?.TemplatedParent != null) - { - if (_presenterSubscription != null) - { - _presenterSubscription.Dispose(); - _presenterSubscription = null; - } - - Presenter?.ApplyTemplate(); - Presenter?.GetObservable(ContentPresenter.ChildProperty) - .Subscribe(SetTemplatedParentAndApplyChildTemplates); - } - } - - private void SetTemplatedParentAndApplyChildTemplates(IControl control) - { - if (control != null) - { - var templatedParent = Parent.TemplatedParent; - - if (control.TemplatedParent == null) - { - control.SetValue(TemplatedParentProperty, templatedParent); - } - - control.ApplyTemplate(); - - if (!(control is IPresenter) && control.TemplatedParent == templatedParent) - { - foreach (IControl child in control.GetVisualChildren()) - { - SetTemplatedParentAndApplyChildTemplates(child); - } - } - } - } - void UpdatePosition() { PlatformImpl?.PopupPositioner.Update(_positionerParameters); diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index c61e3d1f68..f5d68be02a 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -227,10 +227,6 @@ namespace Avalonia.Controls.UnitTests.Primitives [Fact] public void Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent() { - if(UsePopupHost) - // For some reason with overlay popups templates don't get applied in test mode but - // everything works perfectly fine at runtime. I leave this one to you @grokys - return; using (CreateServices()) { PopupContentControl target; @@ -242,9 +238,13 @@ namespace Avalonia.Controls.UnitTests.Primitives root.Show(); target.ApplyTemplate(); + var popup = (Popup)target.GetTemplateChildren().First(x => x.Name == "popup"); popup.Open(); - var popupRoot = (Visual)popup.Host; + + var popupRoot = (Control)popup.Host; + popupRoot.Measure(Size.Infinity); + popupRoot.Arrange(new Rect(popupRoot.DesiredSize)); var children = popupRoot.GetVisualDescendants().ToList(); var types = children.Select(x => x.GetType().Name).ToList(); @@ -326,7 +326,6 @@ namespace Avalonia.Controls.UnitTests.Primitives } } - private IDisposable CreateServices() { return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform: @@ -339,15 +338,6 @@ namespace Avalonia.Controls.UnitTests.Primitives }))); } - private static IControl PopupRootTemplate(PopupRoot control, INameScope scope) - { - return new ContentPresenter - { - Name = "PART_ContentPresenter", - [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty], - }.RegisterInNameScope(scope); - } - private static IControl PopupContentControlTemplate(PopupContentControl control, INameScope scope) { return new Popup From a389e21dc0c37a402d987ff1123d998b031d66a3 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 29 Jul 2019 23:06:41 +0200 Subject: [PATCH 29/43] Fix IsInsidePopup logic. --- src/Avalonia.Controls/Primitives/Popup.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs index 2537f239fe..b4c9fafda1 100644 --- a/src/Avalonia.Controls/Primitives/Popup.cs +++ b/src/Avalonia.Controls/Primitives/Popup.cs @@ -450,12 +450,12 @@ namespace Avalonia.Controls.Primitives private bool IsChildOrThis(IVisual child) { - return ((IVisual)_popupHost)?.FindCommonVisualAncestor(child) == _popupHost; + return _popupHost != null && ((IVisual)_popupHost).FindCommonVisualAncestor(child) == _popupHost; } public bool IsInsidePopup(IVisual visual) { - return ((IVisual)_popupHost)?.FindCommonVisualAncestor(visual) == _popupHost; + return _popupHost != null && ((IVisual)_popupHost)?.FindCommonVisualAncestor(visual) == _popupHost; } public bool IsPointerOverPopup => ((IInputElement)_popupHost).IsPointerOver; From cdb486fe233ffc5345f58070bcd8b4732c9ba0cd Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 30 Jul 2019 13:39:22 +0200 Subject: [PATCH 30/43] Fix NRE in VisualNode.SortChildren. `_children` may be null. In addition if there are < 2 children, there's no sorting to be done. --- src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs | 5 +++++ .../Rendering/SceneGraph/VisualNodeTests.cs | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs index 709a935450..c3dfe12b2d 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs @@ -179,6 +179,11 @@ namespace Avalonia.Rendering.SceneGraph /// The scene that the node is a part of. public void SortChildren(Scene scene) { + if (_children == null || _children.Count <= 1) + { + return; + } + var keys = new List(); for (var i = 0; i < Visual.VisualChildren.Count; ++i) diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs index 1101ccacba..24ba2d1c48 100644 --- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/VisualNodeTests.cs @@ -92,5 +92,14 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph Assert.Same(node1.DrawOperations[0].Item, node2.DrawOperations[0].Item); Assert.NotSame(node1.DrawOperations[0], node2.DrawOperations[0]); } + + [Fact] + public void SortChildren_Does_Not_Throw_On_Null_Children() + { + var node = new VisualNode(Mock.Of(), null); + var scene = new Scene(Mock.Of()); + + node.SortChildren(scene); + } } } From a6c9086782bb0706198095205f9186afa2fb5d72 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 30 Jul 2019 14:06:40 +0200 Subject: [PATCH 31/43] Fix flaky XAML tests. Make tests that load XAML inherit from `XamlTestBase` which ensures that `Avalonia.Markup` is loaded. --- .../Converters/ConverterTests.cs | 2 +- .../Converters/NullableConverterTests.cs | 2 +- .../Converters/ValueConverterTests.cs | 2 +- .../Data/BindingTests.cs | 2 +- .../Data/BindingTests_Method.cs | 4 ++-- .../Data/BindingTests_TemplatedParent.cs | 2 +- .../MarkupExtensions/BindingExtensionTests.cs | 2 +- .../DynamicResourceExtensionTests.cs | 2 +- .../MarkupExtensions/ResourceIncludeTests.cs | 4 ++-- .../StaticResourceExtensionTests.cs | 2 +- .../Avalonia.Markup.Xaml.UnitTests/StyleTests.cs | 2 +- .../Xaml/BasicTests.cs | 2 +- .../Xaml/BindingTests.cs | 2 +- .../Xaml/BindingTests_RelativeSource.cs | 2 +- .../Xaml/ControlBindingTests.cs | 3 +-- .../Xaml/DataTemplateTests.cs | 2 +- .../Xaml/EventTests.cs | 2 +- .../Xaml/StyleTests.cs | 2 +- .../Xaml/TreeDataTemplateTests.cs | 3 +-- .../Xaml/XamlIlTests.cs | 5 +---- .../XamlTestBase.cs | 16 ++++++++++++++++ 21 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs index 6ffaaaee5c..b424003ed6 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ConverterTests.cs @@ -3,7 +3,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Converters { - public class ConverterTests + public class ConverterTests : XamlTestBase { [Fact] public void Bug_2228_Relative_Uris_Should_Be_Correctly_Parsed() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs index bb44d069b5..cdd40ed80f 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/NullableConverterTests.cs @@ -11,7 +11,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Converters public Orientation? Orientation { get; set; } } - public class NullableConverterTests + public class NullableConverterTests : XamlTestBase { [Fact] public void Nullable_Types_Should_Still_Be_Converted_Properly() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs index 6f2c4363e2..5e698117c3 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/ValueConverterTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Converters { - public class ValueConverterTests + public class ValueConverterTests : XamlTestBase { [Fact] public void ValueConverter_Special_Values_Work() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs index e412657711..5972920af3 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Data { - public class BindingTests + public class BindingTests : XamlTestBase { [Fact] public void Binding_With_Null_Path_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs index 0d96df8eb8..db45f1989b 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Method.cs @@ -10,7 +10,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Data { - public class BindingTests_Method + public class BindingTests_Method : XamlTestBase { [Fact] public void Binding_Method_To_Command_Works() @@ -102,4 +102,4 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data public string Value { get; private set; } = "Not called"; } } -} \ No newline at end of file +} diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs index a9bea01fde..86ca351d67 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs @@ -10,7 +10,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Data { - public class BindingTests_TemplatedParent + public class BindingTests_TemplatedParent : XamlTestBase { [Fact] public void TemplateBinding_With_Null_Path_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs index dcecfe3b22..93cad9a68e 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs @@ -10,7 +10,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions { - public class BindingExtensionTests + public class BindingExtensionTests : XamlTestBase { [Fact] diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs index ed70cd6fe8..96955539c1 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions { - public class DynamicResourceExtensionTests + public class DynamicResourceExtensionTests : XamlTestBase { [Fact] public void DynamicResource_Can_Be_Assigned_To_Property() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs index a35c7bdd9b..7ab6c2de40 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs @@ -8,7 +8,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions { public class ResourceIncludeTests { - public class StaticResourceExtensionTests + public class StaticResourceExtensionTests : XamlTestBase { [Fact] public void ResourceInclude_Loads_ResourceDictionary() @@ -52,4 +52,4 @@ namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions } } } -} \ No newline at end of file +} diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs index 7a96b9f989..58985af0ad 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs @@ -14,7 +14,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions { - public class StaticResourceExtensionTests + public class StaticResourceExtensionTests : XamlTestBase { [Fact] public void StaticResource_Can_Be_Assigned_To_Property() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs index f4c3302d52..2dc6c4a7fb 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs @@ -12,7 +12,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests { - public class StyleTests + public class StyleTests : XamlTestBase { [Fact] public void Binding_Should_Be_Assigned_To_Setter_Value_Instead_Of_Bound() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs index d74eed992e..f4d4a9dd2a 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs @@ -22,7 +22,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class BasicTests + public class BasicTests : XamlTestBase { [Fact] public void Simple_Property_Is_Set() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs index 3930608515..7281542bc1 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class BindingTests + public class BindingTests : XamlTestBase { [Fact] public void Binding_To_DataContext_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs index c6fe79bc0c..86b874f75c 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests_RelativeSource.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class BindingTests_RelativeSource + public class BindingTests_RelativeSource : XamlTestBase { [Fact] public void Binding_To_DataContext_Works() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs index bd9d99ff23..0850f3fa78 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ControlBindingTests.cs @@ -4,14 +4,13 @@ using System.Collections.Generic; using Avalonia.Controls; using Avalonia.Controls.Primitives; -using Avalonia.Layout; using Avalonia.Logging; using Avalonia.UnitTests; using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class ControlBindingTests + public class ControlBindingTests : XamlTestBase { [Fact] public void Binding_ProgressBar_Value_To_Invalid_Value_Uses_FallbackValue() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs index 6b67303b07..4f2886582d 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/DataTemplateTests.cs @@ -8,7 +8,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class DataTemplateTests + public class DataTemplateTests : XamlTestBase { [Fact] public void DataTemplate_Can_Contain_Name() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs index 44697f5937..dcb6533b5e 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class EventTests + public class EventTests : XamlTestBase { [Fact] public void Event_Is_Attached() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs index 8dd1d24dd6..b76022852c 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs @@ -12,7 +12,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class StyleTests + public class StyleTests : XamlTestBase { [Fact] public void Color_Can_Be_Added_To_Style_Resources() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs index 4134f5be23..f5fed02899 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs @@ -4,14 +4,13 @@ using System.Linq; using Avalonia.Controls.Templates; using Avalonia.Data; -using Avalonia.Markup.Data; using Avalonia.Markup.Xaml.Templates; using Avalonia.UnitTests; using Xunit; namespace Avalonia.Markup.Xaml.UnitTests.Xaml { - public class TreeDataTemplateTests + public class TreeDataTemplateTests : XamlTestBase { [Fact] public void Binding_Should_Be_Assigned_To_ItemsSource_Instead_Of_Bound() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs index 1f135f8e76..4ff9e3db38 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs @@ -5,10 +5,7 @@ using System.Globalization; using System.Linq; using System.Runtime.CompilerServices; using Avalonia.Controls; -using Avalonia.Controls.Presenters; using Avalonia.Data.Converters; -using Avalonia.Input; -using Avalonia.Interactivity; using Avalonia.Media; using Avalonia.Threading; using Avalonia.UnitTests; @@ -18,7 +15,7 @@ using Xunit; namespace Avalonia.Markup.Xaml.UnitTests { - public class XamlIlTests + public class XamlIlTests : XamlTestBase { [Fact] public void Binding_Button_IsPressed_ShouldWork() diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs b/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs new file mode 100644 index 0000000000..5172b2e830 --- /dev/null +++ b/tests/Avalonia.Markup.Xaml.UnitTests/XamlTestBase.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Avalonia.Data; + +namespace Avalonia.Markup.Xaml.UnitTests +{ + public class XamlTestBase + { + public XamlTestBase() + { + // Ensure necessary assemblies are loaded. + var _ = typeof(TemplateBinding); + } + } +} From 0dce4cfc6f3bea9d74e86b3a74e40a36cac3564a Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 30 Jul 2019 17:17:52 +0200 Subject: [PATCH 32/43] Set capacity seeing as we know it. --- src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs index c3dfe12b2d..f579bf0a62 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs @@ -184,7 +184,7 @@ namespace Avalonia.Rendering.SceneGraph return; } - var keys = new List(); + var keys = new List(Visual.VisualChildren.Count); for (var i = 0; i < Visual.VisualChildren.Count; ++i) { From 32aea583b1bf6f3b772258ed6ad12f473056625a Mon Sep 17 00:00:00 2001 From: artyom Date: Tue, 30 Jul 2019 20:08:15 +0300 Subject: [PATCH 33/43] Don't throw when in design mode --- src/Avalonia.ReactiveUI/AutoSuspendHelper.cs | 11 ++++-- .../AutoSuspendHelperTest.cs | 34 ++++++++++++------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs b/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs index a4f14a4138..b404ea57cb 100644 --- a/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs +++ b/src/Avalonia.ReactiveUI/AutoSuspendHelper.cs @@ -35,7 +35,12 @@ namespace Avalonia.ReactiveUI RxApp.SuspensionHost.IsResuming = Observable.Never(); RxApp.SuspensionHost.IsLaunchingNew = _isLaunchingNew; - if (lifetime is IControlledApplicationLifetime controlled) + if (Avalonia.Controls.Design.IsDesignMode) + { + this.Log().Debug("Design mode detected. AutoSuspendHelper won't persist app state."); + RxApp.SuspensionHost.ShouldPersistState = Observable.Never(); + } + else if (lifetime is IControlledApplicationLifetime controlled) { this.Log().Debug("Using IControlledApplicationLifetime events to handle app exit."); controlled.Exit += (sender, args) => OnControlledApplicationLifetimeExit(); @@ -47,11 +52,11 @@ namespace Avalonia.ReactiveUI var message = $"Don't know how to detect app exit event for {type}."; throw new NotSupportedException(message); } - else + else { var message = "ApplicationLifetime is null. " + "Ensure you are initializing AutoSuspendHelper " - + "when Avalonia application initialization is completed."; + + "after Avalonia application initialization is completed."; throw new ArgumentNullException(message); } diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs index 876f37cc9e..56b14c3936 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs +++ b/tests/Avalonia.ReactiveUI.UnitTests/AutoSuspendHelperTest.cs @@ -60,6 +60,28 @@ namespace Avalonia.ReactiveUI.UnitTests } } + [Fact] + public void AutoSuspendHelper_Should_Throw_When_Not_Supported_Lifetime_Is_Used() + { + using (UnitTestApplication.Start(TestServices.MockWindowingPlatform)) + using (var lifetime = new ExoticApplicationLifetimeWithoutLifecycleEvents()) + { + var application = AvaloniaLocator.Current.GetService(); + application.ApplicationLifetime = lifetime; + Assert.Throws(() => new AutoSuspendHelper(application.ApplicationLifetime)); + } + } + + [Fact] + public void AutoSuspendHelper_Should_Throw_When_Lifetime_Is_Null() + { + using (UnitTestApplication.Start(TestServices.MockWindowingPlatform)) + { + var application = AvaloniaLocator.Current.GetService(); + Assert.Throws(() => new AutoSuspendHelper(application.ApplicationLifetime)); + } + } + [Fact] public void ShouldPersistState_Should_Fire_On_App_Exit_When_SuspensionDriver_Is_Initialized() { @@ -82,17 +104,5 @@ namespace Avalonia.ReactiveUI.UnitTests Assert.Equal("Foo", RxApp.SuspensionHost.GetAppState().Example); } } - - [Fact] - public void AutoSuspendHelper_Should_Throw_For_Not_Supported_Lifetimes() - { - using (UnitTestApplication.Start(TestServices.MockWindowingPlatform)) - using (var lifetime = new ExoticApplicationLifetimeWithoutLifecycleEvents()) - { - var application = AvaloniaLocator.Current.GetService(); - application.ApplicationLifetime = lifetime; - Assert.Throws(() => new AutoSuspendHelper(application.ApplicationLifetime)); - } - } } } \ No newline at end of file From 7ab413be4bc5aba2141534213bb8200d3f5204b1 Mon Sep 17 00:00:00 2001 From: Stano Turza Date: Fri, 2 Aug 2019 08:59:47 +0200 Subject: [PATCH 34/43] Fix Combobox hit testing --- src/Avalonia.Themes.Default/ComboBox.xaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Avalonia.Themes.Default/ComboBox.xaml b/src/Avalonia.Themes.Default/ComboBox.xaml index 6227962a48..0c2d33bc7b 100644 --- a/src/Avalonia.Themes.Default/ComboBox.xaml +++ b/src/Avalonia.Themes.Default/ComboBox.xaml @@ -1,5 +1,6 @@ diff --git a/src/Avalonia.Themes.Default/PopupHost.xaml b/src/Avalonia.Themes.Default/PopupHost.xaml deleted file mode 100644 index 21d99e5305..0000000000 --- a/src/Avalonia.Themes.Default/PopupHost.xaml +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/src/Avalonia.Themes.Default/PopupRoot.xaml b/src/Avalonia.Themes.Default/PopupRoot.xaml index cc23367ac0..71042f2a98 100644 --- a/src/Avalonia.Themes.Default/PopupRoot.xaml +++ b/src/Avalonia.Themes.Default/PopupRoot.xaml @@ -2,11 +2,13 @@ - + + + - \ No newline at end of file + diff --git a/src/Avalonia.Visuals/Media/PixelPoint.cs b/src/Avalonia.Visuals/Media/PixelPoint.cs index 1fc102045e..d62c2a2e55 100644 --- a/src/Avalonia.Visuals/Media/PixelPoint.cs +++ b/src/Avalonia.Visuals/Media/PixelPoint.cs @@ -160,8 +160,6 @@ namespace Avalonia } } - - /// /// Returns a new with the same Y co-ordinate and the specified X co-ordinate. /// diff --git a/src/Avalonia.Visuals/Media/PixelRect.cs b/src/Avalonia.Visuals/Media/PixelRect.cs index 75987681ff..0e2094da07 100644 --- a/src/Avalonia.Visuals/Media/PixelRect.cs +++ b/src/Avalonia.Visuals/Media/PixelRect.cs @@ -272,7 +272,6 @@ namespace Avalonia return new PixelRect(Position + offset, Size); } - /// /// Gets the union of two rectangles. /// diff --git a/src/Avalonia.Visuals/Media/PixelVector.cs b/src/Avalonia.Visuals/Media/PixelVector.cs index b959b462c2..4a623e3bc2 100644 --- a/src/Avalonia.Visuals/Media/PixelVector.cs +++ b/src/Avalonia.Visuals/Media/PixelVector.cs @@ -130,9 +130,7 @@ namespace Avalonia /// public bool Equals(PixelVector other) { - // ReSharper disable CompareOfFloatsByEqualityOperator return _x == other._x && _y == other._y; - // ReSharper restore CompareOfFloatsByEqualityOperator } /// diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs index e840e7b530..0ebe6833d3 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs @@ -75,10 +75,14 @@ namespace Avalonia.Controls.UnitTests.Primitives Assert.Single(((Visual)target.Host).GetVisualChildren()); var templatedChild = ((Visual)target.Host).GetVisualChildren().Single(); - Assert.IsType(templatedChild); + + Assert.IsType(templatedChild); + var contentPresenter = templatedChild.VisualChildren.Single(); + Assert.IsType(contentPresenter); Assert.Equal((PopupRoot)target.Host, ((IControl)templatedChild).TemplatedParent); + Assert.Equal((PopupRoot)target.Host, ((IControl)contentPresenter).TemplatedParent); } } diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index f5d68be02a..7cb9fccee8 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs @@ -252,6 +252,7 @@ namespace Avalonia.Controls.UnitTests.Primitives Assert.Equal( new[] { + "VisualLayerManager", "ContentPresenter", "ContentPresenter", "Border", @@ -265,6 +266,7 @@ namespace Avalonia.Controls.UnitTests.Primitives Assert.Equal( new object[] { + popupRoot, popupRoot, target, null, @@ -320,7 +322,7 @@ namespace Avalonia.Controls.UnitTests.Primitives target.Open(); if (UsePopupHost) - Assert.IsType(target.Host); + Assert.IsType(target.Host); else Assert.IsType(target.Host); } From 62bc60bee302d839e9b88774348af57da8fbc500 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 6 Aug 2019 22:14:22 +0300 Subject: [PATCH 38/43] [DirectFB] Added configurable scaling support --- samples/ControlCatalog.NetCore/Program.cs | 14 ++++++++++++-- .../FramebufferToplevelImpl.cs | 2 +- .../LinuxFramebufferPlatform.cs | 9 +++++---- .../Avalonia.LinuxFramebuffer/Output/DrmOutput.cs | 6 ++++-- .../Output/FbdevOutput.cs | 7 +++---- .../Output/IOutputBackend.cs | 1 + 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs index de9ca02ed1..09d2612ac3 100644 --- a/samples/ControlCatalog.NetCore/Program.cs +++ b/samples/ControlCatalog.NetCore/Program.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.Globalization; using System.Linq; using System.Threading; using Avalonia; @@ -28,15 +29,24 @@ namespace ControlCatalog.NetCore } var builder = BuildAvaloniaApp(); + + double GetScaling() + { + var idx = Array.IndexOf(args, "--scaling"); + if (idx != 0 && args.Length > idx + 1 && + double.TryParse(args[idx + 1], NumberStyles.Any, CultureInfo.InvariantCulture, out var scaling)) + return scaling; + return 1; + } if (args.Contains("--fbdev")) { SilenceConsole(); - return builder.StartLinuxFbDev(args); + return builder.StartLinuxFbDev(args, scaling: GetScaling()); } else if (args.Contains("--drm")) { SilenceConsole(); - return builder.StartLinuxDrm(args); + return builder.StartLinuxDrm(args, scaling: GetScaling()); } else return builder.StartWithClassicDesktopLifetime(args); diff --git a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs index ebaad81fa1..2dc112f3d3 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs @@ -61,7 +61,7 @@ namespace Avalonia.LinuxFramebuffer public IMouseDevice MouseDevice => new MouseDevice(); public IPopupImpl CreatePopup() => null; - public double Scaling => 1; + public double Scaling => _outputBackend.Scaling; public IEnumerable Surfaces => new object[] {_outputBackend}; public Action Input { get; set; } public Action Paint { get; set; } diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs index 2cc1f65202..8fc555aac2 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs @@ -107,11 +107,12 @@ namespace Avalonia.LinuxFramebuffer public static class LinuxFramebufferPlatformExtensions { - public static int StartLinuxFbDev(this T builder, string[] args, string fbdev = null) - where T : AppBuilderBase, new() => StartLinuxDirect(builder, args, new FbdevOutput(fbdev)); + public static int StartLinuxFbDev(this T builder, string[] args, string fbdev = null, double scaling = 1) + where T : AppBuilderBase, new() => + StartLinuxDirect(builder, args, new FbdevOutput(fbdev) {Scaling = scaling}); - public static int StartLinuxDrm(this T builder, string[] args, string card = null) - where T : AppBuilderBase, new() => StartLinuxDirect(builder, args, new DrmOutput(card)); + public static int StartLinuxDrm(this T builder, string[] args, string card = null, double scaling = 1) + where T : AppBuilderBase, new() => StartLinuxDirect(builder, args, new DrmOutput(card) {Scaling = scaling}); public static int StartLinuxDirect(this T builder, string[] args, IOutputBackend backend) where T : AppBuilderBase, new() diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs index 6a76977352..273265a6dc 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs @@ -14,7 +14,7 @@ namespace Avalonia.LinuxFramebuffer.Output private DrmCard _card; private readonly EglGlPlatformSurface _eglPlatformSurface; public PixelSize PixelSize => _mode.Resolution; - + public double Scaling { get; set; } public DrmOutput(string path = null) { var card = new DrmCard(path); @@ -233,7 +233,7 @@ namespace Avalonia.LinuxFramebuffer.Output public PixelSize Size => _parent._mode.Resolution; - public double Scaling => 1; + public double Scaling => _parent.Scaling; } public IGlPlatformSurfaceRenderingSession BeginDraw() @@ -241,6 +241,8 @@ namespace Avalonia.LinuxFramebuffer.Output _parent._deferredContext.MakeCurrent(_parent._eglSurface); return new RenderSession(_parent); } + + } IGlContext IWindowingPlatformGlFeature.ImmediateContext => _immediateContext; diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/FbdevOutput.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/FbdevOutput.cs index 3021c29015..b83fe6cbe8 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Output/FbdevOutput.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/FbdevOutput.cs @@ -9,16 +9,15 @@ namespace Avalonia.LinuxFramebuffer { public sealed unsafe class FbdevOutput : IFramebufferPlatformSurface, IDisposable, IOutputBackend { - private readonly Vector _dpi; private int _fd; private fb_fix_screeninfo _fixedInfo; private fb_var_screeninfo _varInfo; private IntPtr _mappedLength; private IntPtr _mappedAddress; + public double Scaling { get; set; } - public FbdevOutput(string fileName = null, Vector? dpi = null) + public FbdevOutput(string fileName = null) { - _dpi = dpi ?? new Vector(96, 96); fileName = fileName ?? Environment.GetEnvironmentVariable("FRAMEBUFFER") ?? "/dev/fb0"; _fd = NativeUnsafeMethods.open(fileName, 2, 0); if (_fd <= 0) @@ -101,7 +100,7 @@ namespace Avalonia.LinuxFramebuffer { if (_fd <= 0) throw new ObjectDisposedException("LinuxFramebuffer"); - return new LockedFramebuffer(_fd, _fixedInfo, _varInfo, _mappedAddress, _dpi); + return new LockedFramebuffer(_fd, _fixedInfo, _varInfo, _mappedAddress, new Vector(96, 96) * Scaling); } diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/IOutputBackend.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/IOutputBackend.cs index 01690f07ac..17a39b0219 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Output/IOutputBackend.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/IOutputBackend.cs @@ -3,5 +3,6 @@ namespace Avalonia.LinuxFramebuffer.Output public interface IOutputBackend { PixelSize PixelSize { get; } + double Scaling { get; set; } } } From 8ef5fdfbc1889d91daf9687aa90c1210e3af5231 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 7 Aug 2019 11:21:52 +0200 Subject: [PATCH 39/43] Add "Add Item" button to ItemsRepeaterPage. --- .../Pages/ItemsRepeaterPage.xaml | 5 ++-- .../Pages/ItemsRepeaterPage.xaml.cs | 3 ++- .../ViewModels/ItemsRepeaterPageViewModel.cs | 24 +++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml index dfe8be2cec..17a00f23fd 100644 --- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml +++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml @@ -6,19 +6,20 @@ ItemsRepeater A data-driven collection control that incorporates a flexible layout system, custom views, and virtualization. - + Stack - Vertical Stack - Horizontal UniformGrid - Vertical UniformGrid - Horizontal + - + diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs index 214de89253..b56af5d5ea 100644 --- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs +++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs @@ -3,6 +3,7 @@ using Avalonia.Controls; using Avalonia.Controls.Primitives; using Avalonia.Layout; using Avalonia.Markup.Xaml; +using ControlCatalog.ViewModels; namespace ControlCatalog.Pages { @@ -16,7 +17,7 @@ namespace ControlCatalog.Pages this.InitializeComponent(); _repeater = this.FindControl("repeater"); _scroller = this.FindControl("scroller"); - DataContext = Enumerable.Range(1, 100000).Select(i => $"Item {i}" ).ToArray(); + DataContext = new ItemsRepeaterPageViewModel(); } private void InitializeComponent() diff --git a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs new file mode 100644 index 0000000000..5304ba1f7d --- /dev/null +++ b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs @@ -0,0 +1,24 @@ +using System.Collections.ObjectModel; +using System.Linq; +using ReactiveUI; + +namespace ControlCatalog.ViewModels +{ + public class ItemsRepeaterPageViewModel : ReactiveObject + { + private int newItemIndex = 1; + + public ItemsRepeaterPageViewModel() + { + Items = new ObservableCollection( + Enumerable.Range(1, 100000).Select(i => $"Item {i}")); + } + + public ObservableCollection Items { get; } + + public void AddItem() + { + Items.Insert(0, $"New Item {newItemIndex++}"); + } + } +} From 5b6a44bd724769dc287c5b829aba4be769ae9d13 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 7 Aug 2019 11:43:37 +0200 Subject: [PATCH 40/43] Fix facepalm in ItemsSourceView. Don't construct a new `List` unless the source isn't already an `IList`. --- src/Avalonia.Controls/Repeater/ItemsSourceView.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Controls/Repeater/ItemsSourceView.cs b/src/Avalonia.Controls/Repeater/ItemsSourceView.cs index 732ba8501c..02ead7ef36 100644 --- a/src/Avalonia.Controls/Repeater/ItemsSourceView.cs +++ b/src/Avalonia.Controls/Repeater/ItemsSourceView.cs @@ -35,9 +35,11 @@ namespace Avalonia.Controls { Contract.Requires(source != null); - _inner = source as IList; - - if (_inner == null && source is IEnumerable objectEnumerable) + if (source is IList list) + { + _inner = list; + } + else if (source is IEnumerable objectEnumerable) { _inner = new List(objectEnumerable); } From e73a5a6357c6dce749baa1ddc81f6efaeedcdd70 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 7 Aug 2019 13:06:30 +0200 Subject: [PATCH 41/43] Fix another facepalm in ItemsRepeater. `Measure` and `Arrange` were swapped. --- src/Avalonia.Controls/Repeater/ItemsRepeater.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs index 44783e2c97..257c1b2399 100644 --- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs +++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs @@ -707,9 +707,9 @@ namespace Avalonia.Controls } } - private void InvalidateArrangeForLayout(object sender, EventArgs e) => InvalidateMeasure(); + private void InvalidateMeasureForLayout(object sender, EventArgs e) => InvalidateMeasure(); - private void InvalidateMeasureForLayout(object sender, EventArgs e) => InvalidateArrange(); + private void InvalidateArrangeForLayout(object sender, EventArgs e) => InvalidateArrange(); private VirtualizingLayoutContext GetLayoutContext() { From 96c1670197aa5bcdd9f0f398097f003a261b56c1 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 7 Aug 2019 13:14:34 +0200 Subject: [PATCH 42/43] Remove previous hack. Indroduced in f09683cf93791d9b676983a2e80d6852c63da987. Was probably caused by the issue fixed in e73a5a6357c6dce749baa1ddc81f6efaeedcdd70. --- src/Avalonia.Layout/UniformGridLayoutState.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Avalonia.Layout/UniformGridLayoutState.cs b/src/Avalonia.Layout/UniformGridLayoutState.cs index 4557a78d37..e6d75bcf35 100644 --- a/src/Avalonia.Layout/UniformGridLayoutState.cs +++ b/src/Avalonia.Layout/UniformGridLayoutState.cs @@ -72,12 +72,6 @@ namespace Avalonia.Layout _cachedFirstElement.Measure(availableSize); - // This doesn't need to be done in the UWP version and I'm not sure why. If we - // don't do this here, and we receive a recycled element then it will be shown - // at its previous arrange point, but we don't want it shown at all until its - // arranged. - _cachedFirstElement.Arrange(new Rect(-10000.0, -10000.0, 0, 0)); - SetSize(_cachedFirstElement, layoutItemWidth, LayoutItemHeight, availableSize, stretch, orientation, minRowSpacing, minColumnSpacing); // See if we can move ownership to the flow algorithm. If we can, we do not need a local cache. From fa6505123f8488733e71ba2bb12ffe36db142009 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 7 Aug 2019 13:20:26 +0200 Subject: [PATCH 43/43] Allow adding items anywhere in list. By clicking an item in `ItemsRepeater` to select the insertion point. --- samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml | 2 +- samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs | 9 +++++++++ .../ViewModels/ItemsRepeaterPageViewModel.cs | 5 ++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml index 17a00f23fd..d0631d2cbd 100644 --- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml +++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml @@ -19,7 +19,7 @@ - + diff --git a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs index b56af5d5ea..1a607342f3 100644 --- a/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs +++ b/samples/ControlCatalog/Pages/ItemsRepeaterPage.xaml.cs @@ -1,6 +1,8 @@ +using System; using System.Linq; using Avalonia.Controls; using Avalonia.Controls.Primitives; +using Avalonia.Input; using Avalonia.Layout; using Avalonia.Markup.Xaml; using ControlCatalog.ViewModels; @@ -17,6 +19,7 @@ namespace ControlCatalog.Pages this.InitializeComponent(); _repeater = this.FindControl("repeater"); _scroller = this.FindControl("scroller"); + _repeater.PointerPressed += RepeaterClick; DataContext = new ItemsRepeaterPageViewModel(); } @@ -68,5 +71,11 @@ namespace ControlCatalog.Pages break; } } + + private void RepeaterClick(object sender, PointerPressedEventArgs e) + { + var item = (e.Source as TextBlock)?.DataContext as string; + ((ItemsRepeaterPageViewModel)DataContext).SelectedItem = item; + } } } diff --git a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs index 5304ba1f7d..436a479441 100644 --- a/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs +++ b/samples/ControlCatalog/ViewModels/ItemsRepeaterPageViewModel.cs @@ -16,9 +16,12 @@ namespace ControlCatalog.ViewModels public ObservableCollection Items { get; } + public string SelectedItem { get; set; } + public void AddItem() { - Items.Insert(0, $"New Item {newItemIndex++}"); + var index = SelectedItem != null ? Items.IndexOf(SelectedItem) : -1; + Items.Insert(index + 1, $"New Item {newItemIndex++}"); } } }