From 91725b2c0ddf1151a237527790515559a1e13ddf Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Fri, 14 Jan 2022 08:09:59 +0100
Subject: [PATCH] Fixed correlation Id overlapping routing key in subscriber
 view

---
 PettingZoo/UI/Tab/Subscriber/SubscriberView.xaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/PettingZoo/UI/Tab/Subscriber/SubscriberView.xaml b/PettingZoo/UI/Tab/Subscriber/SubscriberView.xaml
index 3f3fd46..a6b3016 100644
--- a/PettingZoo/UI/Tab/Subscriber/SubscriberView.xaml
+++ b/PettingZoo/UI/Tab/Subscriber/SubscriberView.xaml
@@ -61,10 +61,8 @@
                         </Grid.ColumnDefinitions>
 
                         <TextBlock Grid.Column="0" Text="{Binding ReceivedTimestamp, StringFormat=g}" Style="{StaticResource Timestamp}" />
-                        <!-- ReSharper disable Xaml.BindingWithContextNotResolved -->
-                        <TextBlock Grid.Column="1" Text="{Binding RoutingKey}" Style="{StaticResource RoutingKey}" Visibility="{Binding Data.StandardTabVisibility, Source={StaticResource ContextMenuProxy}}" />
-                        <TextBlock Grid.Column="1" Text="{Binding Properties.CorrelationId}" Style="{StaticResource RoutingKey}" Visibility="{Binding Data.ReplyToTabVisibility, Source={StaticResource ContextMenuProxy}}" />
-                        <!-- ReSharper restore Xaml.BindingWithContextNotResolved -->
+                        <TextBlock Grid.Column="1" Text="{Binding RoutingKey}" Style="{StaticResource RoutingKey}" Visibility="{Binding DataContext.StandardTabVisibility, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}" />
+                        <TextBlock Grid.Column="1" Text="{Binding Properties.CorrelationId}" Style="{StaticResource RoutingKey}" Visibility="{Binding DataContext.ReplyTabVisibility, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}" />
 
                         <Grid.ContextMenu>
                             <ContextMenu>