Removing WinR (#2381)

microsoft · Apr 24, 2020 · 368640b · 368640b
1 parent 08a7394
commit 368640b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs b/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs
@@ -289,21 +289,24 @@ public void Init(PluginInitContext context)
 
         bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
         {
-            if (_settings.ReplaceWinR)
-            {
-                if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed)
-                {
-                    _winRStroked = true;
-                    OnWinRPressed();
-                    return false;
-                }
-                if (keyevent == (int)KeyEvent.WM_KEYUP && _winRStroked && vkcode == (int)Keys.LWin)
-                {
-                    _winRStroked = false;
-                    _keyboardSimulator.ModifiedKeyStroke(VirtualKeyCode.LWIN, VirtualKeyCode.BACK);
-                    return false;
-                }
-            }
+            // not overriding Win+R 
+            // crutkas we need to earn the right for Win+R override
+
+            //if (_settings.ReplaceWinR)
+            //{
+            //    if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed)
+            //    {
+            //        _winRStroked = true;
+            //        OnWinRPressed();
+            //        return false;
+            //    }
+            //    if (keyevent == (int)KeyEvent.WM_KEYUP && _winRStroked && vkcode == (int)Keys.LWin)
+            //    {
+            //        _winRStroked = false;
+            //        _keyboardSimulator.ModifiedKeyStroke(VirtualKeyCode.LWIN, VirtualKeyCode.BACK);
+            //        return false;
+            //    }
+            //}
             return true;
         }
 

diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Settings.cs b/src/modules/launcher/Plugins/Wox.Plugin.Shell/Settings.cs
@@ -5,7 +5,10 @@ namespace Wox.Plugin.Shell
     public class Settings
     {
         public Shell Shell { get; set; } = Shell.RunCommand;
-        public bool ReplaceWinR { get; set; } = true;
+
+        // not overriding Win+R 
+        // crutkas we need to earn the right for Win+R override
+        public bool ReplaceWinR { get; set; } = false;
         public bool LeaveShellOpen { get; set; }
         public bool RunAsAdministrator { get; set; } = false;