Browse Source

Merge branch 'master' into perf/templatedparent-direct

pull/2085/head
Steven Kirk 7 years ago
committed by GitHub
parent
commit
e5cebd0d48
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      samples/ControlCatalog/MainView.xaml
  2. 124
      samples/ControlCatalog/Pages/TabControlPage.xaml
  3. 80
      samples/ControlCatalog/Pages/TabControlPage.xaml.cs
  4. 111
      samples/ControlCatalog/SideBar.xaml
  5. 12
      src/Avalonia.Base/Data/Core/ExpressionNode.cs
  6. 57
      src/Avalonia.Controls/Generators/TabItemContainerGenerator.cs
  7. 21
      src/Avalonia.Controls/Primitives/HeaderedContentControl.cs
  8. 164
      src/Avalonia.Controls/TabControl.cs
  9. 73
      src/Avalonia.Controls/TabItem.cs
  10. 2
      src/Avalonia.Themes.Default/Accents/BaseDark.xaml
  11. 2
      src/Avalonia.Themes.Default/Accents/BaseLight.xaml
  12. 1
      src/Avalonia.Themes.Default/DefaultTheme.xaml
  13. 22
      src/Avalonia.Themes.Default/ScrollBar.xaml
  14. 104
      src/Avalonia.Themes.Default/TabControl.xaml
  15. 39
      src/Avalonia.Themes.Default/TabItem.xaml
  16. 164
      src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
  17. 16
      src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
  18. 8
      src/Shared/PlatformSupport/StandardRuntimePlatform.cs
  19. 7
      src/Windows/Avalonia.Win32/FramebufferManager.cs
  20. 3
      src/Windows/Avalonia.Win32/WindowImpl.cs
  21. 145
      tests/Avalonia.Controls.UnitTests/TabControlTests.cs
  22. 2
      tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
  23. 100
      tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
  24. 58
      tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Property.cs
  25. 4
      tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs

4
samples/ControlCatalog/MainView.xaml

@ -2,9 +2,6 @@
xmlns:pages="clr-namespace:ControlCatalog.Pages" xmlns:pages="clr-namespace:ControlCatalog.Pages"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<TabControl Classes="sidebar" Name="Sidebar"> <TabControl Classes="sidebar" Name="Sidebar">
<TabControl.PageTransition>
<CrossFade Duration="0.25"/>
</TabControl.PageTransition>
<TabItem Header="AutoCompleteBox"><pages:AutoCompleteBoxPage/></TabItem> <TabItem Header="AutoCompleteBox"><pages:AutoCompleteBoxPage/></TabItem>
<TabItem Header="Border"><pages:BorderPage/></TabItem> <TabItem Header="Border"><pages:BorderPage/></TabItem>
<TabItem Header="Button"><pages:ButtonPage/></TabItem> <TabItem Header="Button"><pages:ButtonPage/></TabItem>
@ -29,5 +26,6 @@
<TabItem Header="TextBox"><pages:TextBoxPage/></TabItem> <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
<TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem> <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
<TabItem Header="TreeView"><pages:TreeViewPage/></TabItem> <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
<TabItem Header="TabControl"><pages:TabControlPage/></TabItem>
</TabControl> </TabControl>
</UserControl> </UserControl>

124
samples/ControlCatalog/Pages/TabControlPage.xaml

@ -0,0 +1,124 @@
<UserControl xmlns="https://github.com/avaloniaui">
<DockPanel>
<TextBlock
DockPanel.Dock="Top"
Classes="h1"
Text="TabControl"
Margin="4">
</TextBlock>
<TextBlock
DockPanel.Dock="Top"
Classes="h2"
Text="A tab control that displays a tab strip along with the content of the selected tab"
Margin="4">
</TextBlock>
<Grid
ColumnDefinitions="*,*"
RowDefinitions="*,100">
<DockPanel
Grid.Column="0"
Margin="4">
<TextBlock
DockPanel.Dock="Top"
Classes="h1"
Text="From Inline TabItems">
</TextBlock>
<TabControl
Margin="0 16"
TabStripPlacement="{Binding TabPlacement}">
<TabItem>
<TabItem.Header>
<TextBlock
Text="Arch"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="8">
</TextBlock>
</TabItem.Header>
<StackPanel Orientation="Vertical" Spacing="8">
<TextBlock>This is the first page in the TabControl.</TextBlock>
<Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg" Width="300"/>
</StackPanel>
</TabItem>
<TabItem>
<TabItem.Header>
<TextBlock
Text="Leaf"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="8">
</TextBlock>
</TabItem.Header>
<StackPanel Orientation="Vertical" Spacing="8">
<TextBlock>This is the second page in the TabControl.</TextBlock>
<Image Source="resm:ControlCatalog.Assets.maple-leaf-888807_640.jpg" Width="300"/>
</StackPanel>
</TabItem>
<TabItem IsEnabled="False">
<TabItem.Header>
<TextBlock
Text="Disabled"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="8">
</TextBlock>
</TabItem.Header>
<TextBlock>You should not see this.</TextBlock>
</TabItem>
</TabControl>
</DockPanel>
<DockPanel
Grid.Column="1"
Margin="4">
<TextBlock
DockPanel.Dock="Top"
Classes="h1"
Text="From DataTemplate">
</TextBlock>
<TabControl
Items="{Binding Tabs}"
Margin="0 16"
TabStripPlacement="{Binding TabPlacement}">
<TabControl.ItemTemplate>
<DataTemplate>
<TextBlock
Text="{Binding Header}"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="8">
</TextBlock>
</DataTemplate>
</TabControl.ItemTemplate>
<TabControl.ContentTemplate>
<DataTemplate>
<StackPanel Orientation="Vertical" Spacing="8">
<TextBlock Text="{Binding Text}"/>
<Image Source="{Binding Image}" Width="300"/>
</StackPanel>
</DataTemplate>
</TabControl.ContentTemplate>
<TabControl.Styles>
<Style Selector="TabItem">
<Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
</Style>
</TabControl.Styles>
</TabControl>
</DockPanel>
<StackPanel
Grid.Row="1"
Grid.ColumnSpan="2"
Orientation="Horizontal"
Spacing="8"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock VerticalAlignment="Center">Tab Placement:</TextBlock>
<DropDown SelectedIndex="{Binding TabPlacement, Mode=TwoWay}">
<DropDownItem>Left</DropDownItem>
<DropDownItem>Bottom</DropDownItem>
<DropDownItem>Right</DropDownItem>
<DropDownItem>Top</DropDownItem>
</DropDown>
</StackPanel>
</Grid>
</DockPanel>
</UserControl>

80
samples/ControlCatalog/Pages/TabControlPage.xaml.cs

