From 4652e068dd7a833390eae0f033c29092859f3d37 Mon Sep 17 00:00:00 2001
From: Sergey Khabibullin <sergey@khabibullin.com>
Date: Mon, 7 Jan 2019 13:57:50 +0300
Subject: [PATCH] Fix avatar control

---
 .../Messenger/Catalog/CatalogControl.xaml         |  9 +++++++--
 .../Messenger/Catalog/EntryControl.xaml           |  3 ++-
 .../Shared/AvatarControl.xaml.cs                  | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Tel.Egram.Gui.Views/Messenger/Catalog/CatalogControl.xaml b/src/Tel.Egram.Gui.Views/Messenger/Catalog/CatalogControl.xaml
index 47e50ff..3436c74 100644
--- a/src/Tel.Egram.Gui.Views/Messenger/Catalog/CatalogControl.xaml
+++ b/src/Tel.Egram.Gui.Views/Messenger/Catalog/CatalogControl.xaml
@@ -108,14 +108,19 @@
         
         <Style Selector="ListBoxItem Grid > Border">
             <Setter Property="CornerRadius" Value="14,0,0,14" />
+            <Setter Property="Padding" Value="3,0,8,0" />
         </Style>
         
         <Style Selector="ListBoxItem:selected Grid > Border">
             <Setter Property="Background" Value="#435270" />
         </Style>
         
-        <Style Selector="ListBoxItem Panel">
-            <Setter Property="Margin" Value="4,3,8,3"/>
+        <Style Selector="ListBoxItem Panel.Title">
+            <Setter Property="Margin" Value="6,3,2,3"/>
+        </Style>
+        
+        <Style Selector="ListBoxItem Panel.Indicator">
+            <Setter Property="Margin" Value="2,3,8,3"/>
         </Style>
         
         <Style Selector="ListBoxItem TextBlock">
diff --git a/src/Tel.Egram.Gui.Views/Messenger/Catalog/EntryControl.xaml b/src/Tel.Egram.Gui.Views/Messenger/Catalog/EntryControl.xaml
index 95d59c0..3366ec0 100644
--- a/src/Tel.Egram.Gui.Views/Messenger/Catalog/EntryControl.xaml
+++ b/src/Tel.Egram.Gui.Views/Messenger/Catalog/EntryControl.xaml
@@ -16,7 +16,8 @@
             Color="{Binding Color}"
             TextColor="{Binding TextColor}"
             Text="{Binding Label}"
-            Size="22" />
+            Size="22"
+            Margin="3,0,0,0"/>
 
         <Panel
             Classes="Title"
diff --git a/src/Tel.Egram.Gui.Views/Shared/AvatarControl.xaml.cs b/src/Tel.Egram.Gui.Views/Shared/AvatarControl.xaml.cs
index 285e0ac..251d375 100644
--- a/src/Tel.Egram.Gui.Views/Shared/AvatarControl.xaml.cs
+++ b/src/Tel.Egram.Gui.Views/Shared/AvatarControl.xaml.cs
@@ -106,6 +106,11 @@ private static void SourceChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Sender is AvatarControl avatarControl)
             {
+                if (e.NewValue is null)
+                {
+                    avatarControl.SourceBrush = null;
+                }
+                
                 if (e.NewValue is IBitmap bitmap)
                 {
                     avatarControl.SourceBrush = new ImageBrush(bitmap);
@@ -117,6 +122,11 @@ private static void ColorChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Sender is AvatarControl avatarControl)
             {
+                if (e.NewValue is null)
+                {
+                    avatarControl.ColorBrush = null;
+                }
+                
                 if (e.NewValue is Color color)
                 {
                     avatarControl.ColorBrush = new SolidColorBrush(color);
@@ -128,6 +138,11 @@ private static void TextColorChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (e.Sender is AvatarControl avatarControl)
             {
+                if (e.NewValue is null)
+                {
+                    avatarControl.TextColorBrush = null;
+                }
+                
                 if (e.NewValue is Color color)
                 {
                     avatarControl.TextColorBrush = new SolidColorBrush(color);