From 57bb2e6267705b83fad3a1c3371d255c4f688f64 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 22 Jun 2020 02:52:11 -0400 Subject: [PATCH 1/7] Add Pressed mixin to TreeViewItem --- src/Avalonia.Controls/TreeViewItem.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs index cd586f7701..4942d4d313 100644 --- a/src/Avalonia.Controls/TreeViewItem.cs +++ b/src/Avalonia.Controls/TreeViewItem.cs @@ -49,6 +49,7 @@ namespace Avalonia.Controls static TreeViewItem() { SelectableMixin.Attach(IsSelectedProperty); + PressedMixin.Attach(); FocusableProperty.OverrideDefaultValue(true); ItemsPanelProperty.OverrideDefaultValue(DefaultPanel); ParentProperty.Changed.AddClassHandler((o, e) => o.OnParentChanged(e)); From 97a89be06b82edf4a5fed29a05f370e4a6321817 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 22 Jun 2020 02:53:41 -0400 Subject: [PATCH 2/7] Add missed Reveal resources --- src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml | 7 ++++++- src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml index 0bea6c5781..68b33d104a 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml @@ -140,7 +140,12 @@ - + + + + + + diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml index ef296faa60..d8a641e8ac 100644 --- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml @@ -140,7 +140,12 @@ - + + + + + + From 83518a24f20aa0bd9eebb1c40b63f8c2000e2959 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 22 Jun 2020 02:53:50 -0400 Subject: [PATCH 3/7] Add TreeViewItem resources --- .../Accents/FluentControlResourcesDark.xaml | 31 +++++++++++++++++++ .../Accents/FluentControlResourcesLight.xaml | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml index b9502daaea..70c1406ca1 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml @@ -726,5 +726,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 32 diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml index d16e6b6b55..08099fb1b0 100644 --- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml +++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml @@ -724,5 +724,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 32 From 580c03f5118b2479424b9fcda016995353ffb243 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 22 Jun 2020 02:54:25 -0400 Subject: [PATCH 4/7] Fluent TreeView and TreeViewItem --- src/Avalonia.Themes.Fluent/TreeView.xaml | 17 +- src/Avalonia.Themes.Fluent/TreeViewItem.xaml | 246 +++++++++++++------ 2 files changed, 176 insertions(+), 87 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/TreeView.xaml b/src/Avalonia.Themes.Fluent/TreeView.xaml index 6ed2fd17b8..292317eb34 100644 --- a/src/Avalonia.Themes.Fluent/TreeView.xaml +++ b/src/Avalonia.Themes.Fluent/TreeView.xaml @@ -1,10 +1,11 @@ - - + + + + + + + + + + + + + + + - + + 16 + 12 + 12, 0, 12, 0 + M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z + M0,1 L10,10 20,1 19,0 10,8 1,0 Z + + - + - + - + + + - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + - From 7145068863af654303551758a3c349e294b83948 Mon Sep 17 00:00:00 2001 From: Dariusz Komosinski Date: Mon, 22 Jun 2020 14:43:43 +0200 Subject: [PATCH 5/7] Fix copy pasta error. --- src/Avalonia.Controls/Primitives/HeaderedContentControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs index 7a43d38d8a..d92f56ba5a 100644 --- a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs +++ b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs @@ -27,7 +27,7 @@ namespace Avalonia.Controls.Primitives /// static HeaderedContentControl() { - ContentProperty.Changed.AddClassHandler((x, e) => x.HeaderChanged(e)); + HeaderProperty.Changed.AddClassHandler((x, e) => x.HeaderChanged(e)); } /// From 7123747a4b4e78df408f9a4d8d2726bab304a92d Mon Sep 17 00:00:00 2001 From: Dariusz Komosinski Date: Mon, 22 Jun 2020 14:44:09 +0200 Subject: [PATCH 6/7] Enable nullable, and use expression bodied properties. --- .../Primitives/HeaderedContentControl.cs | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs index d92f56ba5a..e55bdbb0eb 100644 --- a/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs +++ b/src/Avalonia.Controls/Primitives/HeaderedContentControl.cs @@ -1,8 +1,9 @@ -using Avalonia.Controls.Mixins; using Avalonia.Controls.Presenters; using Avalonia.Controls.Templates; using Avalonia.LogicalTree; +#nullable enable + namespace Avalonia.Controls.Primitives { /// @@ -13,14 +14,14 @@ namespace Avalonia.Controls.Primitives /// /// Defines the property. /// - public static readonly StyledProperty HeaderProperty = - AvaloniaProperty.Register(nameof(Header)); + public static readonly StyledProperty HeaderProperty = + AvaloniaProperty.Register(nameof(Header)); /// /// Defines the property. /// - public static readonly StyledProperty HeaderTemplateProperty = - AvaloniaProperty.Register(nameof(HeaderTemplate)); + public static readonly StyledProperty HeaderTemplateProperty = + AvaloniaProperty.Register(nameof(HeaderTemplate)); /// /// Initializes static members of the class. @@ -33,16 +34,16 @@ namespace Avalonia.Controls.Primitives /// /// Gets or sets the header content. /// - public object Header + public object? Header { - get { return GetValue(HeaderProperty); } - set { SetValue(HeaderProperty, value); } + get => GetValue(HeaderProperty); + set => SetValue(HeaderProperty, value); } /// /// Gets the header presenter from the control's template. /// - public IContentPresenter HeaderPresenter + public IContentPresenter? HeaderPresenter { get; private set; @@ -51,10 +52,10 @@ namespace Avalonia.Controls.Primitives /// /// Gets or sets the data template used to display the header content of the control. /// - public IDataTemplate HeaderTemplate + public IDataTemplate? HeaderTemplate { - get { return GetValue(HeaderTemplateProperty); } - set { SetValue(HeaderTemplateProperty, value); } + get => GetValue(HeaderTemplateProperty); + set => SetValue(HeaderTemplateProperty, value); } /// From 864478a38e464f143e0a1dc39caa42885cdc887f Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 22 Jun 2020 10:26:55 -0300 Subject: [PATCH 7/7] workaround implicit conversion x:Double to GridLength --- src/Avalonia.Themes.Default/ToggleSwitch.xaml | 4 ++-- src/Avalonia.Themes.Fluent/ToggleSwitch.xaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Themes.Default/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/ToggleSwitch.xaml index ed172b52ab..88266ac979 100644 --- a/src/Avalonia.Themes.Default/ToggleSwitch.xaml +++ b/src/Avalonia.Themes.Default/ToggleSwitch.xaml @@ -3,8 +3,8 @@ xmlns:sys="clr-namespace:System;assembly=netstandard"> 0,0,0,6 - 6 - 6 + 6 + 6 154 20 0 diff --git a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml index ed172b52ab..88266ac979 100644 --- a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml +++ b/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml @@ -3,8 +3,8 @@ xmlns:sys="clr-namespace:System;assembly=netstandard"> 0,0,0,6 - 6 - 6 + 6 + 6 154 20 0