From 9880f11b9910940dd84b8523e6a6b7bd33462b5d Mon Sep 17 00:00:00 2001 From: Piero Castillo Date: Fri, 21 May 2021 16:58:52 -0500 Subject: [PATCH 1/2] Update Aura.UI.Gallery.csproj --- samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj b/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj index 1e00dd7..15cd531 100644 --- a/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj +++ b/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj @@ -1,7 +1,7 @@  Exe - net5.0 + net5.0;net6.0 9.0 enable From fd41db8b7e7f4f59f93ca4d5c13920223bf1e729 Mon Sep 17 00:00:00 2001 From: Piero Castillo Date: Sun, 23 May 2021 15:44:46 -0500 Subject: [PATCH 2/2] all finished --- Tests/UI.Tests/UI.Tests.csproj | 10 ++++---- build/base.props | 14 +++++------ build/dragging.props | 10 ++++---- samples/Aura.UI.Gallery/App.axaml.cs | 4 +++ .../Aura.UI.Gallery/Aura.UI.Gallery.csproj | 14 +++++------ src/Aura.UI.Dragging/Aura.UI.Dragging.csproj | 7 ++++++ src/Aura.UI/Aura.UI.csproj | 9 ++++++- src/Aura.UI/Controls/Ribbon/Ribbon.cs | 25 +++++++++++++++++++ src/Aura.UI/Controls/Ribbon/RibbonGroup.cs | 10 ++++---- .../Controls/Ribbon/RibbonGroupStyles.xaml | 3 ++- src/Aura.UI/Controls/Ribbon/RibbonStyles.xaml | 1 + 11 files changed, 76 insertions(+), 31 deletions(-) diff --git a/Tests/UI.Tests/UI.Tests.csproj b/Tests/UI.Tests/UI.Tests.csproj index 04a4e43..67f5aed 100644 --- a/Tests/UI.Tests/UI.Tests.csproj +++ b/Tests/UI.Tests/UI.Tests.csproj @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/build/base.props b/build/base.props index d0c9e4a..27b70a0 100644 --- a/build/base.props +++ b/build/base.props @@ -4,13 +4,13 @@ Piero Castillo - - - - - - - + + + + + + + diff --git a/build/dragging.props b/build/dragging.props index f67db89..668f73d 100644 --- a/build/dragging.props +++ b/build/dragging.props @@ -1,9 +1,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/samples/Aura.UI.Gallery/App.axaml.cs b/samples/Aura.UI.Gallery/App.axaml.cs index 33c78bb..830f5b3 100644 --- a/samples/Aura.UI.Gallery/App.axaml.cs +++ b/samples/Aura.UI.Gallery/App.axaml.cs @@ -13,6 +13,7 @@ using System.Reactive; using System.Threading.Tasks; using Avalonia.Controls; +using System.Threading; namespace Aura.UI.Gallery { @@ -81,9 +82,12 @@ await Dispatcher.UIThread.InvokeAsync(() => break; } }, (DispatcherPriority)1); + Settings.Theme = theme; } + + public readonly static Styles FluentDark = new Styles { new StyleInclude(new Uri("avares://Aura.UI.Gallery/Styles")) diff --git a/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj b/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj index 15cd531..6a1ae30 100644 --- a/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj +++ b/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj @@ -1,7 +1,7 @@  Exe - net5.0;net6.0 + net5.0 9.0 enable @@ -48,13 +48,13 @@ - + - - - - - + + + + + diff --git a/src/Aura.UI.Dragging/Aura.UI.Dragging.csproj b/src/Aura.UI.Dragging/Aura.UI.Dragging.csproj index 17c3f6c..0cefbc8 100644 --- a/src/Aura.UI.Dragging/Aura.UI.Dragging.csproj +++ b/src/Aura.UI.Dragging/Aura.UI.Dragging.csproj @@ -9,4 +9,11 @@ + + + + + + + diff --git a/src/Aura.UI/Aura.UI.csproj b/src/Aura.UI/Aura.UI.csproj index a6c78f9..23d34f7 100644 --- a/src/Aura.UI/Aura.UI.csproj +++ b/src/Aura.UI/Aura.UI.csproj @@ -26,8 +26,15 @@ + + + + + + + - + diff --git a/src/Aura.UI/Controls/Ribbon/Ribbon.cs b/src/Aura.UI/Controls/Ribbon/Ribbon.cs index aa0b8b1..2a38102 100644 --- a/src/Aura.UI/Controls/Ribbon/Ribbon.cs +++ b/src/Aura.UI/Controls/Ribbon/Ribbon.cs @@ -133,6 +133,19 @@ public object LeftContent public static readonly StyledProperty LeftContentProperty = AvaloniaProperty.Register(nameof(LeftContent), "Left"); + + /// + /// Gets or Sets if the Left content is visible. + /// + public bool LeftContentVisible + { + get => GetValue(LeftContentVisibleProperty); + set => SetValue(LeftContentVisibleProperty, value); + } + + public static readonly StyledProperty LeftContentVisibleProperty = + AvaloniaProperty.Register(nameof(LeftContent)); + /// /// RightContent of the the Ribbon @@ -146,6 +159,18 @@ public object RightContent public static readonly StyledProperty RightContentProperty = AvaloniaProperty.Register(nameof(RightContent), "Right"); + /// + /// Gets or Sets if the Right content is visible. + /// + public bool RightContentVisible + { + get => GetValue(RightContentVisibleProperty); + set => SetValue(RightContentVisibleProperty, value); + } + + public static readonly StyledProperty RightContentVisibleProperty = + AvaloniaProperty.Register(nameof(RightContent)); + /// /// Header of the the Ribbon /// diff --git a/src/Aura.UI/Controls/Ribbon/RibbonGroup.cs b/src/Aura.UI/Controls/Ribbon/RibbonGroup.cs index f58a046..0df26b6 100644 --- a/src/Aura.UI/Controls/Ribbon/RibbonGroup.cs +++ b/src/Aura.UI/Controls/Ribbon/RibbonGroup.cs @@ -25,14 +25,14 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e) }; } - public object MiniButtonContent + public bool MiniButtonIsVisible { - get => GetValue(MiniButtonContentProperty); - set => SetValue(MiniButtonContentProperty, value); + get => GetValue(MiniButtonIsVisibleProperty); + set => SetValue(MiniButtonIsVisibleProperty, value); } - public static readonly StyledProperty MiniButtonContentProperty = - AvaloniaProperty.Register(nameof(MiniButtonContent), "L"); + public static readonly StyledProperty MiniButtonIsVisibleProperty = + AvaloniaProperty.Register(nameof(MiniButtonIsVisible), true); public event EventHandler MiniButtonClick { diff --git a/src/Aura.UI/Controls/Ribbon/RibbonGroupStyles.xaml b/src/Aura.UI/Controls/Ribbon/RibbonGroupStyles.xaml index d67192d..3c0fe3f 100644 --- a/src/Aura.UI/Controls/Ribbon/RibbonGroupStyles.xaml +++ b/src/Aura.UI/Controls/Ribbon/RibbonGroupStyles.xaml @@ -45,7 +45,8 @@