Skip to content

Commit 700e6c2

Browse files
committed
Removed old paste events
1 parent d53d279 commit 700e6c2

File tree

4 files changed

+0
-60
lines changed

4 files changed

+0
-60
lines changed

src/Files.App/Views/Shells/ColumnShellPage.xaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
</ResourceDictionary>
2020
</local:BaseShellPage.Resources>
2121

22-
<local:BaseShellPage.KeyboardAccelerators>
23-
<KeyboardAccelerator
24-
Key="V"
25-
Invoked="KeyboardAccelerator_Invoked"
26-
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}"
27-
Modifiers="Control" />
28-
</local:BaseShellPage.KeyboardAccelerators>
29-
3022
<Grid x:Name="RootGrid">
3123
<Grid.RowDefinitions>
3224
<RowDefinition Height="Auto" />

src/Files.App/Views/Shells/ColumnShellPage.xaml.cs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -120,29 +120,6 @@ private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs
120120
};
121121
}
122122

123-
private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
124-
{
125-
args.Handled = true;
126-
var tabInstance =
127-
CurrentPageType == typeof(DetailsLayoutPage) ||
128-
CurrentPageType == typeof(GridLayoutPage) ||
129-
CurrentPageType == typeof(ColumnsLayoutPage) ||
130-
CurrentPageType == typeof(ColumnLayoutPage);
131-
132-
var ctrl = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Control);
133-
var shift = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Shift);
134-
var alt = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Menu);
135-
136-
switch (c: ctrl, s: shift, a: alt, t: tabInstance, k: args.KeyboardAccelerator.Key)
137-
{
138-
// Ctrl + V, Paste
139-
case (true, false, false, true, VirtualKey.V):
140-
if (!ContentPage.IsRenamingItem && !InstanceViewModel.IsPageTypeSearchResults)
141-
await UIFilesystemHelpers.PasteItemAsync(ShellViewModel.WorkingDirectory, this);
142-
break;
143-
}
144-
}
145-
146123
public override void Back_Click()
147124
{
148125
ToolbarViewModel.CanGoBack = false;

src/Files.App/Views/Shells/ModernShellPage.xaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@
3030
</ResourceDictionary>
3131
</local:BaseShellPage.Resources>
3232

33-
<local:BaseShellPage.KeyboardAccelerators>
34-
<KeyboardAccelerator
35-
Key="V"
36-
Invoked="KeyboardAccelerator_Invoked"
37-
IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}"
38-
Modifiers="Control" />
39-
</local:BaseShellPage.KeyboardAccelerators>
40-
4133
<Grid
4234
x:Name="RootGrid"
4335
wct:UIElementExtensions.ClipToBounds="True"

src/Files.App/Views/Shells/ModernShellPage.xaml.cs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -174,27 +174,6 @@ private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs
174174
_navigationInteractionTracker.CanNavigateForward = CanNavigateForward;
175175
}
176176

177-
private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
178-
{
179-
args.Handled = true;
180-
var tabInstance =
181-
CurrentPageType == typeof(DetailsLayoutPage) ||
182-
CurrentPageType == typeof(GridLayoutPage);
183-
184-
var ctrl = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Control);
185-
var shift = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Shift);
186-
var alt = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Menu);
187-
188-
switch (c: ctrl, s: shift, a: alt, t: tabInstance, k: args.KeyboardAccelerator.Key)
189-
{
190-
// Ctrl + V, Paste
191-
case (true, false, false, true, VirtualKey.V):
192-
if (!ContentPage.IsRenamingItem && !InstanceViewModel.IsPageTypeSearchResults)
193-
await UIFilesystemHelpers.PasteItemAsync(ShellViewModel.WorkingDirectory, this);
194-
break;
195-
}
196-
}
197-
198177
private void OverscrollNavigationRequested(object? sender, OverscrollNavigationEventArgs e)
199178
{
200179
switch (e)

0 commit comments

Comments
 (0)