Skip to content

Commit f21ce68

Browse files
committed
Add excessive logging to ScrollViewer_ViewChanged
1 parent fa28cd3 commit f21ce68

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

Signal-Windows/Controls/Conversation.xaml.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,17 @@ private void ScrollToUnread()
305305

306306
private int GetBottommostIndex()
307307
{
308-
var sourcePanel = (ItemsStackPanel)ConversationItemsControl.ItemsPanelRoot;
309-
return sourcePanel.LastVisibleIndex;
308+
Logger.LogTrace("GetBottommostIndex()");
309+
var sourcePanel = ConversationItemsControl.ItemsPanelRoot as ItemsStackPanel;
310+
if (sourcePanel != null)
311+
{
312+
return sourcePanel.LastVisibleIndex;
313+
}
314+
else
315+
{
316+
Logger.LogError("GetBottommostIndex() ItemsPanelRoot is not a valid ItemsStackPanel ({0})", ConversationItemsControl.ItemsPanelRoot);
317+
return -1;
318+
}
310319
}
311320

312321
private void ConversationSettingsButton_Click(object sender, RoutedEventArgs e)
@@ -321,10 +330,12 @@ private void ConversationSettingsButton_Click(object sender, RoutedEventArgs e)
321330
private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
322331
{
323332
int bottomIndex = GetBottommostIndex();
333+
Logger.LogTrace("ScrollViewer_ViewChanged() bottomIndex={}", bottomIndex);
324334
if (Window.Current.CoreWindow.ActivationMode == CoreWindowActivationMode.ActivatedInForeground &&
325335
SignalConversation.LastSeenMessageIndex < bottomIndex &&
326336
LastMarkReadRequest < bottomIndex)
327337
{
338+
Logger.LogTrace("ScrollViewer_ViewChanged() setting index {0} as read", bottomIndex);
328339
LastMarkReadRequest = bottomIndex;
329340
Task.Run(async () =>
330341
{

0 commit comments

Comments
 (0)