@ -0,0 +1,80 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
using ReactiveUI;
namespace ControlCatalog.Pages
{
using System.Collections.Generic;
public class TabControlPage : UserControl
{
public TabControlPage()
{
InitializeComponent();
DataContext = new PageViewModel
{
Tabs = new[]
{
new TabItemViewModel
{
Header = "Arch",
Text = "This is the first templated tab page.",
Image = LoadBitmap("resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg?assembly=ControlCatalog"),
},
new TabItemViewModel
{
Header = "Leaf",
Text = "This is the second templated tab page.",
Image = LoadBitmap("resm:ControlCatalog.Assets.maple-leaf-888807_640.jpg?assembly=ControlCatalog"),
},
new TabItemViewModel
{
Header = "Disabled",
Text = "You should not see this.",
IsEnabled = false,
},
},
TabPlacement = Dock.Top,
};
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private IBitmap LoadBitmap(string uri)
{
var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
return new Bitmap(assets.Open(new Uri(uri)));
}
private class PageViewModel : ReactiveObject
{
private Dock _tabPlacement;
public TabItemViewModel[] Tabs { get; set; }
public Dock TabPlacement
{
get { return _tabPlacement; }
set { this.RaiseAndSetIfChanged(ref _tabPlacement, value); }
}
}
private class TabItemViewModel
{
public string Header { get; set; }
public string Text { get; set; }
public IBitmap Image { get; set; }
public bool IsEnabled { get; set; } = true;
}
}
}

111
samples/ControlCatalog/SideBar.xaml

@ -1,52 +1,67 @@
<Styles xmlns="https://github.com/avaloniaui" <Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" > xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
<Style Selector="TabControl.sidebar"> <Style Selector="TabControl.sidebar">
<Setter Property="Template"> <Setter Property="TabStripPlacement" Value="Left"/>
<ControlTemplate> <Setter Property="Padding" Value="8 0 0 0"/>
<DockPanel> <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}"/>
<ScrollViewer MinWidth="190" Background="{DynamicResource ThemeAccentBrush}" DockPanel.Dock="Left"> <Setter Property="Template">
<TabStrip Name="PART_TabStrip" <ControlTemplate>
MemberSelector="{x:Static TabControl.HeaderSelector}" <Border
Items="{TemplateBinding Items}" Margin="{TemplateBinding Margin}"
SelectedIndex="{TemplateBinding SelectedIndex, Mode=TwoWay}"> BorderBrush="{TemplateBinding BorderBrush}"
<TabStrip.ItemsPanel> BorderThickness="{TemplateBinding BorderThickness}">
<ItemsPanelTemplate> <DockPanel>
<StackPanel Orientation="Vertical"/> <ScrollViewer
</ItemsPanelTemplate> Name="PART_ScrollViewer"
</TabStrip.ItemsPanel> HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
</TabStrip> VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
</ScrollViewer> Background="{TemplateBinding Background}">
<Carousel Name="PART_Content" <ItemsPresenter
Margin="8 0 0 0" Name="PART_ItemsPresenter"
MemberSelector="{x:Static TabControl.ContentSelector}" MinWidth="190"
Items="{TemplateBinding Items}" Items="{TemplateBinding Items}"
SelectedIndex="{TemplateBinding SelectedIndex}" ItemsPanel="{TemplateBinding ItemsPanel}"
PageTransition="{TemplateBinding PageTransition}" ItemTemplate="{TemplateBinding ItemTemplate}"
Grid.Row="1"/> MemberSelector="{TemplateBinding MemberSelector}">
</DockPanel> </ItemsPresenter>
</ControlTemplate> </ScrollViewer>
</Setter> <ContentPresenter
</Style> Name="PART_Content"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding SelectedContent}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}">
</ContentPresenter>
</DockPanel>
</Border>
</ControlTemplate>
</Setter>
</Style>
<Style Selector="TabControl.sidebar TabStripItem"> <Style Selector="TabControl.sidebar > TabItem">
<Setter Property="Foreground" Value="White"/> <Setter Property="BorderThickness" Value="0"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="Foreground" Value="White"/>
<Setter Property="Margin" Value="0"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="Padding" Value="16"/> <Setter Property="Margin" Value="0"/>
<Setter Property="Opacity" Value="0.5"/> <Setter Property="Padding" Value="16"/>
<Setter Property="Transitions"> <Setter Property="Opacity" Value="0.5"/>
<Transitions> <Setter Property="Transitions">
<DoubleTransition Property="Opacity" Duration="0:0:0.2"/> <Transitions>
</Transitions> <DoubleTransition Property="Opacity" Duration="0:0:0.5"/>
</Setter> </Transitions>
</Style> </Setter>
</Style>
<Style Selector="TabControl.sidebar TabStripItem:pointerover"> <Style Selector="TabControl.sidebar > TabItem:pointerover">
<Setter Property="Opacity" Value="1"/> <Setter Property="Opacity" Value="1"/>
</Style> </Style>
<Style Selector="TabControl.sidebar > TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Style Selector="TabControl.sidebar TabStripItem:selected"> <Setter Property="Background" Value="Transparent"/>
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/> </Style>
<Setter Property="Opacity" Value="1"/> <Style Selector="TabControl.sidebar > TabItem:selected">
</Style> <Setter Property="Opacity" Value="1"/>
</Style>
<Style Selector="TabControl.sidebar > TabItem:selected /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
</Style>
</Styles> </Styles>

12
src/Avalonia.Base/Data/Core/ExpressionNode.cs

@ -88,18 +88,21 @@ namespace Avalonia.Data.Core
_subscriber(value); _subscriber(value);
} }
protected void ValueChanged(object value) protected void ValueChanged(object value) => ValueChanged(value, true);
private void ValueChanged(object value, bool notify)
{ {
var notification = value as BindingNotification; var notification = value as BindingNotification;
if (notification == null) if (notification == null)
{ {
LastValue = new WeakReference(value); LastValue = new WeakReference(value);
if (Next != null) if (Next != null)
{ {
Next.Target = new WeakReference(value); Next.Target = LastValue;
} }
else else if (notify)
{ {
_subscriber(value); _subscriber(value);
} }
@ -110,7 +113,7 @@ namespace Avalonia.Data.Core
if (Next != null) if (Next != null)
{ {
Next.Target = new WeakReference(notification.Value); Next.Target = LastValue;
} }
if (Next == null || notification.Error != null) if (Next == null || notification.Error != null)
@ -136,6 +139,7 @@ namespace Avalonia.Data.Core
} }
else else
{ {
ValueChanged(AvaloniaProperty.UnsetValue, notify:false);
_listening = false; _listening = false;
} }
} }

57
src/Avalonia.Controls/Generators/TabItemContainerGenerator.cs

@ -0,0 +1,57 @@
// 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;
namespace Avalonia.Controls.Generators
{
public class TabItemContainerGenerator : ItemContainerGenerator<TabItem>
{
public TabItemContainerGenerator(TabControl owner)
: base(owner, ContentControl.ContentProperty, ContentControl.ContentTemplateProperty)
{
Owner = owner;
}
public new TabControl Owner { get; }
protected override IControl CreateContainer(object item)
{
var tabItem = (TabItem)base.CreateContainer(item);
tabItem.ParentTabControl = Owner;
if (tabItem.HeaderTemplate == null)
{
tabItem[~HeaderedContentControl.HeaderTemplateProperty] = Owner[~ItemsControl.ItemTemplateProperty];
}
if (tabItem.Header == null)
{
if (item is IHeadered headered)
{
tabItem.Header = headered.Header;
}
else
{
if (!(tabItem.DataContext is IControl))
{
tabItem.Header = tabItem.DataContext;
}
}
}
if (!(tabItem.Content is IControl))
{
tabItem[~ContentControl.ContentTemplateProperty] = Owner[~TabControl.ContentTemplateProperty];
}
if (tabItem.Content == null)
{
tabItem[~ContentControl.ContentProperty] = tabItem[~StyledElement.DataContextProperty];
}
return tabItem;
}
}
}

21
src/Avalonia.Controls/Primitives/HeaderedContentControl.cs

@ -1,6 +1,8 @@
// Copyright (c) The Avalonia Project. All rights reserved. // 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. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using Avalonia.Controls.Templates;
namespace Avalonia.Controls.Primitives namespace Avalonia.Controls.Primitives
{ {
/// <summary> /// <summary>
@ -12,7 +14,13 @@ namespace Avalonia.Controls.Primitives
/// Defines the <see cref="Header"/> property. /// Defines the <see cref="Header"/> property.
/// </summary> /// </summary>
public static readonly StyledProperty<object> HeaderProperty = public static readonly StyledProperty<object> HeaderProperty =
AvaloniaProperty.Register<ContentControl, object>(nameof(Header)); AvaloniaProperty.Register<HeaderedContentControl, object>(nameof(Header));
/// <summary>
/// Defines the <see cref="HeaderTemplate"/> property.
/// </summary>
public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate>(nameof(HeaderTemplate));
/// <summary> /// <summary>
/// Gets or sets the header content. /// Gets or sets the header content.
@ -21,6 +29,15 @@ namespace Avalonia.Controls.Primitives
{ {
get { return GetValue(HeaderProperty); } get { return GetValue(HeaderProperty); }
set { SetValue(HeaderProperty, value); } set { SetValue(HeaderProperty, value); }
}
/// <summary>
/// Gets or sets the data template used to display the header content of the control.
/// </summary>
public IDataTemplate HeaderTemplate
{
get { return GetValue(HeaderTemplateProperty); }
set { SetValue(HeaderTemplateProperty, value); }
} }
} }
} }

