From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../NotificationItems/MessageNotificationItem.cs           |  3 +--
 .../NotificationItems/MessageNotificationItemView.xaml     | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
index 7d85ef6a7..a9de336a1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
@@ -77,12 +77,11 @@ namespace Tango.PPC.Common.Notifications.NotificationItems
         /// <param name="expandedMessage">The expanded message.</param>
         /// <param name="type">The type.</param>
         /// <param name="pressedAction">The pressed action.</param>
-        public MessageNotificationItem(String message, String expandedMessage, MessageNotificationItemTypes type, Action pressedAction, NotificationPriority priority = NotificationPriority.Normal) : this()
+        public MessageNotificationItem(String message, String expandedMessage, MessageNotificationItemTypes type, Action pressedAction) : this()
         {
             Message = message;
             ExpandedMessage = expandedMessage;
             MessageType = type;
-            Priority = priority;
             Pressed += (_, __) => pressedAction?.Invoke();
         }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
index cab40e50e..33c58f51e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
@@ -111,20 +111,20 @@
                     </touch:TouchIcon.Style>
                 </touch:TouchIcon>
 
-                <StackPanel Margin="10 5 40 5" VerticalAlignment="Center">
-                    <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Foreground="Black" VerticalAlignment="Center" ></TextBlock>
+                <StackPanel Margin="10 0 0 0" VerticalAlignment="Center">
+                    <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Foreground="Black" VerticalAlignment="Center"></TextBlock>
 
-                    
-                        <TextBlock Margin="0 5 0 0" Foreground="{StaticResource TangoDarkForegroundBrush}" Text="{Binding ExpandedMessage}" FontSize="{StaticResource TangoSmallFontSize}" TextWrapping="Wrap" VerticalAlignment="Center" >
-                            <!--<TextBlock.Opacity>
+                    <Canvas Margin="0 5 0 0">
+                        <TextBlock Foreground="{StaticResource TangoDarkForegroundBrush}" Text="{Binding ExpandedMessage}" TextWrapping="Wrap" VerticalAlignment="Center">
+                            <TextBlock.Opacity>
                                 <MultiBinding Converter="{StaticResource heightToOpacityConverter}">
                                     <Binding Path="ActualHeight" ElementName="MessageNotificationItemControl" />
                                     <Binding Path="MinHeight" ElementName="MessageNotificationItemControl" />
                                     <Binding Path="MaxHeight" ElementName="MessageNotificationItemControl" />
                                 </MultiBinding>
-                            </TextBlock.Opacity>-->
+                            </TextBlock.Opacity>
                         </TextBlock>
-                    
+                    </Canvas>
                 </StackPanel>
             </DockPanel>
         </ContentControl>
-- 
cgit v1.3.1