Support color coded names in party view (#135)

* Simplify colored text binding using extension Support color coded names in party view * Remove commented out code
Bowhza · Oct 19, 2024 · 38c2666 · 38c2666
1 parent fe65296
commit 38c2666
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 40 deletions.
diff --git a/H2MLauncher.UI/Converters/HostNameColorConverter.cs b/H2MLauncher.UI/Converters/HostNameColorConverter.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
+using System.Windows;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Media;
@@ -18,6 +19,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             return Array.Empty<Run>();
         }
 
+        Style? runStyle = parameter as Style;
+
         List<Run> runs = [];
         MatchCollection matches = ColorRegex().Matches(hostname);
         if (matches.Count != 0)
@@ -28,8 +31,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 {
                     Text = hostname[..matches[0].Index],
                     Foreground = Brushes.White,
-                    FlowDirection = System.Windows.FlowDirection.LeftToRight,
-                    FontFamily = Font,
+                    Style = runStyle
                 });
             }
             foreach (Match match in matches)
@@ -52,8 +54,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 {
                     Text = match.Groups[2].Value,
                     Foreground = brush,
-                    FlowDirection = System.Windows.FlowDirection.LeftToRight,
-                    FontFamily = Font,
+                    Style = runStyle
                 });
             }
         }
@@ -63,8 +64,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             {
                 Text = hostname,
                 Foreground = Brushes.White,
-                FlowDirection = System.Windows.FlowDirection.LeftToRight,
-                FontFamily = Font
+                Style = runStyle
             });
         }
         return runs.ToArray();

diff --git a/H2MLauncher.UI/Dialog/Views/QueueDialogView.xaml b/H2MLauncher.UI/Dialog/Views/QueueDialogView.xaml
@@ -4,6 +4,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:H2MLauncher.UI"
              xmlns:converters="clr-namespace:H2MLauncher.UI.Converters"
              xmlns:vm="clr-namespace:H2MLauncher.UI.ViewModels"
              xmlns:model="clr-namespace:H2MLauncher.Core.Matchmaking.Models;assembly=H2MLauncher.Core"
@@ -77,26 +78,19 @@
                 HorizontalAlignment="Center" ClipToBounds="True" Height="25"
                 Visibility="{Binding CanEnterMatchmaking, Converter={StaticResource InverseBoolToVisibilityConverter}}">
             <TextBlock x:Name="serverName" SizeChanged="ServerNameTextBox_SizeChanged" Canvas.Left="0" 
-                       TextWrapping="NoWrap" HorizontalAlignment="Center">
-                <TextBlock.Inlines>
-                    <ItemsControl>
-                        <ItemsControl.Style>
-                            <Style TargetType="ItemsControl">
-                                <Setter Property="ItemsSource" Value="{Binding ServerHostName, Converter={StaticResource HostNameColorConverter}}"/>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding State}" Value="{x:Static model:PlayerState.Matchmaking}">
-                                        <Setter Property="ItemsSource" Value="{Binding PlaylistName, Converter={StaticResource HostNameColorConverter}}"/>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </ItemsControl.Style>
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                    </ItemsControl>
-                </TextBlock.Inlines>
+                       TextWrapping="NoWrap" HorizontalAlignment="Center" FontFamily="Consolas">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="local:TextBlockExtensions.BindableInlines" 
+                                Value="{Binding ServerHostName, Converter={StaticResource HostNameColorConverter}}"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding State}" Value="{x:Static model:PlayerState.Matchmaking}">
+                                <Setter Property="local:TextBlockExtensions.BindableInlines" 
+                                        Value="{Binding PlaylistName, Converter={StaticResource HostNameColorConverter}}"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
                 <TextBlock.RenderTransform>
                     <TranslateTransform X="0"/>
                 </TextBlock.RenderTransform>

diff --git a/H2MLauncher.UI/MainWindow.xaml b/H2MLauncher.UI/MainWindow.xaml
@@ -362,18 +362,12 @@
                                                                     </Style>
                                                                 </Image.Style>
                                                             </Image>
-                                                            <ItemsControl
-                                                                Focusable="False"
-                                                                IsTabStop="False" 
-                                                                IsHitTestVisible="False" 
-                                                                ItemsSource="{Binding HostName, Converter={StaticResource HostNameColorConverter}}" 
-                                                                FlowDirection="LeftToRight">
-                                                                <ItemsControl.ItemsPanel>
-                                                                    <ItemsPanelTemplate>
-                                                                        <StackPanel Orientation="Horizontal"/>
-                                                                    </ItemsPanelTemplate>
-                                                                </ItemsControl.ItemsPanel>
-                                                            </ItemsControl>
+                                                            <TextBlock local:TextBlockExtensions.BindableInlines="{
+                                                                            Binding HostName, 
+                                                                            Converter={StaticResource HostNameColorConverter}
+                                                                       }"
+                                                                       IsHitTestVisible="False"
+                                                                       Focusable="False"/>
                                                         </StackPanel>
                                                     </DataTemplate>
                                                 </DataGridTemplateColumn.CellTemplate>

diff --git a/H2MLauncher.UI/View/Behaviors/TextBlockExtensions.cs b/H2MLauncher.UI/View/Behaviors/TextBlockExtensions.cs
@@ -0,0 +1,38 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+using H2MLauncher.UI.Converters;
+
+namespace H2MLauncher.UI
+{
+    public static class TextBlockExtensions
+    {
+        public static IEnumerable<Inline> GetBindableInlines(DependencyObject obj)
+        {
+            return (IEnumerable<Inline>)obj.GetValue(BindableInlinesProperty);
+        }
+
+        public static void SetBindableInlines(DependencyObject obj, IEnumerable<Inline> value)
+        {
+            obj.SetValue(BindableInlinesProperty, value);
+        }
+
+        public static readonly DependencyProperty BindableInlinesProperty =
+            DependencyProperty.RegisterAttached("BindableInlines", typeof(IEnumerable<Inline>), typeof(TextBlockExtensions), new PropertyMetadata(null, OnBindableInlinesChanged));
+
+        private static void OnBindableInlinesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is not TextBlock target)
+            {
+                return;
+            }
+
+            if (target != null)
+            {
+                target.Inlines.Clear();
+                target.Inlines.AddRange(((System.Collections.IEnumerable)e.NewValue));
+            }
+        }
+    }
+}
diff --git a/H2MLauncher.UI/View/Controls/PartyControl.xaml b/H2MLauncher.UI/View/Controls/PartyControl.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:ui="clr-namespace:H2MLauncher.UI"
              xmlns:local="clr-namespace:H2MLauncher.UI.View.Controls"
              xmlns:vm="clr-namespace:H2MLauncher.UI.ViewModels"
              MinWidth="150"
@@ -31,8 +32,9 @@
                                         <ColumnDefinition Width="*"/>
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding Name}" Foreground="White" FontSize="15" 
-                                        VerticalAlignment="Center" Margin="0,0,0,0">
+                                    <TextBlock ui:TextBlockExtensions.BindableInlines="{Binding Name, Converter={StaticResource HostNameColorConverter}}" 
+                                               Foreground="White" FontSize="15" 
+                                               VerticalAlignment="Center" Margin="0,0,0,0">
                                         <TextBlock.Style>
                                             <Style TargetType="TextBlock">
                                                 <Style.Triggers>