164
src/Avalonia.Controls/TabControl.cs

@ -1,10 +1,12 @@
// Copyright (c) The Avalonia Project. All rights reserved. // 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. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using Avalonia.Animation;
using Avalonia.Controls.Generators; using Avalonia.Controls.Generators;
using Avalonia.Controls.Presenters;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates; using Avalonia.Controls.Templates;
using Avalonia.Input;
using Avalonia.Layout;
namespace Avalonia.Controls namespace Avalonia.Controls
{ {
@ -14,28 +16,46 @@ namespace Avalonia.Controls
public class TabControl : SelectingItemsControl public class TabControl : SelectingItemsControl
{ {
/// <summary> /// <summary>
/// Defines the <see cref="PageTransition"/> property. /// Defines the <see cref="TabStripPlacement"/> property.
/// </summary> /// </summary>
public static readonly StyledProperty<IPageTransition> PageTransitionProperty = public static readonly StyledProperty<Dock> TabStripPlacementProperty =
Avalonia.Controls.Carousel.PageTransitionProperty.AddOwner<TabControl>(); AvaloniaProperty.Register<TabControl, Dock>(nameof(TabStripPlacement), defaultValue: Dock.Top);
/// <summary> /// <summary>
/// Defines an <see cref="IMemberSelector"/> that selects the content of a <see cref="TabItem"/>. /// Defines the <see cref="HorizontalContentAlignment"/> property.
/// </summary> /// </summary>
public static readonly IMemberSelector ContentSelector = public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
new FuncMemberSelector<object, object>(SelectContent); ContentControl.HorizontalContentAlignmentProperty.AddOwner<TabControl>();
/// <summary> /// <summary>
/// Defines an <see cref="IMemberSelector"/> that selects the header of a <see cref="TabItem"/>. /// Defines the <see cref="VerticalContentAlignment"/> property.
/// </summary> /// </summary>
public static readonly IMemberSelector HeaderSelector = public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
new FuncMemberSelector<object, object>(SelectHeader); ContentControl.VerticalContentAlignmentProperty.AddOwner<TabControl>();
/// <summary> /// <summary>
/// Defines the <see cref="TabStripPlacement"/> property. /// Defines the <see cref="ContentTemplate"/> property.
/// </summary> /// </summary>
public static readonly StyledProperty<Dock> TabStripPlacementProperty = public static readonly StyledProperty<IDataTemplate> ContentTemplateProperty =
AvaloniaProperty.Register<TabControl, Dock>(nameof(TabStripPlacement), defaultValue: Dock.Top); ContentControl.ContentTemplateProperty.AddOwner<TabControl>();
/// <summary>
/// The selected content property
/// </summary>
public static readonly StyledProperty<object> SelectedContentProperty =
AvaloniaProperty.Register<TabControl, object>(nameof(SelectedContent));
/// <summary>
/// The selected content template property
/// </summary>
public static readonly StyledProperty<IDataTemplate> SelectedContentTemplateProperty =
AvaloniaProperty.Register<TabControl, IDataTemplate>(nameof(SelectedContentTemplate));
/// <summary>
/// The default value for the <see cref="ItemsControl.ItemsPanel"/> property.
/// </summary>
private static readonly FuncTemplate<IPanel> DefaultPanel =
new FuncTemplate<IPanel>(() => new WrapPanel());
/// <summary> /// <summary>
/// Initializes static members of the <see cref="TabControl"/> class. /// Initializes static members of the <see cref="TabControl"/> class.
@ -43,107 +63,107 @@ namespace Avalonia.Controls
static TabControl() static TabControl()
{ {
SelectionModeProperty.OverrideDefaultValue<TabControl>(SelectionMode.AlwaysSelected); SelectionModeProperty.OverrideDefaultValue<TabControl>(SelectionMode.AlwaysSelected);
FocusableProperty.OverrideDefaultValue<TabControl>(false); ItemsPanelProperty.OverrideDefaultValue<TabControl>(DefaultPanel);
AffectsMeasure<TabControl>(TabStripPlacementProperty); AffectsMeasure<TabControl>(TabStripPlacementProperty);
} }
/// <summary> /// <summary>
/// Gets the pages portion of the <see cref="TabControl"/>'s template. /// Gets or sets the horizontal alignment of the content within the control.
/// </summary> /// </summary>
public IControl Pages public HorizontalAlignment HorizontalContentAlignment
{ {
get; get { return GetValue(HorizontalContentAlignmentProperty); }
private set; set { SetValue(HorizontalContentAlignmentProperty, value); }
} }
/// <summary> /// <summary>
/// Gets the tab strip portion of the <see cref="TabControl"/>'s template. /// Gets or sets the vertical alignment of the content within the control.
/// </summary> /// </summary>
public IControl TabStrip public VerticalAlignment VerticalContentAlignment
{ {
get; get { return GetValue(VerticalContentAlignmentProperty); }
private set; set { SetValue(VerticalContentAlignmentProperty, value); }
} }
/// <summary> /// <summary>
/// Gets or sets the transition to use when switching tabs. /// Gets or sets the tabstrip placement of the TabControl.
/// </summary> /// </summary>
public IPageTransition PageTransition public Dock TabStripPlacement
{ {
get { return GetValue(PageTransitionProperty); } get { return GetValue(TabStripPlacementProperty); }
set { SetValue(PageTransitionProperty, value); } set { SetValue(TabStripPlacementProperty, value); }
} }
/// <summary> /// <summary>
/// Gets or sets the tabstrip placement of the tabcontrol. /// Gets or sets the default data template used to display the content of the selected tab.
/// </summary> /// </summary>
public Dock TabStripPlacement public IDataTemplate ContentTemplate
{ {
get { return GetValue(TabStripPlacementProperty); } get { return GetValue(ContentTemplateProperty); }
set { SetValue(TabStripPlacementProperty, value); } set { SetValue(ContentTemplateProperty, value); }
} }
/// <summary>
/// Gets or sets the content of the selected tab.
/// </summary>
/// <value>
/// The content of the selected tab.
/// </value>
public object SelectedContent
{
get { return GetValue(SelectedContentProperty); }
internal set { SetValue(SelectedContentProperty, value); }
}
/// <summary>
/// Gets or sets the content template for the selected tab.
/// </summary>
/// <value>
/// The content template of the selected tab.
/// </value>
public IDataTemplate SelectedContentTemplate
{
get { return GetValue(SelectedContentTemplateProperty); }
internal set { SetValue(SelectedContentTemplateProperty, value); }
}
internal ItemsPresenter ItemsPresenterPart { get; private set; }
internal ContentPresenter ContentPart { get; private set; }
protected override IItemContainerGenerator CreateItemContainerGenerator() protected override IItemContainerGenerator CreateItemContainerGenerator()
{ {
// TabControl doesn't actually create items - instead its TabStrip and Carousel return new TabItemContainerGenerator(this);
// children create the items. However we want it to be a SelectingItemsControl
// so that it has the Items/SelectedItem etc properties. In this case, we can
// return a null ItemContainerGenerator to disable the creation of item containers.
return null;
} }
protected override void OnTemplateApplied(TemplateAppliedEventArgs e) protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
{ {
base.OnTemplateApplied(e); base.OnTemplateApplied(e);
TabStrip = e.NameScope.Find<IControl>("PART_TabStrip"); ItemsPresenterPart = e.NameScope.Get<ItemsPresenter>("PART_ItemsPresenter");
Pages = e.NameScope.Find<IControl>("PART_Content");
ContentPart = e.NameScope.Get<ContentPresenter>("PART_Content");
} }
/// <summary> /// <inheritdoc/>
/// Selects the content of a tab item. protected override void OnGotFocus(GotFocusEventArgs e)
/// </summary>
/// <param name="o">The tab item.</param>
/// <returns>The content.</returns>
private static object SelectContent(object o)
{ {
var content = o as IContentControl; base.OnGotFocus(e);
if (content != null) if (e.NavigationMethod == NavigationMethod.Directional)
{ {
return content.Content; e.Handled = UpdateSelectionFromEventSource(e.Source);
} }
else
{
return o;
}
} }
/// <summary> /// <inheritdoc/>
/// Selects the header of a tab item. protected override void OnPointerPressed(PointerPressedEventArgs e)
/// </summary>
/// <param name="o">The tab item.</param>
/// <returns>The content.</returns>
private static object SelectHeader(object o)
{ {
var headered = o as IHeadered; base.OnPointerPressed(e);
var control = o as IControl;
if (headered != null) if (e.MouseButton == MouseButton.Left)
{
return headered.Header ?? string.Empty;
}
else if (control != null)
{
// Non-headered control items should result in TabStripItems with empty content.
// If a TabStrip is created with non IHeadered controls as its items, don't try to
// display the control in the TabStripItem: the content portion will also try to
// display this control, resulting in dual-parentage breakage.
return string.Empty;
}
else
{ {
return o; e.Handled = UpdateSelectionFromEventSource(e.Source);
} }
} }
} }

73
src/Avalonia.Controls/TabItem.cs

@ -11,12 +11,20 @@ namespace Avalonia.Controls
/// </summary> /// </summary>
public class TabItem : HeaderedContentControl, ISelectable public class TabItem : HeaderedContentControl, ISelectable
{ {
/// <summary>
/// Defines the <see cref="TabStripPlacement"/> property.
/// </summary>
public static readonly StyledProperty<Dock> TabStripPlacementProperty =
TabControl.TabStripPlacementProperty.AddOwner<TabItem>();
/// <summary> /// <summary>
/// Defines the <see cref="IsSelected"/> property. /// Defines the <see cref="IsSelected"/> property.
/// </summary> /// </summary>
public static readonly StyledProperty<bool> IsSelectedProperty = public static readonly StyledProperty<bool> IsSelectedProperty =
ListBoxItem.IsSelectedProperty.AddOwner<TabItem>(); ListBoxItem.IsSelectedProperty.AddOwner<TabItem>();
private TabControl _parentTabControl;
/// <summary> /// <summary>
/// Initializes static members of the <see cref="TabItem"/> class. /// Initializes static members of the <see cref="TabItem"/> class.
/// </summary> /// </summary>
@ -24,6 +32,19 @@ namespace Avalonia.Controls
{ {
SelectableMixin.Attach<TabItem>(IsSelectedProperty); SelectableMixin.Attach<TabItem>(IsSelectedProperty);
FocusableProperty.OverrideDefaultValue(typeof(TabItem), true); FocusableProperty.OverrideDefaultValue(typeof(TabItem), true);
IsSelectedProperty.Changed.AddClassHandler<TabItem>(x => x.UpdateSelectedContent);
DataContextProperty.Changed.AddClassHandler<TabItem>(x => x.UpdateHeader);
}
/// <summary>
/// Gets the tab strip placement.
/// </summary>
/// <value>
/// The tab strip placement.
/// </value>
public Dock TabStripPlacement
{
get { return GetValue(TabStripPlacementProperty); }
} }
/// <summary> /// <summary>
@ -34,5 +55,57 @@ namespace Avalonia.Controls
get { return GetValue(IsSelectedProperty); } get { return GetValue(IsSelectedProperty); }
set { SetValue(IsSelectedProperty, value); } set { SetValue(IsSelectedProperty, value); }
} }
internal TabControl ParentTabControl
{
get => _parentTabControl;
set => _parentTabControl = value;
}
private void UpdateHeader(AvaloniaPropertyChangedEventArgs obj)
{
if (Header == null)
{
if (obj.NewValue is IHeadered headered)
{
if (Header != headered.Header)
{
Header = headered.Header;
}
}
else
{
if (!(obj.NewValue is IControl))
{
Header = obj.NewValue;
}
}
}
else
{
if (Header == obj.OldValue)
{
Header = obj.NewValue;
}
}
}
private void UpdateSelectedContent(AvaloniaPropertyChangedEventArgs e)
{
if (!IsSelected)
{
return;
}
if (ParentTabControl.SelectedContentTemplate != ContentTemplate)
{
ParentTabControl.SelectedContentTemplate = ContentTemplate;
}
if (ParentTabControl.SelectedContent != Content)
{
ParentTabControl.SelectedContent = Content;
}
}
} }
} }

