Adjusting view

Author: StanleyGoldman

src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml

@@ -105,7 +105,7 @@
                       VerticalScrollBarVisibility="Auto"
                       Background="{DynamicResource GitHubPeekViewBackground}">
             <StackPanel Orientation="Vertical" Margin="0 0 0 4">
-                <ItemsControl ItemsSource="{Binding Annotations}">
+                <ItemsControl x:Name="annotationsView" ItemsSource="{Binding Annotations}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <ghfvs:InlineAnnotationView />

src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml.cs

@@ -15,17 +15,19 @@ public InlineCommentPeekView()
             InitializeComponent();
 
             desiredHeight = new Subject<double>();
-            threadView.LayoutUpdated += ThreadViewLayoutUpdated;
+            threadView.LayoutUpdated += ChildLayoutUpdated;
+            annotationsView.LayoutUpdated += ChildLayoutUpdated;
             threadScroller.PreviewMouseWheel += ScrollViewerUtilities.FixMouseWheelScroll;
         }
 
         public IObservable<double> DesiredHeight => desiredHeight;
 
-        void ThreadViewLayoutUpdated(object sender, EventArgs e)
+        void ChildLayoutUpdated(object sender, EventArgs e)
         {
             var otherControlsHeight = ActualHeight - threadScroller.ActualHeight;
             var threadViewHeight = threadView.DesiredSize.Height + threadView.Margin.Top + threadView.Margin.Bottom;
-            desiredHeight.OnNext(threadViewHeight + otherControlsHeight);
+            var annotationsViewHeight = annotationsView.DesiredSize.Height + annotationsView.Margin.Top + annotationsView.Margin.Bottom;
+            desiredHeight.OnNext(threadViewHeight + annotationsViewHeight + otherControlsHeight);
         }
     }
 }