Skip to content

Commit fcd3474

Browse files
authored
Merge pull request #1059 from IbraheemOsama/GridSplitterFocusTrap
Grid splitter focus trap
2 parents e635245 + 075844a commit fcd3474

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void Gripper_KeyDown(object sender, KeyRoutedEventArgs e)
9595
return;
9696
}
9797

98-
if (gripper.ResizeDirection == GridSplitter.GridResizeDirection.Rows)
98+
if (gripper.ResizeDirection == GridResizeDirection.Rows)
9999
{
100100
if (e.Key == VirtualKey.Up)
101101
{

Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitterGripper.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
1212

13-
using System;
14-
using Windows.System;
15-
using Windows.UI.Core;
1613
using Windows.UI.Xaml;
1714
using Windows.UI.Xaml.Controls;
1815
using Windows.UI.Xaml.Media;
@@ -31,10 +28,6 @@ internal class GridSplitterGripper : ContentControl
3128

3229
public GridSplitter.GridResizeDirection ResizeDirection { get; private set; }
3330

34-
internal Action<double> OnKeyboardHorizontalMoveAction { get; set; }
35-
36-
internal Action<double> OnKeyboardVerticalMoveAction { get; set; }
37-
3831
internal Brush GripperForeground
3932
{
4033
set
@@ -55,6 +48,7 @@ internal GridSplitterGripper(GridSplitter.GridResizeDirection gridSplitterDirect
5548
VerticalContentAlignment = VerticalAlignment.Stretch;
5649
IsTabStop = true;
5750
UseSystemFocusVisuals = true;
51+
IsFocusEngagementEnabled = true;
5852
}
5953

6054
internal GridSplitterGripper(

0 commit comments

Comments
 (0)