2
src/Avalonia.Themes.Default/Accents/BaseDark.xaml

@ -52,5 +52,7 @@
<sys:Double x:Key="FontSizeSmall">10</sys:Double> <sys:Double x:Key="FontSizeSmall">10</sys:Double>
<sys:Double x:Key="FontSizeNormal">12</sys:Double> <sys:Double x:Key="FontSizeNormal">12</sys:Double>
<sys:Double x:Key="FontSizeLarge">16</sys:Double> <sys:Double x:Key="FontSizeLarge">16</sys:Double>
<sys:Double x:Key="ScrollBarThickness">10</sys:Double>
</Style.Resources> </Style.Resources>
</Style> </Style>

2
src/Avalonia.Themes.Default/Accents/BaseLight.xaml

@ -52,5 +52,7 @@
<sys:Double x:Key="FontSizeSmall">10</sys:Double> <sys:Double x:Key="FontSizeSmall">10</sys:Double>
<sys:Double x:Key="FontSizeNormal">12</sys:Double> <sys:Double x:Key="FontSizeNormal">12</sys:Double>
<sys:Double x:Key="FontSizeLarge">16</sys:Double> <sys:Double x:Key="FontSizeLarge">16</sys:Double>
<sys:Double x:Key="ScrollBarThickness">10</sys:Double>
</Style.Resources> </Style.Resources>
</Style> </Style>

1
src/Avalonia.Themes.Default/DefaultTheme.xaml

@ -30,6 +30,7 @@
<StyleInclude Source="resm:Avalonia.Themes.Default.TabStripItem.xaml?assembly=Avalonia.Themes.Default"/> <StyleInclude Source="resm:Avalonia.Themes.Default.TabStripItem.xaml?assembly=Avalonia.Themes.Default"/>
<!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel--> <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
<StyleInclude Source="resm:Avalonia.Themes.Default.TabControl.xaml?assembly=Avalonia.Themes.Default"/> <StyleInclude Source="resm:Avalonia.Themes.Default.TabControl.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.TabItem.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.TextBox.xaml?assembly=Avalonia.Themes.Default"/> <StyleInclude Source="resm:Avalonia.Themes.Default.TextBox.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.ToggleButton.xaml?assembly=Avalonia.Themes.Default"/> <StyleInclude Source="resm:Avalonia.Themes.Default.ToggleButton.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.Expander.xaml?assembly=Avalonia.Themes.Default"/> <StyleInclude Source="resm:Avalonia.Themes.Default.Expander.xaml?assembly=Avalonia.Themes.Default"/>

22
src/Avalonia.Themes.Default/ScrollBar.xaml

