Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 14 insertions, 24 deletions

diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/Input/KeyboardController.cs b/Software/Visual_Studio/Tango.RemoteDesktop/Input/KeyboardController.cs
index 832018dac..0c077f1d3 100644
--- a/Software/Visual_Studio/Tango.RemoteDesktop/Input/KeyboardController.cs
+++ b/Software/Visual_Studio/Tango.RemoteDesktop/Input/KeyboardController.cs
@@ -50,30 +50,7 @@ namespace Tango.RemoteDesktop.Input
         public static void KeyUp(Key key, bool ctrlDown, bool shitDown, bool altDown)
         {
             VirtualKeyCode virtualKey = (VirtualKeyCode)KeyInterop.VirtualKeyFromKey(key);
-
-            if (ctrlDown || shitDown || altDown)
-            {
-                List<VirtualKeyCode> modifierKeys = new List<VirtualKeyCode>();
-
-                if (ctrlDown)
-                {
-                    modifierKeys.Add(VirtualKeyCode.LCONTROL);
-                }
-                if (shitDown)
-                {
-                    modifierKeys.Add(VirtualKeyCode.LSHIFT);
-                }
-                if (altDown)
-                {
-                    modifierKeys.Add(VirtualKeyCode.MENU);
-                }
-
-                simulator.Keyboard.ModifiedKeyStroke(modifierKeys, virtualKey);
-            }
-            else
-            {
-                simulator.Keyboard.KeyUp(virtualKey);
-            }
+            simulator.Keyboard.KeyUp(virtualKey);
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/Input/MouseController.cs b/Software/Visual_Studio/Tango.RemoteDesktop/Input/MouseController.cs
index ec556f88c..ce3a3eb09 100644
--- a/Software/Visual_Studio/Tango.RemoteDesktop/Input/MouseController.cs
+++ b/Software/Visual_Studio/Tango.RemoteDesktop/Input/MouseController.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using WindowsInput;
 
 namespace Tango.RemoteDesktop.Input
 {
@@ -33,6 +34,13 @@ namespace Tango.RemoteDesktop.Input
         [DllImport("user32.dll")]
         private static extern void mouse_event(int dwFlags, int dx, int dy, int dwData, int dwExtraInfo);
 
+        private static InputSimulator simulator;
+
+        static MouseController()
+        {
+            simulator = new InputSimulator();
+        }
+
         public static void SetCursorPosition(int x, int y)
         {
             SetCursorPos(x, y);
@@ -64,6 +72,11 @@ namespace Tango.RemoteDesktop.Input
                 ;
         }
 
+        public static void DoubleClick()
+        {
+            simulator.Mouse.LeftButtonDoubleClick();
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         public struct MousePoint
         {