Skip to content

Commit ee7bea9

Browse files
committed
More pattern matching
1 parent aebfd48 commit ee7bea9

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

Signal-Windows/Controls/Conversation.xaml.cs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ private void UpdateHeader(SignalConversation thread)
161161
public void Load(SignalConversation conversation)
162162
{
163163
SignalConversation = conversation;
164-
var contact = SignalConversation as SignalContact;
165-
if (contact != null)
164+
if (SignalConversation is SignalContact contact)
166165
{
167166
Blocked = contact.Blocked;
168167
SendMessageVisible = !Blocked;
@@ -206,9 +205,7 @@ public T FindElementByName<T>(FrameworkElement element, string sChildName) where
206205
var nChildCount = VisualTreeHelper.GetChildrenCount(element);
207206
for (int i = 0; i < nChildCount; i++)
208207
{
209-
FrameworkElement child = VisualTreeHelper.GetChild(element, i) as FrameworkElement;
210-
211-
if (child == null)
208+
if (!(VisualTreeHelper.GetChild(element, i) is FrameworkElement child))
212209
continue;
213210

214211
if (child is T && child.Name.Equals(sChildName))
@@ -351,8 +348,7 @@ private void ScrollToUnread()
351348

352349
private int GetBottommostIndex()
353350
{
354-
var sourcePanel = ConversationItemsControl.ItemsPanelRoot as ItemsStackPanel;
355-
if (sourcePanel != null)
351+
if (ConversationItemsControl.ItemsPanelRoot is ItemsStackPanel sourcePanel)
356352
{
357353
return sourcePanel.LastVisibleIndex;
358354
}
@@ -392,9 +388,8 @@ private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEven
392388

393389
private async void UnblockButton_Click(object sender, RoutedEventArgs e)
394390
{
395-
if (SignalConversation is SignalContact)
391+
if (SignalConversation is SignalContact contact)
396392
{
397-
var contact = (SignalContact)SignalConversation;
398393
contact.Blocked = false;
399394
Blocked = false;
400395
SendMessageVisible = !Blocked;
@@ -416,9 +411,8 @@ public class MessageTemplateSelector : DataTemplateSelector
416411
protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
417412
{
418413
FrameworkElement element = container as FrameworkElement;
419-
if (item is SignalMessageContainer)
414+
if (item is SignalMessageContainer smc)
420415
{
421-
SignalMessageContainer smc = (SignalMessageContainer)item;
422416
SignalMessage sm = smc.Message;
423417
if (sm.Type == SignalMessageType.IdentityKeyChange)
424418
{

0 commit comments

Comments
 (0)