@ -3,7 +3,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border Background="{DynamicResource ThemeControlMidBrush}"> <Border Background="{DynamicResource ThemeControlMidBrush}">
<Grid RowDefinitions="10,*,10"> <Grid RowDefinitions="Auto,*,Auto">
<RepeatButton Name="PART_LineUpButton" <RepeatButton Name="PART_LineUpButton"
Classes="repeat" Classes="repeat"
Grid.Row="0" Grid.Row="0"
@ -53,12 +53,11 @@
</Setter> </Setter>
</Style> </Style>
<Style Selector="ScrollBar:horizontal"> <Style Selector="ScrollBar:horizontal">
<Setter Property="Height" <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
Value="10" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Border Background="{DynamicResource ThemeControlMidBrush}"> <Border Background="{DynamicResource ThemeControlMidBrush}">
<Grid ColumnDefinitions="10,*,10"> <Grid ColumnDefinitions="Auto,*,Auto">
<RepeatButton Name="PART_LineUpButton" <RepeatButton Name="PART_LineUpButton"
Classes="repeat" Classes="repeat"
Grid.Row="0" Grid.Row="0"
@ -108,22 +107,17 @@
</Setter> </Setter>
</Style> </Style>
<Style Selector="ScrollBar:horizontal /template/ Thumb#thumb"> <Style Selector="ScrollBar:horizontal /template/ Thumb#thumb">
<Setter Property="MinWidth" <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
Value="10" />
</Style> </Style>
<Style Selector="ScrollBar:vertical"> <Style Selector="ScrollBar:vertical">
<Setter Property="Width" <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
Value="10" />
</Style> </Style>
<Style Selector="ScrollBar:vertical /template/ Thumb#thumb"> <Style Selector="ScrollBar:vertical /template/ Thumb#thumb">
<Setter Property="MinHeight" <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
Value="10" />
</Style> </Style>
<Style Selector="ScrollBar /template/ RepeatButton.repeat"> <Style Selector="ScrollBar /template/ RepeatButton.repeat">
<Setter Property="Padding" <Setter Property="Padding" Value="2" />
Value="2" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="BorderThickness"
Value="0" />
</Style> </Style>
<Style Selector="ScrollBar /template/ RepeatButton.repeattrack"> <Style Selector="ScrollBar /template/ RepeatButton.repeattrack">
<Setter Property="Template"> <Setter Property="Template">

104
src/Avalonia.Themes.Default/TabControl.xaml

@ -1,50 +1,56 @@
<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style Selector="TabControl"> <Style Selector="TabControl">
<Setter Property="Template"> <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
<ControlTemplate> <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
<Border Background="{TemplateBinding Background}" <Setter Property="Padding" Value="4"/>
BorderBrush="{TemplateBinding BorderBrush}" <Setter Property="VerticalContentAlignment" Value="Stretch"/>
BorderThickness="{TemplateBinding BorderThickness}"> <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<DockPanel> <Setter Property="Template">
<TabStrip Name="PART_TabStrip" <ControlTemplate>
MemberSelector="{x:Static TabControl.HeaderSelector}" <Border
Items="{TemplateBinding Items}" Margin="{TemplateBinding Margin}"
SelectedIndex="{TemplateBinding SelectedIndex, Mode=TwoWay}"/> BorderBrush="{TemplateBinding BorderBrush}"
<Carousel Name="PART_Content" BorderThickness="{TemplateBinding BorderThickness}"
MemberSelector="{x:Static TabControl.ContentSelector}" Background="{TemplateBinding Background}"
Items="{TemplateBinding Items}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
SelectedIndex="{TemplateBinding SelectedIndex}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
PageTransition="{TemplateBinding PageTransition}" <DockPanel>
Grid.Row="1"/> <ItemsPresenter
</DockPanel> Name="PART_ItemsPresenter"
</Border> Items="{TemplateBinding Items}"
</ControlTemplate> ItemsPanel="{TemplateBinding ItemsPanel}"
</Setter> ItemTemplate="{TemplateBinding ItemTemplate}"
</Style> MemberSelector="{TemplateBinding MemberSelector}" >
<Style Selector="TabControl[TabStripPlacement=Top] /template/ TabStrip"> </ItemsPresenter>
<Setter Property="DockPanel.Dock" Value="Top"/> <ContentPresenter
</Style> Name="PART_Content"
<Style Selector="TabControl[TabStripPlacement=Bottom] /template/ TabStrip"> Margin="{TemplateBinding Padding}"
<Setter Property="DockPanel.Dock" Value="Bottom"/> HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
</Style> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
<Style Selector="TabControl[TabStripPlacement=Left] /template/ TabStrip"> Content="{TemplateBinding SelectedContent}"
<Setter Property="DockPanel.Dock" Value="Left"/> ContentTemplate="{TemplateBinding SelectedContentTemplate}">
<Setter Property="ItemsPanel"> </ContentPresenter>
<Setter.Value> </DockPanel>
<ItemsPanelTemplate> </Border>
<StackPanel Orientation="Vertical"/> </ControlTemplate>
</ItemsPanelTemplate> </Setter>
</Setter.Value> </Style>
</Setter> <Style Selector="TabControl[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
</Style> <Setter Property="DockPanel.Dock" Value="Top"/>
<Style Selector="TabControl[TabStripPlacement=Right] /template/ TabStrip"> </Style>
<Setter Property="DockPanel.Dock" Value="Right"/> <Style Selector="TabControl[TabStripPlacement=Bottom] /template/ ItemsPresenter#PART_ItemsPresenter">
<Setter Property="ItemsPanel"> <Setter Property="DockPanel.Dock" Value="Bottom"/>
<Setter.Value> </Style>
<ItemsPanelTemplate> <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter">
<StackPanel Orientation="Vertical"/> <Setter Property="DockPanel.Dock" Value="Left"/>
</ItemsPanelTemplate> </Style>
</Setter.Value> <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
</Setter> <Setter Property="Orientation" Value="Vertical"/>
</Style> </Style>
</Styles> <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter">
<Setter Property="DockPanel.Dock" Value="Right"/>
</Style>
<Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
<Setter Property="Orientation" Value="Vertical"/>
</Style>
</Styles>

39
src/Avalonia.Themes.Default/TabItem.xaml

@ -0,0 +1,39 @@
<Styles xmlns="https://github.com/avaloniaui">
<Style Selector="TabItem">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLightBrush}"/>
<Setter Property="Template">
<ControlTemplate>
<ContentPresenter
Name="PART_ContentPresenter"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
Content="{TemplateBinding Header}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Padding="{TemplateBinding Padding}"/>
</ControlTemplate>
</Setter>
</Style>
<Style Selector="TabItem:disabled">
<Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
</Style>
<Style Selector="TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
</Style>
<Style Selector="TabItem:selected /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
</Style>
<Style Selector="TabItem:selected:focus /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
</Style>
<Style Selector="TabItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
</Style>
<Style Selector="TabItem:selected:focus:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
</Style>
</Styles>

164
src/Avalonia.Visuals/Rendering/DeferredRenderer.cs

