diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-03-25 23:04:55 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-03-25 23:04:55 +0200 |
| commit | e005d78606ff024eb25bb34d7b7afe41203f9849 (patch) | |
| tree | 37251cc248ed79153443d7706b41062a7016c16e /Software/Visual_Studio | |
| parent | aa3665f81ffaebedb78c1e1fe383f38579af30af (diff) | |
| parent | 86adc559ab56c3472b97b408512f9d39480525c1 (diff) | |
| download | Tango-e005d78606ff024eb25bb34d7b7afe41203f9849.tar.gz Tango-e005d78606ff024eb25bb34d7b7afe41203f9849.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.RemoteDesktop/ScreenCaptureEngine.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml index ef9667b6d..aac712f59 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml @@ -12,7 +12,7 @@ xmlns:tfs="clr-namespace:Tango.TFS;assembly=Tango.TFS" xmlns:tfss="clr-namespace:Tango.MachineStudio.UI.TFS" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" - mc:Ignorable="d" Width="530" Height="720" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}"> + mc:Ignorable="d" Width="530" Height="660" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ReportIssueViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}"> <UserControl.Resources> <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" /> diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/ScreenCaptureEngine.cs b/Software/Visual_Studio/Tango.RemoteDesktop/ScreenCaptureEngine.cs index 8920b983b..527b54b7d 100644 --- a/Software/Visual_Studio/Tango.RemoteDesktop/ScreenCaptureEngine.cs +++ b/Software/Visual_Studio/Tango.RemoteDesktop/ScreenCaptureEngine.cs @@ -70,7 +70,7 @@ namespace Tango.RemoteDesktop public ScreenCaptureEngine(IBitmapComparer<TFrame> comparer) { FrameRate = 10; - CaptureMethod = new CaptureMethods.DirectXScreenCapture(); + CaptureMethod = new CaptureMethods.GdiScreenCapture(); CaptureRegion = new CaptureRegion(System.Windows.Forms.Screen.PrimaryScreen.Bounds); Comparer = comparer; CaptureCursor = true; |