Merge pull request #35 from Freeesia/feature/emoji

絵文字のサポート
Freeesia · Apr 2, 2024 · f92924f · f92924f
2 parents e1be97c + dc38333
commit f92924f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/VdLabel/MainWindow.xaml b/VdLabel/MainWindow.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cp="clr-namespace:ColorPicker;assembly=ColorPicker"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
     xmlns:local="clr-namespace:VdLabel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:tray="http://schemas.lepo.co/wpfui/2022/xaml/tray"
@@ -180,7 +181,7 @@
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
                             <Image Height="16" Source="{Binding ImagePath}" />
-                            <TextBlock
+                            <emoji:TextBlock
                                 Width="160"
                                 Margin="4,0"
                                 Text="{Binding Title}"

diff --git a/VdLabel/OverlayWindow.xaml b/VdLabel/OverlayWindow.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
     xmlns:local="clr-namespace:VdLabel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
@@ -63,7 +64,7 @@
         </Border>
         <Border Padding="48">
             <DockPanel>
-                <TextBlock
+                <emoji:TextBlock
                     DockPanel.Dock="{Binding Position, Mode=OneWay}"
                     FontSize="{Binding FontSize}"
                     Foreground="{Binding Foreground, Converter={x:Static local:SystemColorToSolidBrushConverter.Default}}"

diff --git a/VdLabel/VdLabel.csproj b/VdLabel/VdLabel.csproj
@@ -22,6 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Emoji.Wpf" Version="0.3.4" />
     <PackageReference Include="Kamishibai.Hosting" Version="2.6.0" />
     <PackageReference Include="PInvoke.User32" Version="0.7.124" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">