@ -37,6 +37,7 @@ namespace Avalonia.Rendering
private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects(); private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects();
private IRef<IDrawOperation> _currentDraw; private IRef<IDrawOperation> _currentDraw;
private readonly IDeferredRendererLock _lock; private readonly IDeferredRendererLock _lock;
private readonly object _sceneLock = new object();
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="DeferredRenderer"/> class. /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
@ -84,6 +85,7 @@ namespace Avalonia.Rendering
RenderTarget = renderTarget; RenderTarget = renderTarget;
_sceneBuilder = sceneBuilder ?? new SceneBuilder(); _sceneBuilder = sceneBuilder ?? new SceneBuilder();
Layers = new RenderLayers(); Layers = new RenderLayers();
_lock = new ManagedDeferredRendererLock();
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -118,8 +120,13 @@ namespace Avalonia.Rendering
/// </summary> /// </summary>
public void Dispose() public void Dispose()
{ {
var scene = Interlocked.Exchange(ref _scene, null); lock (_sceneLock)
scene?.Dispose(); {
var scene = _scene;
_scene = null;
scene?.Dispose();
}
Stop(); Stop();
Layers.Clear(); Layers.Clear();
@ -134,7 +141,8 @@ namespace Avalonia.Rendering
// When unit testing the renderLoop may be null, so update the scene manually. // When unit testing the renderLoop may be null, so update the scene manually.
UpdateScene(); UpdateScene();
} }
//It's safe to access _scene here without a lock since
//it's only changed from UI thread which we are currently on
return _scene?.Item.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>(); return _scene?.Item.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>();
} }
@ -172,7 +180,8 @@ namespace Avalonia.Rendering
} }
} }
bool IRenderLoopTask.NeedsUpdate => _dirty == null || _dirty.Count > 0; bool NeedsUpdate => _dirty == null || _dirty.Count > 0;
bool IRenderLoopTask.NeedsUpdate => NeedsUpdate;
void IRenderLoopTask.Update(TimeSpan time) => UpdateScene(); void IRenderLoopTask.Update(TimeSpan time) => UpdateScene();
@ -197,79 +206,105 @@ namespace Avalonia.Rendering
internal void UnitTestUpdateScene() => UpdateScene(); internal void UnitTestUpdateScene() => UpdateScene();
internal void UnitTestRender() => Render(_scene.Item, false); internal void UnitTestRender() => Render(false);
private void Render(bool forceComposite) private void Render(bool forceComposite)
{ {
using (var l = _lock.TryLock()) using (var l = _lock.TryLock())
if (l != null)
using (var scene = _scene?.Clone())
{
Render(scene?.Item, forceComposite);
}
}
private void Render(Scene scene, bool forceComposite)
{
bool renderOverlay = DrawDirtyRects || DrawFps;
bool composite = false;
if (RenderTarget == null)
{ {
RenderTarget = ((IRenderRoot)_root).CreateRenderTarget(); if (l == null)
} return;
if (renderOverlay) IDrawingContextImpl context = null;
{ try
_dirtyRectsDisplay.Tick();
}
try
{
if (scene != null && scene.Size != Size.Empty)
{ {
IDrawingContextImpl context = null; try
if (scene.Generation != _lastSceneId)
{ {
context = RenderTarget.CreateDrawingContext(this); IDrawingContextImpl GetContext()
Layers.Update(scene, context); {
if (context != null)
return context;
if (RenderTarget == null)
RenderTarget = ((IRenderRoot)_root).CreateRenderTarget();
return context = RenderTarget.CreateDrawingContext(this);
RenderToLayers(scene); }
if (DebugFramesPath != null) var (scene, updated) = UpdateRenderLayersAndConsumeSceneIfNeeded(GetContext);
using (scene)
{ {
SaveDebugFrames(scene.Generation); var overlay = DrawDirtyRects || DrawFps;
if (DrawDirtyRects)
_dirtyRectsDisplay.Tick();
if (overlay)
RenderOverlay(scene.Item, GetContext());
if (updated || forceComposite || overlay)
RenderComposite(scene.Item, GetContext());
} }
}
finally
{
context?.Dispose();
}
}
catch (RenderTargetCorruptedException ex)
{
Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
RenderTarget?.Dispose();
RenderTarget = null;
}
}
}
_lastSceneId = scene.Generation; private (IRef<Scene> scene, bool updated) UpdateRenderLayersAndConsumeSceneIfNeeded(Func<IDrawingContextImpl> contextFactory,
bool recursiveCall = false)
{
IRef<Scene> sceneRef;
lock (_sceneLock)
sceneRef = _scene?.Clone();
if (sceneRef == null)
return (null, false);
using (sceneRef)
{
var scene = sceneRef.Item;
if (scene.Generation != _lastSceneId)
{
var context = contextFactory();
Layers.Update(scene, context);
composite = true; RenderToLayers(scene);
}
if (renderOverlay) if (DebugFramesPath != null)
{ {
context = context ?? RenderTarget.CreateDrawingContext(this); SaveDebugFrames(scene.Generation);
RenderOverlay(scene, context);
RenderComposite(scene, context);
} }
else if (composite || forceComposite)
lock (_sceneLock)
_lastSceneId = scene.Generation;
// We have consumed the previously available scene, but there might be some dirty
// rects since the last update. *If* we are on UI thread, we can force immediate scene
// rebuild before rendering anything on-screen
// We are calling the same method recursively here
if (!recursiveCall && Dispatcher.UIThread.CheckAccess() && NeedsUpdate)
{ {
context = context ?? RenderTarget.CreateDrawingContext(this); UpdateScene();
RenderComposite(scene, context); var (rs, _) = UpdateRenderLayersAndConsumeSceneIfNeeded(contextFactory, true);
return (rs, true);
} }
context?.Dispose(); // Indicate that we have updated the layers
return (sceneRef.Clone(), true);
} }
// Just return scene, layers weren't updated
return (sceneRef.Clone(), false);
} }
catch (RenderTargetCorruptedException ex)
{
Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
RenderTarget?.Dispose();
RenderTarget = null;
}
} }
private void Render(IDrawingContextImpl context, VisualNode node, IVisual layer, Rect clipBounds) private void Render(IDrawingContextImpl context, VisualNode node, IVisual layer, Rect clipBounds)
{ {
if (layer == null || node.LayerRoot == layer) if (layer == null || node.LayerRoot == layer)
@ -405,6 +440,11 @@ namespace Avalonia.Rendering
private void UpdateScene() private void UpdateScene()
{ {
Dispatcher.UIThread.VerifyAccess(); Dispatcher.UIThread.VerifyAccess();
lock (_sceneLock)
{
if (_scene?.Item.Generation > _lastSceneId)
return;
}
if (_root.IsVisible) if (_root.IsVisible)
{ {
var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root)); var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root));
@ -423,15 +463,23 @@ namespace Avalonia.Rendering
} }
} }
var oldScene = Interlocked.Exchange(ref _scene, sceneRef); lock (_sceneLock)
oldScene?.Dispose(); {
var oldScene = _scene;
_scene = sceneRef;
oldScene?.Dispose();
}
_dirty.Clear(); _dirty.Clear();
} }
else else
{ {
var oldScene = Interlocked.Exchange(ref _scene, null); lock (_sceneLock)
oldScene?.Dispose(); {
var oldScene = _scene;
_scene = null;
oldScene?.Dispose();
}
} }
} }

16
src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs

@ -1,13 +1,12 @@
// Copyright (c) The Avalonia Project. All rights reserved. // 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. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
using Avalonia.Data; using Avalonia.Data;
using Portable.Xaml.Markup;
namespace Avalonia.Markup.Xaml.MarkupExtensions namespace Avalonia.Markup.Xaml.MarkupExtensions
{ {
using Portable.Xaml.Markup;
using System;
public class RelativeSourceExtension : MarkupExtension public class RelativeSourceExtension : MarkupExtension
{ {
public RelativeSourceExtension() public RelativeSourceExtension()
@ -24,10 +23,19 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
return new RelativeSource return new RelativeSource
{ {
Mode = Mode, Mode = Mode,
AncestorType = AncestorType,
AncestorLevel = AncestorLevel,
Tree = Tree,
}; };
} }
[ConstructorArgument("mode")] [ConstructorArgument("mode")]
public RelativeSourceMode Mode { get; set; } public RelativeSourceMode Mode { get; set; } = RelativeSourceMode.FindAncestor;
public Type AncestorType { get; set; }
public TreeType Tree { get; set; }
public int AncestorLevel { get; set; } = 1;
} }
} }

8
src/Shared/PlatformSupport/StandardRuntimePlatform.cs

@ -89,9 +89,11 @@ namespace Avalonia.Shared.PlatformSupport
#if DEBUG #if DEBUG
if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId) if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
{ {
Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: " lock(_lock)
+ Environment.StackTrace if (!IsDisposed)
+ "\n\nBlob created by " + _backtrace); Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
+ Environment.StackTrace
+ "\n\nBlob created by " + _backtrace);
} }
#endif #endif
DoDispose(); DoDispose();

7
src/Windows/Avalonia.Win32/FramebufferManager.cs

@ -5,7 +5,7 @@ using Avalonia.Win32.Interop;
namespace Avalonia.Win32 namespace Avalonia.Win32
{ {
class FramebufferManager : IFramebufferPlatformSurface, IDisposable class FramebufferManager : IFramebufferPlatformSurface
{ {
private readonly IntPtr _hwnd; private readonly IntPtr _hwnd;
private WindowFramebuffer _fb; private WindowFramebuffer _fb;
@ -29,10 +29,5 @@ namespace Avalonia.Win32
} }
return _fb; return _fb;
} }
public void Dispose()
{
_fb?.Deallocate();
}
} }
} }

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

