Skip to content

Commit 17a3d6a

Browse files
lukeblevinslukeblevins
committed
Ensure Item-Copy accelerator always fires its event and remove the ugly focus border around DataGrid cells (yay!)
1 parent 3c25bcb commit 17a3d6a

File tree

2 files changed

+31
-5
lines changed

2 files changed

+31
-5
lines changed

‎Files UWP/GenericFileBrowser.xaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@
165165
<MenuFlyoutItem.Icon>
166166
<FontIcon Glyph="&#xE77F;"/>
167167
</MenuFlyoutItem.Icon>
168+
<MenuFlyoutItem.KeyboardAccelerators>
169+
<KeyboardAccelerator Modifiers="Control" Key="V"/>
170+
</MenuFlyoutItem.KeyboardAccelerators>
168171
</MenuFlyoutItem>
169172
<MenuFlyoutItem Text="Open in PowerShell...">
170173
<MenuFlyoutItem.Icon>
@@ -183,7 +186,11 @@
183186
</Grid.ContextFlyout>
184187
<ProgressBar Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
185188
<TextBlock Visibility="{x:Bind TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
186-
<controls:DataGrid RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" HorizontalAlignment="Left">
189+
<controls:DataGrid ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" HorizontalAlignment="Left">
190+
<controls:DataGrid.Resources>
191+
<SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="Transparent"/>
192+
<SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="Transparent"/>
193+
</controls:DataGrid.Resources>
187194
<controls:DataGrid.ColumnHeaderStyle>
188195
<Style TargetType="controlsprimitives:DataGridColumnHeader">
189196
<Setter Property="ContextFlyout">
@@ -285,6 +292,7 @@
285292
<controls:DataGrid.CellStyle>
286293
<Style TargetType="controls:DataGridCell">
287294
<Setter Property="BorderThickness" Value="0"/>
295+
<Setter Property="AllowFocusOnInteraction" Value="False"/>
288296
<Setter Property="FocusVisualPrimaryThickness" Value="0"/>
289297
<Setter Property="FocusVisualSecondaryThickness" Value="0"/>
290298
</Style>

‎Files UWP/PhotoAlbum.xaml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,9 @@
392392
<MenuFlyoutItem.Icon>
393393
<FontIcon Glyph="&#xE77F;"/>
394394
</MenuFlyoutItem.Icon>
395+
<MenuFlyoutItem.KeyboardAccelerators>
396+
<KeyboardAccelerator Modifiers="Control" Key="V"/>
397+
</MenuFlyoutItem.KeyboardAccelerators>
395398
</MenuFlyoutItem>
396399
<MenuFlyoutSeparator/>
397400
<MenuFlyoutItem Click="PropertiesItemGrid_Click" Text="Properties" Name="PropertiesItemGrid">
@@ -421,28 +424,43 @@
421424
<MenuFlyoutItem.Icon>
422425
<FontIcon Glyph="&#xE72D;"/>
423426
</MenuFlyoutItem.Icon>
424-
</MenuFlyoutItem>
427+
<MenuFlyoutItem.KeyboardAccelerators>
428+
<KeyboardAccelerator Modifiers="Control" Key="S"/>
429+
</MenuFlyoutItem.KeyboardAccelerators>
430+
</MenuFlyoutItem>
425431
<MenuFlyoutSeparator/>
426432
<MenuFlyoutItem Click="DeleteItem_Click" Text="Delete" Name="DeleteItem" >
427433
<MenuFlyoutItem.Icon>
428434
<FontIcon Glyph="&#xE74D;"/>
429435
</MenuFlyoutItem.Icon>
430-
</MenuFlyoutItem>
436+
<MenuFlyoutItem.KeyboardAccelerators>
437+
<KeyboardAccelerator Key="Delete"/>
438+
</MenuFlyoutItem.KeyboardAccelerators>
439+
</MenuFlyoutItem>
431440
<MenuFlyoutItem Click="RenameItem_Click" Text="Rename" Name="RenameItem" >
432441
<MenuFlyoutItem.Icon>
433442
<FontIcon Glyph="&#xE8AC;"/>
434443
</MenuFlyoutItem.Icon>
435-
</MenuFlyoutItem>
444+
<MenuFlyoutItem.KeyboardAccelerators>
445+
<KeyboardAccelerator Key="F2"/>
446+
</MenuFlyoutItem.KeyboardAccelerators>
447+
</MenuFlyoutItem>
436448
<MenuFlyoutSeparator/>
437449
<MenuFlyoutItem Click="CutItem_Click" Text="Cut" Name="CutItem" >
438450
<MenuFlyoutItem.Icon>
439451
<FontIcon Glyph="&#xE8C6;"/>
440452
</MenuFlyoutItem.Icon>
441-
</MenuFlyoutItem>
453+
<MenuFlyoutItem.KeyboardAccelerators>
454+
<KeyboardAccelerator Modifiers="Control" Key="X"/>
455+
</MenuFlyoutItem.KeyboardAccelerators>
456+
</MenuFlyoutItem>
442457
<MenuFlyoutItem Click="CopyItem_Click" Text="Copy" Name="CopyItem" >
443458
<MenuFlyoutItem.Icon>
444459
<FontIcon Glyph="&#xE8C8;"/>
445460
</MenuFlyoutItem.Icon>
461+
<MenuFlyoutItem.KeyboardAccelerators>
462+
<KeyboardAccelerator Modifiers="Control" Key="C"/>
463+
</MenuFlyoutItem.KeyboardAccelerators>
446464
</MenuFlyoutItem>
447465
<MenuFlyoutSeparator/>
448466
<MenuFlyoutItem Text="Pin to sidebar" Name="SidebarPinItem">

0 commit comments

Comments
 (0)