From 57094a3036e408959fc37bdaa3b8fc9cad6e19f7 Mon Sep 17 00:00:00 2001
From: Meik <meik.drechsler@consulting4it.de>
Date: Thu, 5 Mar 2026 12:34:54 +0100
Subject: [PATCH] Fix announcement marker rounding for short cards

---
 UserControls/AnnouncementListItem.xaml | 166 ++++++++++++++-----------
 1 file changed, 93 insertions(+), 73 deletions(-)

diff --git a/UserControls/AnnouncementListItem.xaml b/UserControls/AnnouncementListItem.xaml
index e41c836..c334aa4 100644
--- a/UserControls/AnnouncementListItem.xaml
+++ b/UserControls/AnnouncementListItem.xaml
@@ -24,86 +24,106 @@
             ClipToBounds="True"
             MouseEnter="OnAnnMouseEnter"
             MouseLeave="OnAnnMouseLeave">
-        <Grid Background="Transparent"
-              Height="auto">
-
+        <Grid Background="Transparent">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="6"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="6" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-            </Grid.RowDefinitions>
-            <Border Grid.RowSpan="3"
-                    Grid.Column="0"
+            <Border Grid.Column="0"
                     x:Name="annColor"
                     Background="{Binding Path=PrioColor}"
                     CornerRadius="12,0,0,12"
-                    Margin="0" />
-            <DockPanel Grid.Column="1" >
-                <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png"
-                       Panel.ZIndex="18"
-                       Stretch="None"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"
-                       Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}"
-                       x:Name="signal"
-                       Width="15"
-                       Height="15"
-                       Cursor="Hand"
-                       ToolTip="{x:Static resx:Resources.removeMarkup}"
-                       Margin="5,0,0,0"
-                       RenderTransformOrigin="0.5,0.5">
-                    <Image.RenderTransform>
-                        <ScaleTransform ScaleX="0.8"
-                                        ScaleY="0.8" />
-                    </Image.RenderTransform>
-                </Image>
-                <TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
-            </DockPanel>
+                    Margin="0"
+                    VerticalAlignment="Stretch" />
 
-            <Image x:Name="imgOpen" Grid.Row="0"  Grid.Column="2" Source="{DynamicResource appbar_new_window}" Width="20" Margin="0,2,8,0" ToolTip="{x:Static resx:Resources.CallAnnonceDetails}" Cursor="Hand"/>
-            <TextBlock x:Name="txtSubject" 
-                       Grid.Row="1" 
-                       Grid.ColumnSpan="2" 
-                       Margin="15,5,5,0" 
-                       HorizontalAlignment="Left" 
-                       Text="{Binding Path=Subject,FallbackValue='test Announcement'}" 
-                       VerticalAlignment="Center" 
-                       FontWeight="Bold" 
-                       Foreground="{DynamicResource sectionTitleColor}"
-                       ClipToBounds="True"/>
-            <TextBlock x:Name="txtContent" 
-                       Grid.Row="2" 
-                       Grid.ColumnSpan="2" 
-                       Margin="15,10,10,0" 
-                       VerticalAlignment="Center" 
-                       Text="{Binding Path=Text,FallbackValue='test text'}" 
-                       Foreground="{DynamicResource subtleTextColor}"
-                       TextWrapping="Wrap" 
-                       TextTrimming="CharacterEllipsis" 
-                       LineStackingStrategy="BlockLineHeight" 
-                       LineHeight="18" 
-                       Height="58" 
-                       Visibility="Collapsed" />
-            <TextBlock x:Name="txtNotice" 
-                       Background="Transparent"
-                       IsHitTestVisible="True"
-                       Grid.Row="2" 
-                       Grid.ColumnSpan="2" 
-                       Margin="15,5,10,0" 
-                       VerticalAlignment="Center"
-                       FontStyle="Italic" 
-                       Foreground="{DynamicResource subtleTextColor}"
-                       TextWrapping="Wrap" 
-                       TextTrimming="CharacterEllipsis" 
-                       LineStackingStrategy="BlockLineHeight" 
-                       LineHeight="18" 
-                       Height="40" />
+            <Grid Grid.Column="1"
+                  Background="Transparent">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                </Grid.RowDefinitions>
+
+                <DockPanel Grid.Row="0"
+                           Grid.Column="0">
+                    <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png"
+                           Panel.ZIndex="18"
+                           Stretch="None"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}"
+                           x:Name="signal"
+                           Width="15"
+                           Height="15"
+                           Cursor="Hand"
+                           ToolTip="{x:Static resx:Resources.removeMarkup}"
+                           Margin="5,0,0,0"
+                           RenderTransformOrigin="0.5,0.5">
+                        <Image.RenderTransform>
+                            <ScaleTransform ScaleX="0.8"
+                                            ScaleY="0.8" />
+                        </Image.RenderTransform>
+                    </Image>
+                    <TextBlock x:Name="txtDate"
+                               Margin="10,0,5,0"
+                               HorizontalAlignment="Left"
+                               VerticalAlignment="Center"
+                               FontStyle="Italic"
+                               Foreground="{DynamicResource subtleTextColor}"
+                               Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}" />
+                </DockPanel>
+
+                <Image x:Name="imgOpen"
+                       Grid.Row="0"
+                       Grid.Column="1"
+                       Source="{DynamicResource appbar_new_window}"
+                       Width="20"
+                       Margin="0,2,8,0"
+                       ToolTip="{x:Static resx:Resources.CallAnnonceDetails}"
+                       Cursor="Hand" />
+                <TextBlock x:Name="txtSubject"
+                           Grid.Row="1"
+                           Grid.ColumnSpan="2"
+                           Margin="15,5,5,0"
+                           HorizontalAlignment="Left"
+                           Text="{Binding Path=Subject,FallbackValue='test Announcement'}"
+                           VerticalAlignment="Center"
+                           FontWeight="Bold"
+                           Foreground="{DynamicResource sectionTitleColor}"
+                           ClipToBounds="True" />
+                <TextBlock x:Name="txtContent"
+                           Grid.Row="2"
+                           Grid.ColumnSpan="2"
+                           Margin="15,10,10,0"
+                           VerticalAlignment="Center"
+                           Text="{Binding Path=Text,FallbackValue='test text'}"
+                           Foreground="{DynamicResource subtleTextColor}"
+                           TextWrapping="Wrap"
+                           TextTrimming="CharacterEllipsis"
+                           LineStackingStrategy="BlockLineHeight"
+                           LineHeight="18"
+                           Height="58"
+                           Visibility="Collapsed" />
+                <TextBlock x:Name="txtNotice"
+                           Background="Transparent"
+                           IsHitTestVisible="True"
+                           Grid.Row="2"
+                           Grid.ColumnSpan="2"
+                           Margin="15,5,10,0"
+                           VerticalAlignment="Center"
+                           FontStyle="Italic"
+                           Foreground="{DynamicResource subtleTextColor}"
+                           TextWrapping="Wrap"
+                           TextTrimming="CharacterEllipsis"
+                           LineStackingStrategy="BlockLineHeight"
+                           LineHeight="18"
+                           Height="40" />
+            </Grid>
         </Grid>
     </Border>
 </UserControl>