@ -13,6 +13,7 @@ using Avalonia.Input.Raw;
using Avalonia.OpenGL; using Avalonia.OpenGL;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Rendering; using Avalonia.Rendering;
using Avalonia.Threading;
using Avalonia.Win32.Input; using Avalonia.Win32.Input;
using Avalonia.Win32.Interop; using Avalonia.Win32.Interop;
using static Avalonia.Win32.Interop.UnmanagedMethods; using static Avalonia.Win32.Interop.UnmanagedMethods;
@ -234,8 +235,6 @@ namespace Avalonia.Win32
public void Dispose() public void Dispose()
{ {
_framebuffer?.Dispose();
_framebuffer = null;
if (_hwnd != IntPtr.Zero) if (_hwnd != IntPtr.Zero)
{ {
UnmanagedMethods.DestroyWindow(_hwnd); UnmanagedMethods.DestroyWindow(_hwnd);

145
tests/Avalonia.Controls.UnitTests/TabControlTests.cs

@ -22,7 +22,7 @@ namespace Avalonia.Controls.UnitTests
TabItem selected; TabItem selected;
var target = new TabControl var target = new TabControl
{ {
Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate), Template = TabControlTemplate(),
Items = new[] Items = new[]
{ {
(selected = new TabItem (selected = new TabItem
@ -61,7 +61,7 @@ namespace Avalonia.Controls.UnitTests
var target = new TabControl var target = new TabControl
{ {
Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate), Template = TabControlTemplate(),
Items = items, Items = items,
}; };
@ -94,7 +94,7 @@ namespace Avalonia.Controls.UnitTests
var target = new TabControl var target = new TabControl
{ {
Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate), Template = TabControlTemplate(),
Items = collection, Items = collection,
}; };
@ -147,7 +147,7 @@ namespace Avalonia.Controls.UnitTests
}, },
Child = new TabControl Child = new TabControl
{ {
Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate), Template = TabControlTemplate(),
Items = collection, Items = collection,
} }
}; };
@ -172,7 +172,7 @@ namespace Avalonia.Controls.UnitTests
var target = new TabControl var target = new TabControl
{ {
Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate), Template = TabControlTemplate(),
DataContext = "Base", DataContext = "Base",
DataTemplates = DataTemplates =
{ {
@ -182,41 +182,39 @@ namespace Avalonia.Controls.UnitTests
}; };
ApplyTemplate(target); ApplyTemplate(target);
var carousel = (Carousel)target.Pages;
var container = (ContentPresenter)carousel.Presenter.Panel.Children.Single(); target.ContentPart.UpdateChild();
container.UpdateChild(); var dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
var dataContext = ((TextBlock)container.Child).DataContext;
Assert.Equal(items[0], dataContext); Assert.Equal(items[0], dataContext);
target.SelectedIndex = 1; target.SelectedIndex = 1;
container = (ContentPresenter)carousel.Presenter.Panel.Children.Single(); target.ContentPart.UpdateChild();
container.UpdateChild(); dataContext = ((Button)target.ContentPart.Child).DataContext;
dataContext = ((Button)container.Child).DataContext;
Assert.Equal(items[1], dataContext); Assert.Equal(items[1], dataContext);
target.SelectedIndex = 2; target.SelectedIndex = 2;
dataContext = ((TextBlock)carousel.Presenter.Panel.Children.Single()).DataContext; target.ContentPart.UpdateChild();
dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
Assert.Equal("Base", dataContext); Assert.Equal("Base", dataContext);
target.SelectedIndex = 3; target.SelectedIndex = 3;
container = (ContentPresenter)carousel.Presenter.Panel.Children[0]; target.ContentPart.UpdateChild();
container.UpdateChild(); dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
dataContext = ((TextBlock)container.Child).DataContext;
Assert.Equal("Qux", dataContext); Assert.Equal("Qux", dataContext);
target.SelectedIndex = 4; target.SelectedIndex = 4;
dataContext = ((TextBlock)carousel.Presenter.Panel.Children.Single()).DataContext; target.ContentPart.UpdateChild();
dataContext = target.ContentPart.DataContext;
Assert.Equal("Base", dataContext); Assert.Equal("Base", dataContext);
} }
/// <summary> /// <summary>
/// Non-headered control items should result in TabStripItems with empty content. /// Non-headered control items should result in TabItems with empty header.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// If a TabStrip is created with non IHeadered controls as its items, don't try to /// If a TabControl is created with non IHeadered controls as its items, don't try to
/// display the control in the TabStripItem: if the TabStrip is part of a TabControl /// display the control in the header: if the control is part of the header then
/// then *that* will also try to display the control, resulting in dual-parentage /// *that* control would also end up in the content region, resulting in dual-parentage
/// breakage. /// breakage.
/// </remarks> /// </remarks>
[Fact] [Fact]
@ -230,18 +228,20 @@ namespace Avalonia.Controls.UnitTests
var target = new TabControl var target = new TabControl
{ {
Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate), Template = TabControlTemplate(),
Items = items, Items = items,
}; };
ApplyTemplate(target); ApplyTemplate(target);
var result = target.TabStrip.GetLogicalChildren() var logicalChildren = target.ItemsPresenterPart.Panel.GetLogicalChildren();
.OfType<TabStripItem>()
.Select(x => x.Content) var result = logicalChildren
.OfType<TabItem>()
.Select(x => x.Header)
.ToList(); .ToList();
Assert.Equal(new object[] { string.Empty, string.Empty }, result); Assert.Equal(new object[] { null, null }, result);
} }
[Fact] [Fact]
@ -249,7 +249,7 @@ namespace Avalonia.Controls.UnitTests
{ {
TabControl target = new TabControl TabControl target = new TabControl
{ {
Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate), Template = TabControlTemplate(),
Items = new[] Items = new[]
{ {
new TabItem { Header = "Foo" }, new TabItem { Header = "Foo" },
@ -262,70 +262,61 @@ namespace Avalonia.Controls.UnitTests
target.SelectedIndex = 2; target.SelectedIndex = 2;
var carousel = (Carousel)target.Pages; var page = (TabItem)target.SelectedItem;
var page = (TabItem)carousel.SelectedItem;
Assert.Null(page.Content); Assert.Null(page.Content);
} }
private Control CreateTabControlTemplate(TabControl parent) private IControlTemplate TabControlTemplate()
{ {
return new StackPanel return new FuncControlTemplate<TabControl>(parent =>
{
Children =
{
new TabStrip
{
Name = "PART_TabStrip",
Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
MemberSelector = TabControl.HeaderSelector,
[!TabStrip.ItemsProperty] = parent[!TabControl.ItemsProperty],
[!!TabStrip.SelectedIndexProperty] = parent[!!TabControl.SelectedIndexProperty]
},
new Carousel
{
Name = "PART_Content",
Template = new FuncControlTemplate<Carousel>(CreateCarouselTemplate),
MemberSelector = TabControl.ContentSelector,
[!Carousel.ItemsProperty] = parent[!TabControl.ItemsProperty],
[!Carousel.SelectedItemProperty] = parent[!TabControl.SelectedItemProperty],
}
}
};
}
private Control CreateTabStripTemplate(TabStrip parent) new StackPanel
{ {
return new ItemsPresenter Children = {
{ new ItemsPresenter
Name = "PART_ItemsPresenter", {
[~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty], Name = "PART_ItemsPresenter",
[!CarouselPresenter.MemberSelectorProperty] = parent[!ItemsControl.MemberSelectorProperty], [!TabStrip.ItemsProperty] = parent[!TabControl.ItemsProperty],
}; [!TabStrip.ItemTemplateProperty] = parent[!TabControl.ItemTemplateProperty],
},
new ContentPresenter
{
Name = "PART_Content",
[!ContentPresenter.ContentProperty] = parent[!TabControl.SelectedContentProperty],
[!ContentPresenter.ContentTemplateProperty] = parent[!TabControl.SelectedContentTemplateProperty],
}
}
});
} }
private Control CreateCarouselTemplate(Carousel control) private IControlTemplate TabItemTemplate()
{ {
return new CarouselPresenter return new FuncControlTemplate<TabItem>(parent =>
{ new ContentPresenter
Name = "PART_ItemsPresenter", {
[!CarouselPresenter.ItemsProperty] = control[!ItemsControl.ItemsProperty], Name = "PART_ContentPresenter",
[!CarouselPresenter.ItemsPanelProperty] = control[!ItemsControl.ItemsPanelProperty], [!ContentPresenter.ContentProperty] = parent[!TabItem.HeaderProperty],
[!CarouselPresenter.MemberSelectorProperty] = control[!ItemsControl.MemberSelectorProperty], [!ContentPresenter.ContentTemplateProperty] = parent[!TabItem.HeaderTemplateProperty]
[!CarouselPresenter.SelectedIndexProperty] = control[!SelectingItemsControl.SelectedIndexProperty], });
[~CarouselPresenter.PageTransitionProperty] = control[~Carousel.PageTransitionProperty],
};
} }
private void ApplyTemplate(TabControl target) private void ApplyTemplate(TabControl target)
{ {
target.ApplyTemplate(); target.ApplyTemplate();
var carousel = (Carousel)target.Pages;
carousel.ApplyTemplate(); target.Presenter.ApplyTemplate();
carousel.Presenter.ApplyTemplate();
var tabStrip = (TabStrip)target.TabStrip; foreach (var tabItem in target.GetLogicalChildren().OfType<TabItem>())
tabStrip.ApplyTemplate(); {
tabStrip.Presenter.ApplyTemplate(); tabItem.Template = TabItemTemplate();
tabItem.ApplyTemplate();
((ContentPresenter)tabItem.Presenter).UpdateChild();
}
target.ContentPart.ApplyTemplate();
} }
private class Item private class Item

2
tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs

@ -99,6 +99,8 @@ namespace Avalonia.Layout.UnitTests
} }
}; };
window.Resources["ScrollBarThickness"] = 10.0;
window.Show(); window.Show();
window.LayoutManager.ExecuteInitialLayoutPass(window); window.LayoutManager.ExecuteInitialLayoutPass(window);

