Add ConsoloniaAccessText underline

src/Consolonia.Core/Controls/ConsoloniaAccessText.cs

@@ -0,0 +1,63 @@
+using System;
+using Avalonia.Media;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Documents;
+
+namespace Consolonia.Core.Controls
+{
+
+    /// <summary>
+    /// A text block that displays a character prefixed with an underscore as an access key.
+    /// </summary>
+    public sealed class ConsoloniaAccessText : AccessText
+    {
+        private Run _accessRun;
+
+        public ConsoloniaAccessText()
+        {
+            this.PropertyChanged += OnPropertyChanged;
+        }
+
+        private void OnPropertyChanged(object sender, Avalonia.AvaloniaPropertyChangedEventArgs e)
+        {
+            switch (e.Property.Name)
+            {
+                case nameof(Text):
+                    {
+                        if (!String.IsNullOrEmpty(Text))
+                        {
+                            _accessRun = null;
+                            InlineCollection inlines = new InlineCollection();
+                            var iPos = Text.IndexOf('_', StringComparison.Ordinal);
+                            if (iPos >= 0 && iPos < Text.Length - 1)  
+                            {
+                                inlines.Add(new Run(Text.Substring(0, iPos)));
+                                _accessRun = new Run(Text.Substring(++iPos, 1))
+                                {
+                                    TextDecorations = new TextDecorationCollection()
+                                };
+                                inlines.Add(_accessRun);
+                                inlines.Add(new Run(Text.Substring(iPos + 1)));
+                            }
+                            else
+                            {
+                                inlines.Add(new Run(Text));
+                            }
+                            this.Inlines = inlines;
+                        }
+                    }
+                    break;
+
+                case nameof(ShowAccessKey):
+                    if (_accessRun != null)
+                    {
+                        if (this.ShowAccessKey)
+                            _accessRun.TextDecorations.Add(new TextDecoration { Location = TextDecorationLocation.Underline });
+                        else
+                            _accessRun.TextDecorations.Clear();
+                    }
+                    break;
+            }
+        }
+    }
+}

src/Consolonia.Themes/Templates/Controls/Menu.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:core="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
                     xmlns:helpers="clr-namespace:Consolonia.Themes.Templates.Controls.Helpers;assembly=Consolonia.Themes"
                     xmlns:system="clr-namespace:System;assembly=System.Runtime">
 
@@ -24,7 +25,7 @@
                                 <ContentPresenter.DataTemplates>
                                     <DataTemplate DataType="system:String">
                                         <!-- ReSharper disable once Xaml.BindingWithContextNotResolved Just workaround - Its not binding, it's TemplateBinding-->
-                                        <AccessText Text="{Binding}"
+                                        <core:ConsoloniaAccessText Text="{Binding}"
                                                     Foreground="{TemplateBinding (TemplatedControl.Foreground)}" />
                                     </DataTemplate>
                                 </ContentPresenter.DataTemplates>

src/Consolonia.Themes/Templates/Controls/MenuItem.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    xmlns:core="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
                     xmlns:helpers="clr-namespace:Consolonia.Themes.Templates.Controls.Helpers;assembly=Consolonia.Themes"
                     xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
 
@@ -51,7 +52,7 @@
                                               Grid.Column="2">
                                 <ContentPresenter.DataTemplates>
                                     <DataTemplate DataType="sys:String">
-                                        <AccessText Text="{Binding}" />
+                                        <core:ConsoloniaAccessText Text="{Binding}" />
                                     </DataTemplate>
                                 </ContentPresenter.DataTemplates>
                             </ContentPresenter>