From 4e36be535bffaddf1db55974394c31fd64b91758 Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Wed, 26 Oct 2022 12:01:40 +0200
Subject: [PATCH] Remove name on emoji + remove empty Variations in Emojis.xml

---
 src/Greenshot.Editor/Controls/Emoji/EmojiData.cs     |  2 +-
 src/Greenshot.Editor/Controls/Emoji/EmojiPicker.xaml |  4 ++--
 src/Greenshot.Editor/Controls/Emoji/Emojis.cs        | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Greenshot.Editor/Controls/Emoji/EmojiData.cs b/src/Greenshot.Editor/Controls/Emoji/EmojiData.cs
index 0b80e1d94..a1772b871 100644
--- a/src/Greenshot.Editor/Controls/Emoji/EmojiData.cs
+++ b/src/Greenshot.Editor/Controls/Emoji/EmojiData.cs
@@ -177,7 +177,7 @@ namespace Greenshot.Editor.Controls.Emoji
 
                 qualifiedLut[unqualified] = text;
 
-                var emoji = new Emojis.Emoji { Name = name, Text = text};
+                var emoji = new Emojis.Emoji { Text = text};
 
                 lookupByName[ToColonSyntax(name)] = emoji;
 
diff --git a/src/Greenshot.Editor/Controls/Emoji/EmojiPicker.xaml b/src/Greenshot.Editor/Controls/Emoji/EmojiPicker.xaml
index 349515ce1..4410e0ee7 100644
--- a/src/Greenshot.Editor/Controls/Emoji/EmojiPicker.xaml
+++ b/src/Greenshot.Editor/Controls/Emoji/EmojiPicker.xaml
@@ -35,7 +35,7 @@
                     <DataTemplate>
                         <Button Background="Transparent" BorderBrush="Transparent"
                                 Margin="0" Click="OnEmojiPicked"
-                                Width="40" Height="40" ToolTip="{Binding Path=Name}">
+                                Width="40" Height="40">
                             <emoji:EmojiControl Height="24" Emoji="{Binding Path=Text}"  />
                         </Button>
                     </DataTemplate>
@@ -46,7 +46,7 @@
         <DataTemplate x:Key="CellTemplate">
             <ToggleButton Width="40" Height="40" Margin="0" Padding="2"
                           x:Name="VariationButton" Background="Transparent" BorderBrush="Transparent"
-                          Click="OnEmojiPicked" Focusable="False" ToolTip="{Binding Path=Name}">
+                          Click="OnEmojiPicked" Focusable="False" >
                 <Grid>
                     <emoji:EmojiControl Height="24" Margin="4" Emoji="{Binding Path=Text}" 
                            VerticalAlignment="Center" HorizontalAlignment="Center"/>
diff --git a/src/Greenshot.Editor/Controls/Emoji/Emojis.cs b/src/Greenshot.Editor/Controls/Emoji/Emojis.cs
index 95b8a2f8b..039dfaaf8 100644
--- a/src/Greenshot.Editor/Controls/Emoji/Emojis.cs
+++ b/src/Greenshot.Editor/Controls/Emoji/Emojis.cs
@@ -51,14 +51,18 @@ public class Emojis
 
     public class Emoji
     {
-        [XmlAttribute]
-        public string Name { get; set; }
-
         [XmlAttribute]
         public string Text { get; set; }
 
         [XmlArray]
         public List<Emoji> Variations { get; set; } = new();
+        
+        /// <summary>
+        /// Xml trick so that the Xml serializer does not output the 'Variations' element when the emoji has no variation
+        /// (see https://learn.microsoft.com/en-us/dotnet/api/system.xml.serialization.xmlserializer#controlling-generated-xml)
+        /// </summary>
+        [XmlIgnore]
+        public bool VariationsSpecified => HasVariations;
 
         public bool HasVariations => Variations.Count > 0;