Skip to content

Commit 381dd0b

Browse files
authored
CodeMaid (#2148)
1 parent 1b1775a commit 381dd0b

File tree

12 files changed

+90
-206
lines changed

12 files changed

+90
-206
lines changed

Files.Launcher/Win32API_ContextMenu.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Vanara.InteropServices;
1414
using Vanara.PInvoke;
1515
using Vanara.Windows.Shell;
16-
using static Vanara.PInvoke.Gdi32;
1716

1817
namespace FilesFullTrust
1918
{

Files/BaseLayout.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ public virtual void SetShellContextmenu(MenuFlyout menuFlyout, bool shiftPressed
178178
{
179179
var response = App.Connection.SendMessageAsync(new ValueSet() {
180180
{ "Arguments", "LoadContextMenu" },
181-
{ "FilePath", IsItemSelected ?
182-
string.Join('|', _SelectedItems.Select(x => x.ItemPath)) :
181+
{ "FilePath", IsItemSelected ?
182+
string.Join('|', _SelectedItems.Select(x => x.ItemPath)) :
183183
App.CurrentInstance.FilesystemViewModel.CurrentFolder.ItemPath},
184184
{ "ExtendedMenu", shiftPressed },
185185
{ "ShowOpenMenu", showOpenMenu }}).AsTask().Result;

Files/ResourceDictionaries/PropertiesStyles.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<Thickness x:Key="PropertyNameMargin">0,7</Thickness>
1313
<Thickness x:Key="PropertyValueMargin">20,0,0,0</Thickness>
1414
<VerticalAlignment x:Key="PropertyValueVerticalAlignment">Center</VerticalAlignment>
15-
<!--Might be used for Expander control-->
16-
<SolidColorBrush Color="Transparent" x:Key="SystemControlBackgroundBaseHighBrush"/>
15+
<!-- Might be used for Expander control -->
16+
<SolidColorBrush x:Key="SystemControlBackgroundBaseHighBrush" Color="Transparent" />
1717

1818
<Style x:Key="PropertyName" TargetType="TextBlock">
1919
<Setter Property="Margin" Value="{StaticResource PropertyNameMargin}" />

Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,6 @@
759759
<SolidColorBrush x:Key="TabViewBackground" Color="{ThemeResource SystemColorActiveCaptionColor}" />
760760
</ResourceDictionary>
761761
</ResourceDictionary.ThemeDictionaries>
762-
763762
</ResourceDictionary>
764763
</ResourceDictionary.MergedDictionaries>
765764
</ResourceDictionary>

Files/UserControls/RectangleSelection.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
using System;
44
using System.Collections.Generic;
55
using System.Linq;
6-
using System.Text;
7-
using System.Threading.Tasks;
86
using Windows.Foundation;
97
using Windows.UI.Input;
108
using Windows.UI.Xaml;
@@ -23,7 +21,9 @@ public class RectangleSelection
2321
protected Rectangle selectionRectangle;
2422
protected SelectionState selectionState;
2523

26-
protected RectangleSelection() { }
24+
protected RectangleSelection()
25+
{
26+
}
2727

2828
/// <summary>
2929
/// Adds drag selection to a ListView, GridView or DataGrid
@@ -49,7 +49,9 @@ public static RectangleSelection Create(UIElement uiElement, Rectangle selection
4949
}
5050

5151
public delegate void SelectionStatusHandler(object sender, EventArgs e);
52+
5253
public event SelectionStatusHandler SelectionStarted;
54+
5355
public event SelectionStatusHandler SelectionEnded;
5456

5557
protected void OnSelectionStarted()
@@ -458,4 +460,4 @@ private void InitEvents(object sender, RoutedEventArgs e)
458460
}
459461
}
460462
}
461-
}
463+
}

Files/View Models/Properties/FolderProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using ByteSizeLib;
2-
using Files.Enums;
32
using Files.Common;
3+
using Files.Enums;
44
using Files.Filesystem;
55
using Files.Helpers;
66
using Microsoft.Toolkit.Mvvm.Input;

Files/View Models/SettingsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public bool ShowFileOwner
275275
get => Get(false);
276276
set => Set(value);
277277
}
278-
278+
279279
public bool OpenItemsWithOneclick
280280
{
281281
get => Get(false);

Files/Views/LayoutModes/GenericFileBrowser.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -594,14 +594,14 @@
594594

595595
<controls:DataGrid
596596
x:Name="AllView"
597-
Background="Transparent"
598-
VerticalAlignment="Stretch"
599597
Grid.Row="3"
600598
Margin="12,12,12,0"
601599
HorizontalAlignment="Stretch"
600+
VerticalAlignment="Stretch"
602601
x:FieldModifier="public"
603602
AllowDrop="True"
604603
AutoGenerateColumns="False"
604+
Background="Transparent"
605605
CanUserReorderColumns="False"
606606
CanUserSortColumns="True"
607607
CellEditEnded="AllView_CellEditEnded"
@@ -846,18 +846,18 @@
846846
</controls:DataGrid>
847847

848848
<Canvas
849+
Margin="12,12,12,0"
849850
HorizontalAlignment="Stretch"
850-
VerticalAlignment="Stretch"
851-
Margin="12,12,12,0">
851+
VerticalAlignment="Stretch">
852852
<Rectangle
853853
Name="SelectionRectangle"
854-
Fill="#AA0078d7"
855-
Stroke="#FF0066cc"
856-
StrokeThickness="1"
857854
Canvas.Left="0"
858855
Canvas.Top="0"
859856
Width="0"
860-
Height="0" />
857+
Height="0"
858+
Fill="#AA0078d7"
859+
Stroke="#FF0066cc"
860+
StrokeThickness="1" />
861861
</Canvas>
862862
</Grid>
863863
</local:BaseLayout>

Files/Views/LayoutModes/GridViewBrowser.xaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -880,18 +880,16 @@
880880
</Interactivity:Interaction.Behaviors>
881881
</GridView>
882882

883-
<Canvas
884-
HorizontalAlignment="Stretch"
885-
VerticalAlignment="Stretch">
883+
<Canvas HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
886884
<Rectangle
887885
Name="SelectionRectangle"
888-
Fill="#AA0078d7"
889-
Stroke="#FF0066cc"
890-
StrokeThickness="1"
891886
Canvas.Left="0"
892887
Canvas.Top="0"
893888
Width="0"
894-
Height="0"/>
889+
Height="0"
890+
Fill="#AA0078d7"
891+
Stroke="#FF0066cc"
892+
StrokeThickness="1" />
895893
</Canvas>
896894
</Grid>
897895
</local:BaseLayout>

Files/Views/LayoutModes/GridViewBrowser.xaml.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
using System.Collections.Generic;
66
using System.Linq;
77
using System.Threading.Tasks;
8-
using Windows.Foundation;
98
using Windows.System;
109
using Windows.UI.Core;
11-
using Windows.UI.Input;
1210
using Windows.UI.Xaml;
1311
using Windows.UI.Xaml.Controls;
1412
using Windows.UI.Xaml.Controls.Primitives;
1513
using Windows.UI.Xaml.Input;
16-
using Windows.UI.Xaml.Media;
1714
using Interaction = Files.Interacts.Interaction;
1815

1916
namespace Files

0 commit comments

Comments
 (0)