Merge pull request #141 from laurentkempe/feature/close-esc-key

Add possibility to close popup with ESC key

Author: laurentkempe

GitDiffMargin/GitDiffMargin.csproj

@@ -226,6 +226,7 @@
     <Compile Include="View\EditorDiffMarginControl.xaml.cs">
       <DependentUpon>EditorDiffMarginControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\PopupKeyboardBehavior.cs" />
     <Compile Include="View\ScrollDiffMarginControl.xaml.cs">
       <DependentUpon>ScrollDiffMarginControl.xaml</DependentUpon>
     </Compile>

GitDiffMargin/View/EditorDiffMarginControl.xaml

@@ -4,6 +4,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:viewModel="clr-namespace:GitDiffMargin.ViewModel"
+             xmlns:view="clr-namespace:GitDiffMargin.View"
              Cursor="Hand"
              ClipToBounds="True"
              d:DataContext="{d:DesignInstance viewModel:EditorDiffMarginViewModel}"
@@ -65,7 +66,14 @@
                    IsOpen="{Binding ShowPopup, Mode=TwoWay}"
                    Placement="MousePoint"
                    PlacementTarget="{Binding ElementName=diffControl}"
-                   StaysOpen="False">
+                   StaysOpen="False"
+                   view:PopupAllowKeyboardInput.IsEnabled="True">
+              <Popup.CommandBindings>
+                <CommandBinding Command="Close" Executed="Popup_Close" />
+              </Popup.CommandBindings>
+              <Popup.InputBindings>
+                <KeyBinding Key="Escape" Command="Close" />
+              </Popup.InputBindings>
               <Border Background="Transparent">
                 <StackPanel Orientation="Vertical">
                   <Border HorizontalAlignment="Left"
@@ -92,8 +100,7 @@
                              Background="{Binding Background, Mode=OneWay}"
                              Foreground="{Binding Foreground, Mode=OneWay}"
                              VerticalScrollBarVisibility="Auto"
-                             HorizontalScrollBarVisibility="Auto"
-                             />
+                             HorizontalScrollBarVisibility="Auto" />
                   </Border>
                 </StackPanel>
               </Border>

GitDiffMargin/View/EditorDiffMarginControl.xaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Threading; 
 using GitDiffMargin.ViewModel;
@@ -43,6 +44,13 @@ private void Button_MouseDoubleClick(object sender, MouseButtonEventArgs e)
             editorDiffViewModel?.ShowDifferenceCommand.Execute(null);
         }
 
+        private void Popup_Close(object sender, ExecutedRoutedEventArgs e)
+        {
+            if (!(sender is Popup popup)) return;
+
+            popup.IsOpen = false;
+        }
+
         private static void DoubleClick(object sender, EventArgs e)
         {
             ClickWaitTimer.Stop();

GitDiffMargin/View/PopupKeyboardBehavior.cs

@@ -0,0 +1,75 @@
+/* The MIT License
+ *   
+ * Copyright (C) 2013 Mike Ward (http://mike-ward.net)  
+ *   
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of  
+ * this software and associated documentation files (the "Software"), to deal in   
+ * the Software without restriction, including without limitation the rights to   
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies   
+ * of the Software, and to permit persons to whom the Software is furnished to do   
+ * so, subject to the following conditions:  
+ *   
+ * The above copyright notice and this permission notice shall be included in all   
+ * copies or substantial portions of the Software.  
+ *   
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR   
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER   
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,  
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE  
+ * SOFTWARE.  
+ */
+
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace GitDiffMargin.View
+{
+    public class PopupAllowKeyboardInput
+    {
+        public static readonly DependencyProperty IsEnabledProperty =
+            DependencyProperty.RegisterAttached(
+                "IsEnabled",
+                typeof(bool),
+                typeof(PopupAllowKeyboardInput),
+                new PropertyMetadata(default(bool), IsEnabledChanged));
+
+        public static bool GetIsEnabled(DependencyObject d)
+        {
+            return (bool)d.GetValue(IsEnabledProperty);
+        }
+
+        public static void SetIsEnabled(DependencyObject d, bool value)
+        {
+            d.SetValue(IsEnabledProperty, value);
+        }
+
+        private static void IsEnabledChanged(DependencyObject sender, DependencyPropertyChangedEventArgs ea)
+        {
+            EnableKeyboardInput((Popup)sender, (bool)ea.NewValue);
+        }
+
+        private static void EnableKeyboardInput(Popup popup, bool enabled)
+        {
+            if (!enabled) return;
+
+            IInputElement element = null;
+            popup.Loaded += (sender, args) =>
+            {
+                popup.Child.Focusable = true;
+                popup.Child.IsVisibleChanged += (o, ea) =>
+                {
+                    if (popup.Child.IsVisible)
+                    {
+                        element = Keyboard.FocusedElement;
+                        Keyboard.Focus(popup.Child);
+                    }
+                };
+            };
+
+            popup.Closed += (sender, args) => Keyboard.Focus(element);
+        }
+    }
+}