diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-06-03 14:51:25 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-06-03 14:51:25 +0300 |
| commit | 30ad148902b6c83068f412d1cd4f81a7ce3b32ee (patch) | |
| tree | da892482f944c79da63d62d04338776971dcec0a | |
| parent | 905b4b76c50600851add7f2b95cff2de0f75e1d8 (diff) | |
| download | Tango-30ad148902b6c83068f412d1cd4f81a7ce3b32ee.tar.gz Tango-30ad148902b6c83068f412d1cd4f81a7ce3b32ee.zip | |
Removed local ref in SimulateTouch.UI
4 files changed, 4 insertions, 10 deletions
diff --git a/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml b/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml index 0a3049cb0..5c7075e8a 100644 --- a/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml +++ b/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml @@ -12,11 +12,11 @@ <StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"> <Border Margin="3" Height="45" BorderBrush="Blue" BorderThickness="1" CornerRadius="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"> <TextBlock x:Name="messageTextBlock" Height="45" Width="Auto" Background="Azure" ></TextBlock> - </Border> + </Border> <Border Margin="3" Height="45" BorderBrush="Blue" BorderThickness="1" CornerRadius="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"> <TextBlock x:Name="TouchUpTextBlock" Height="45" Width="Auto" Background="Azure" ></TextBlock> </Border> - <Button Margin="0 20 0 0 " Width="200" PreviewMouseLeftButtonDown="OnButtonLeftButtonDown">Touch Button</Button> + <Button Margin="0 20 0 0 " Width="200" PreviewMouseLeftButtonUp="OnButtonLeftButtonDown">Touch Button</Button> </StackPanel> </Border> </Grid> diff --git a/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml.cs index e652c2e55..33181b13d 100644 --- a/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/Tango.SimulateTouch.UI/MainWindow.xaml.cs @@ -14,7 +14,6 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; using Tango.SimulateTouch.UI.Native; -using Windows.UI.Input.Preview.Injection; using System.Security.Cryptography; namespace Tango.SimulateTouch.UI @@ -70,6 +69,7 @@ namespace Tango.SimulateTouch.UI // Point targetLoc = messageTextBlock.PointToScreen(new Point(0, 0)); // HwndSource source = (HwndSource)HwndSource.FromVisual(messageTextBlock); // IntPtr hWnd = source.Handle; + Console.WriteLine("OnButtonLeftButtonDown"); TouchSimulate ts = new TouchSimulate(); diff --git a/Software/Visual_Studio/Tango.SimulateTouch.UI/Native/TouchSimulate.cs b/Software/Visual_Studio/Tango.SimulateTouch.UI/Native/TouchSimulate.cs index cbe59b35a..05c73217f 100644 --- a/Software/Visual_Studio/Tango.SimulateTouch.UI/Native/TouchSimulate.cs +++ b/Software/Visual_Studio/Tango.SimulateTouch.UI/Native/TouchSimulate.cs @@ -25,6 +25,7 @@ namespace Tango.SimulateTouch.UI.Native public void SimulateTouch(int x, int y) { + Console.WriteLine("SimulateTouch X=" + x + " Y= " + y); // Touch Down Simulate PointerTouchInfo contact = MakePointerTouchInfo(x, y, 5, 1); PointerFlags oFlags = PointerFlags.DOWN | PointerFlags.INRANGE | PointerFlags.INCONTACT; diff --git a/Software/Visual_Studio/Tango.SimulateTouch.UI/Tango.SimulateTouch.UI.csproj b/Software/Visual_Studio/Tango.SimulateTouch.UI/Tango.SimulateTouch.UI.csproj index 3186e86fe..c632e82e0 100644 --- a/Software/Visual_Studio/Tango.SimulateTouch.UI/Tango.SimulateTouch.UI.csproj +++ b/Software/Visual_Studio/Tango.SimulateTouch.UI/Tango.SimulateTouch.UI.csproj @@ -37,10 +37,6 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Data" /> - <Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll</HintPath> - </Reference> <Reference Include="System.Xml" /> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Core" /> @@ -50,9 +46,6 @@ <Reference Include="System.Xaml"> <RequiredTargetFramework>4.0</RequiredTargetFramework> </Reference> - <Reference Include="Windows"> - <HintPath>..\..\..\..\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath> - </Reference> <Reference Include="WindowsBase" /> <Reference Include="PresentationCore" /> <Reference Include="PresentationFramework" /> |