100
tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs

@ -1,9 +1,13 @@
// Copyright (c) The Avalonia Project. All rights reserved. // 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. // 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.Reactive.Subjects;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Data; using Avalonia.Data;
using Avalonia.Markup.Data; using Avalonia.Data.Core;
using Avalonia.Markup.Parsers;
using Avalonia.UnitTests; using Avalonia.UnitTests;
using Xunit; using Xunit;
@ -162,5 +166,99 @@ namespace Avalonia.Markup.UnitTests.Data
decorator2.Child = target; decorator2.Child = target;
Assert.Equal("decorator2", target.Text); Assert.Equal("decorator2", target.Text);
} }
[Fact]
public void Should_Update_When_Detached_And_Attached_To_Visual_Tree_With_BindingPath()
{
TextBlock target;
Decorator decorator1;
Decorator decorator2;
var viewModel = new { Value = "Foo" };
var root1 = new TestRoot
{
Child = decorator1 = new Decorator
{
Name = "decorator1",
Child = target = new TextBlock(),
},
DataContext = viewModel
};
var root2 = new TestRoot
{
Child = decorator2 = new Decorator
{
Name = "decorator2",
},
DataContext = viewModel
};
var binding = new Binding
{
Path = "DataContext.Value",
RelativeSource = new RelativeSource
{
AncestorType = typeof(Decorator),
}
};
target.Bind(TextBox.TextProperty, binding);
Assert.Equal("Foo", target.Text);
decorator1.Child = null;
Assert.Null(target.Text);
decorator2.Child = target;
Assert.Equal("Foo", target.Text);
}
[Fact]
public void Should_Update_When_Detached_And_Attached_To_Visual_Tree_With_ComplexBindingPath()
{
TextBlock target;
Decorator decorator1;
Decorator decorator2;
var vm = new { Foo = new { Value = "Foo" } };
var root1 = new TestRoot
{
Child = decorator1 = new Decorator
{
Name = "decorator1",
Child = target = new TextBlock(),
},
DataContext = vm
};
var root2 = new TestRoot
{
Child = decorator2 = new Decorator
{
Name = "decorator2",
},
DataContext = vm
};
var binding = new Binding
{
Path = "DataContext.Foo.Value",
RelativeSource = new RelativeSource
{
AncestorType = typeof(Decorator),
}
};
target.Bind(TextBox.TextProperty, binding);
Assert.Equal("Foo", target.Text);
decorator1.Child = null;
Assert.Null(target.Text);
decorator2.Child = target;
Assert.Equal("Foo", target.Text);
}
} }
} }

58
tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Property.cs

@ -1,10 +1,10 @@
using Avalonia.Data; using System;
using Avalonia.Markup.Parsers;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Text; using System.Reactive.Subjects;
using System.Threading.Tasks; using System.Threading.Tasks;
using Avalonia.Data;
using Avalonia.Markup.Parsers;
using Xunit; using Xunit;
namespace Avalonia.Markup.UnitTests.Parsers namespace Avalonia.Markup.UnitTests.Parsers
@ -38,5 +38,55 @@ namespace Avalonia.Markup.UnitTests.Parsers
GC.KeepAlive(data); GC.KeepAlive(data);
} }
[Fact]
public void Should_Update_Value_After_Root_Changes()
{
var root = new { DataContext = new { Value = "Foo" } };
var subject = new Subject<object>();
var obs = ExpressionObserverBuilder.Build(subject, "DataContext.Value");
var values = new List<object>();
obs.Subscribe(v => values.Add(v));
subject.OnNext(root);
subject.OnNext(null);
subject.OnNext(root);
Assert.Equal("Foo", values[0]);
Assert.IsType<BindingNotification>(values[1]);
var bn = values[1] as BindingNotification;
Assert.Equal(AvaloniaProperty.UnsetValue, bn.Value);
Assert.Equal(BindingErrorType.Error, bn.ErrorType);
Assert.Equal(3, values.Count);
Assert.Equal("Foo", values[2]);
}
[Fact]
public void Should_Update_Value_After_Root_Changes_With_ComplexPath()
{
var root = new { DataContext = new { Foo = new { Value = "Foo" } } };
var subject = new Subject<object>();
var obs = ExpressionObserverBuilder.Build(subject, "DataContext.Foo.Value");
var values = new List<object>();
obs.Subscribe(v => values.Add(v));
subject.OnNext(root);
subject.OnNext(null);
subject.OnNext(root);
Assert.Equal("Foo", values[0]);
Assert.IsType<BindingNotification>(values[1]);
var bn = values[1] as BindingNotification;
Assert.Equal(AvaloniaProperty.UnsetValue, bn.Value);
Assert.Equal(BindingErrorType.Error, bn.ErrorType);
Assert.Equal(3, values.Count);
Assert.Equal("Foo", values[2]);
}
} }
} }

4
tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs

@ -405,7 +405,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering
root.Renderer = new DeferredRenderer(root, null); root.Renderer = new DeferredRenderer(root, null);
root.Measure(Size.Infinity); root.Measure(Size.Infinity);
root.Arrange(new Rect(container.DesiredSize)); root.Arrange(new Rect(container.DesiredSize));
root.Renderer.Paint(Rect.Empty);
var result = root.Renderer.HitTest(new Point(50, 150), root, null).First(); var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
Assert.Equal(item1, result); Assert.Equal(item1, result);
@ -421,6 +422,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
container.InvalidateArrange(); container.InvalidateArrange();
container.Arrange(new Rect(container.DesiredSize)); container.Arrange(new Rect(container.DesiredSize));
root.Renderer.Paint(Rect.Empty);
result = root.Renderer.HitTest(new Point(50, 150), root, null).First(); result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
Assert.Equal(item2, result); Assert.Equal(item2, result);

Loading…
Cancel
Save