Skip to content

Commit 496b161

Browse files
committed
Minor changes
1 parent 560b989 commit 496b161

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

src/Files.App/UserControls/SidebarControl.xaml.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ public bool CanOpenInNewPane
169169
get => canOpenInNewPane;
170170
set
171171
{
172-
if (value == true)
173-
return;
174-
175-
canOpenInNewPane = value;
176-
NotifyPropertyChanged(nameof(CanOpenInNewPane));
172+
if (value != canOpenInNewPane)
173+
{
174+
canOpenInNewPane = value;
175+
NotifyPropertyChanged(nameof(CanOpenInNewPane));
176+
}
177177
}
178178
}
179179

@@ -356,7 +356,7 @@ private void HideSection()
356356

357357
private async void OpenInNewPane()
358358
{
359-
if (await CheckEmptyDrive((rightClickedItem as INavigationControlItem).Path))
359+
if (await CheckEmptyDrive(rightClickedItem.Path))
360360
return;
361361

362362
SidebarItemNewPaneInvoked?.Invoke(this, new SidebarItemNewPaneInvokedEventArgs(rightClickedItem));
@@ -634,7 +634,7 @@ private async void NavigationViewLocationItem_DragOver(object sender, DragEventA
634634
CompleteDragEventArgs(e, captionText, DataPackageOperation.Copy);
635635
}
636636
}
637-
else if (hasStorageItems == false)
637+
else if (hasStorageItems is false)
638638
{
639639
e.AcceptedOperation = DataPackageOperation.None;
640640
}
@@ -930,7 +930,7 @@ private async void NavigationViewFileTag_Drop(object sender, DragEventArgs e)
930930

931931
private void SidebarNavView_Loaded(object sender, RoutedEventArgs e)
932932
{
933-
((this.FindDescendant("TabContentBorder") as Border)!).Child = TabContent;
933+
(this.FindDescendant("TabContentBorder") as Border)!.Child = TabContent;
934934
}
935935

936936
private void SidebarControl_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
@@ -986,17 +986,17 @@ private void Border_PointerExited(object sender, PointerRoutedEventArgs e)
986986
if (dragging)
987987
return; // keep showing pressed event if currently resizing the sidebar
988988

989-
(sender as Grid)?.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow));
990-
VisualStateManager.GoToState((sender as Grid).FindAscendant<SplitView>(), "ResizerNormal", true);
989+
((Grid)sender).ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow));
990+
VisualStateManager.GoToState(((Grid)sender).FindAscendant<SplitView>(), "ResizerNormal", true);
991991
}
992992

993993
private void Border_PointerEntered(object sender, PointerRoutedEventArgs e)
994994
{
995995
if (DisplayMode != NavigationViewDisplayMode.Expanded)
996996
return;
997997

998-
(sender as Grid)?.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast));
999-
VisualStateManager.GoToState((sender as Grid).FindAscendant<SplitView>(), "ResizerPointerOver", true);
998+
((Grid)sender).ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast));
999+
VisualStateManager.GoToState(((Grid)sender).FindAscendant<SplitView>(), "ResizerPointerOver", true);
10001000
}
10011001

10021002
private void SetSize(double val, bool closeImmediatleyOnOversize = false)
@@ -1024,8 +1024,8 @@ private void SetSize(double val, bool closeImmediatleyOnOversize = false)
10241024

10251025
private void ResizeElementBorder_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
10261026
{
1027-
(sender as Grid).ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow));
1028-
VisualStateManager.GoToState((sender as Grid).FindAscendant<SplitView>(), "ResizerNormal", true);
1027+
((Grid)sender).ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow));
1028+
VisualStateManager.GoToState(((Grid)sender).FindAscendant<SplitView>(), "ResizerNormal", true);
10291029
UserSettingsService.AppearanceSettingsService.SidebarWidth = OpenPaneLength;
10301030
dragging = false;
10311031
}
@@ -1041,8 +1041,8 @@ private void ResizeElementBorder_ManipulationStarted(object sender, Manipulation
10411041
return;
10421042

10431043
originalSize = IsPaneOpen ? UserSettingsService.AppearanceSettingsService.SidebarWidth : CompactPaneLength;
1044-
(sender as Grid).ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast));
1045-
VisualStateManager.GoToState((sender as Grid).FindAscendant<SplitView>(), "ResizerPressed", true);
1044+
((Grid)sender).ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast));
1045+
VisualStateManager.GoToState(((Grid)sender).FindAscendant<SplitView>(), "ResizerPressed", true);
10461046
dragging = true;
10471047
}
10481048

@@ -1217,12 +1217,12 @@ public class NavItemDataTemplateSelector : DataTemplateSelector
12171217
public DataTemplate FileTagNavItemTemplate { get; set; }
12181218
public DataTemplate HeaderNavItemTemplate { get; set; }
12191219

1220-
protected override DataTemplate SelectTemplateCore(object item)
1220+
protected override DataTemplate? SelectTemplateCore(object item)
12211221
{
12221222
if (item is null || item is not INavigationControlItem navControlItem)
12231223
return null;
12241224

1225-
return navControlItem?.ItemType switch
1225+
return navControlItem.ItemType switch
12261226
{
12271227
NavigationControlItemType.Location => LocationNavItemTemplate,
12281228
NavigationControlItemType.Drive => DriveNavItemTemplate,

0 commit comments

Comments
 (0)