Merge pull request #113 from HandyOrg/pr/112

Pr/112

src/Shared/HandyControlDemo_Shared/MainWindow.xaml

@@ -1,28 +1,28 @@
 <hc:BlurWindow x:Class="HandyControlDemo.MainWindow"
-                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                     xmlns:hc="https://handyorg.github.io/handycontrol"
+               xmlns:hc="https://handyorg.github.io/handycontrol"
-                     xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
+               xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
-                     xmlns:data="clr-namespace:HandyControlDemo.Data"
+               xmlns:data="clr-namespace:HandyControlDemo.Data"
-                     mc:Ignorable="d"
+               mc:Ignorable="d"
-                     BorderThickness="1"
+               BorderThickness="1"
-                     BorderBrush="#262e2f"
+               BorderBrush="#262e2f"
-                     NonClientAreaBackground="#262e2f"
+               NonClientAreaBackground="#262e2f"
-                     OtherButtonHoverBackground="#888580"
+               OtherButtonHoverBackground="#888580"
-                     CloseButtonForeground="White"
+               CloseButtonForeground="White"
-                     OtherButtonHoverForeground="White"
+               OtherButtonHoverForeground="White"
-                     OtherButtonForeground="White"
+               OtherButtonForeground="White"
-                     Style="{StaticResource WindowBlur}"
+               Style="{StaticResource WindowBlur}"
-                     Title="MainWindow" 
+               Title="MainWindow" 
-                     ResizeMode="CanResizeWithGrip"
+               ResizeMode="CanResizeWithGrip"
-                     WindowStartupLocation="CenterScreen"
+               WindowStartupLocation="CenterScreen"
-                     Name="MyWindow"
+               hc:GlobalShortcut.Host="True"
-                     DataContext="{Binding Main,Source={StaticResource Locator}}"
+               DataContext="{Binding Main,Source={StaticResource Locator}}"
-                     hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
+               hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
-                     d:DesignHeight="800" 
+               d:DesignHeight="800" 
-                     d:DesignWidth="1400">
+               d:DesignWidth="1400">
     <hc:GlobalShortcut.KeyBindings>
         <KeyBinding Modifiers="Control+Alt" Key="I" Command="{Binding Main.GlobalShortcutInfoCmd, Source={StaticResource Locator}}"/>
         <KeyBinding Modifiers="Control+Alt" Key="E" Command="{Binding Main.GlobalShortcutWarningCmd, Source={StaticResource Locator}}"/>

src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs

@@ -2,7 +2,6 @@
 using System.ComponentModel;
 using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
-using HandyControl.Tools;
 using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
 
@@ -22,8 +21,6 @@ namespace HandyControlDemo
             Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
             Messenger.Default.Send(true, MessageToken.FullSwitch);
             Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.OverView}"), MessageToken.LoadShowContent);
-
-            GlobalShortcut.Init(this);
         }
 
         protected override void OnClosing(CancelEventArgs e)

src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs

@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Input;
 using HandyControl.Data;
@@ -7,15 +10,18 @@ namespace HandyControl.Tools
 {
     public class GlobalShortcut
     {
+        private static ObservableCollection<KeyBinding> KeyBindingCollection;
+
         private static readonly Dictionary<string, KeyBinding> CommandDic = new Dictionary<string, KeyBinding>();
 
+        private static void KeyboardHook_KeyDown(object sender, KeyboardHookEventArgs e) => HitTest(e.Key);
+
         static GlobalShortcut()
         {
+
             KeyboardHook.KeyDown += KeyboardHook_KeyDown;
         }
 
-        private static void KeyboardHook_KeyDown(object sender, KeyboardHookEventArgs e) => HitTest(e.Key);
-
         private static void HitTest(Key key)
         {
             if (IsModifierKey(key)) return;
@@ -45,21 +51,26 @@ namespace HandyControl.Tools
                    key == Key.RightCtrl || key == Key.RightAlt || key == Key.RightShift || key == Key.RWin;
         }
 
+        [Obsolete("pls use Host attach property instead of Init method")]
         public static void Init(DependencyObject host)
         {
             CommandDic.Clear();
 
             if (host == null) return;
 
-            var keyBindings = GetKeyBindings(host);
+            KeyBindingCollection = GetKeyBindings(host);
-            if (keyBindings == null || keyBindings.Count == 0) return;
+            if (KeyBindingCollection == null || KeyBindingCollection.Count == 0) return;
 
-            foreach (KeyBinding item in keyBindings)
+            AddKeyBindings(KeyBindingCollection);
+
+            KeyboardHook.Start();
+        }
+
+        private static void AddKeyBindings(IEnumerable<KeyBinding> keyBindings)
+        {
+            foreach (var item in keyBindings)
             {
-                if (item.Key == Key.None)
+                if (item.Key == Key.None) continue;
-                {
-                    continue;
-                }
 
                 if (item.Modifiers == ModifierKeys.None)
                 {
@@ -71,17 +82,45 @@ namespace HandyControl.Tools
                     CommandDic[keyStr] = item;
                 }
             }
+        }
 
+        public static readonly DependencyProperty HostProperty = DependencyProperty.RegisterAttached(
+            "Host", typeof(bool), typeof(GlobalShortcut), new PropertyMetadata(ValueBoxes.FalseBox, OnHostChanged));
+
+        private static void OnHostChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (DesignerHelper.IsInDesignMode) return;
+
+            if (KeyBindingCollection != null)
+            {
+                KeyBindingCollection.CollectionChanged -= KeyBindingCollection_CollectionChanged;
+            }
+            KeyBindingCollection = GetKeyBindings(d);
+            if (KeyBindingCollection != null)
+            {
+                KeyBindingCollection.CollectionChanged += KeyBindingCollection_CollectionChanged;
+            }
+        }
+
+        private static void KeyBindingCollection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            AddKeyBindings(KeyBindingCollection);
             KeyboardHook.Start();
         }
 
-        public static readonly DependencyProperty KeyBindingsProperty = DependencyProperty.RegisterAttached(
+        public static void SetHost(DependencyObject element, bool value)
-            "KeyBindings", typeof(InputBindingCollection), typeof(GlobalShortcut), new PropertyMetadata(new InputBindingCollection()));
+            => element.SetValue(HostProperty, value);
 
-        public static void SetKeyBindings(DependencyObject element, InputBindingCollection value)
+        public static bool GetHost(DependencyObject element)
+            => (bool) element.GetValue(HostProperty);
+
+        public static readonly DependencyProperty KeyBindingsProperty = DependencyProperty.RegisterAttached(
+            "KeyBindings", typeof(ObservableCollection<KeyBinding>), typeof(GlobalShortcut), new PropertyMetadata(new ObservableCollection<KeyBinding>()));
+
+        public static void SetKeyBindings(DependencyObject element, ObservableCollection<KeyBinding> value)
             => element.SetValue(KeyBindingsProperty, value);
 
-        public static InputBindingCollection GetKeyBindings(DependencyObject element)
+        public static ObservableCollection<KeyBinding> GetKeyBindings(DependencyObject element)
-            => (InputBindingCollection) element.GetValue(KeyBindingsProperty);
+            => (ObservableCollection<KeyBinding>) element.GetValue(KeyBindingsProperty);
     }
 }