From 6fc15cddd3b418017874311538bafee0728a122a Mon Sep 17 00:00:00 2001 From: RKrom Date: Fri, 18 May 2012 11:47:27 +0000 Subject: [PATCH] Added the possibility to use the Windows-key as a hotkey, this only works when defined in the ini!! It's currently not possible to define it in the settings GUI. git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1880 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- GreenshotPlugin/Controls/HotkeyControl.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/GreenshotPlugin/Controls/HotkeyControl.cs b/GreenshotPlugin/Controls/HotkeyControl.cs index 35d241221..beee8c3a4 100644 --- a/GreenshotPlugin/Controls/HotkeyControl.cs +++ b/GreenshotPlugin/Controls/HotkeyControl.cs @@ -377,6 +377,9 @@ namespace GreenshotPlugin.Controls { if ((modifierKeyCode & Keys.Shift) > 0) { hotkeyString.Append("Shift").Append(" + "); } + if (modifierKeyCode == Keys.LWin || modifierKeyCode == Keys.RWin) { + hotkeyString.Append("Win").Append(" + "); + } return hotkeyString.ToString(); } @@ -396,6 +399,9 @@ namespace GreenshotPlugin.Controls { if ((modifierKeyCode & Keys.Shift) > 0) { hotkeyString.Append(GetKeyName(Keys.Shift)).Append(" + "); } + if (modifierKeyCode == Keys.LWin || modifierKeyCode == Keys.RWin) { + hotkeyString.Append("Win").Append(" + "); + } return hotkeyString.ToString(); } @@ -412,6 +418,9 @@ namespace GreenshotPlugin.Controls { if (modifiersString.ToLower().Contains("shift")) { modifiers |= Keys.Shift; } + if (modifiersString.ToLower().Contains("win")) { + modifiers |= Keys.LWin; + } } return modifiers; } @@ -459,6 +468,9 @@ namespace GreenshotPlugin.Controls { if ((modifierKeyCode & Keys.Shift) > 0) { modifiers |= (uint)Modifiers.SHIFT; } + if (modifierKeyCode == Keys.LWin || modifierKeyCode == Keys.RWin) { + modifiers |= (uint)Modifiers.WIN; + } if (RegisterHotKey(hotkeyHWND, hotKeyCounter, modifiers, (uint)virtualKeyCode)) { keyHandlers.Add(hotKeyCounter, handler);