|
|
|
@ -1054,7 +1054,8 @@ namespace AvalonDock
@@ -1054,7 +1054,8 @@ namespace AvalonDock
|
|
|
|
|
|
|
|
|
|
protected override void OnKeyDown(KeyEventArgs e) |
|
|
|
|
{ |
|
|
|
|
bool isCtrlDown = Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl); |
|
|
|
|
// accept Control or Control+Shift
|
|
|
|
|
bool isCtrlDown = (Keyboard.Modifiers & ~ModifierKeys.Shift) == ModifierKeys.Control; |
|
|
|
|
bool _navigatorWindowIsVisible = navigatorWindow != null ? navigatorWindow.IsVisible : false; |
|
|
|
|
Debug.WriteLine(string.Format("OnKeyDn {0} CtrlDn={1}", e.Key, isCtrlDown)); |
|
|
|
|
|
|
|
|
@ -1078,7 +1079,8 @@ namespace AvalonDock
@@ -1078,7 +1079,8 @@ namespace AvalonDock
|
|
|
|
|
|
|
|
|
|
protected override void OnKeyUp(KeyEventArgs e) |
|
|
|
|
{ |
|
|
|
|
bool isCtrlDown = Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl); |
|
|
|
|
// accept Control or Control+Shift
|
|
|
|
|
bool isCtrlDown = (Keyboard.Modifiers & ~ModifierKeys.Shift) == ModifierKeys.Control; |
|
|
|
|
bool _navigatorWindowIsVisible = navigatorWindow != null ? navigatorWindow.IsVisible : false; |
|
|
|
|
Debug.WriteLine(string.Format("OnKeyUp {0} CtrlDn={1}", e.Key, isCtrlDown)); |
|
|
|
|
|
|
|
|
@ -1091,7 +1093,7 @@ namespace AvalonDock
@@ -1091,7 +1093,7 @@ namespace AvalonDock
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (_navigatorWindowIsVisible) |
|
|
|
|
navigatorWindow.HandleKey(e.Key); |
|
|
|
|
e.Handled = navigatorWindow.HandleKey(e.Key); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|