From 0bed63ac53fba1237189a4e5effdce0654274b65 Mon Sep 17 00:00:00 2001 From: sk-zk Date: Thu, 20 Feb 2020 15:16:08 +0100 Subject: [PATCH] Add Mouse DPI to Tablet Area conversion --- TabletDriverGUI/MainWindow.Areas.cs | 24 +++++++++- TabletDriverGUI/MainWindow.xaml | 12 ++++- TabletDriverGUI/TabletDriverGUI.csproj | 7 +++ TabletDriverGUI/WindowConvertMouse.xaml | 28 +++++++++++ TabletDriverGUI/WindowConvertMouse.xaml.cs | 54 ++++++++++++++++++++++ 5 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 TabletDriverGUI/WindowConvertMouse.xaml create mode 100644 TabletDriverGUI/WindowConvertMouse.xaml.cs diff --git a/TabletDriverGUI/MainWindow.Areas.cs b/TabletDriverGUI/MainWindow.Areas.cs index a660d7d..9904e28 100644 --- a/TabletDriverGUI/MainWindow.Areas.cs +++ b/TabletDriverGUI/MainWindow.Areas.cs @@ -1514,7 +1514,29 @@ private void CanvasArea_ContextMenuOpening(object sender, ContextMenuEventArgs e } - + private void ConvertMouse_Click(object sender, RoutedEventArgs e) + { + var wcm = new WindowConvertMouse(); + wcm.ShowDialog(); + if (!wcm.DialogResult.HasValue || !wcm.DialogResult.Value) return; + + const double inchesToMm = 25.4; + var width = config.DesktopSize.Width / wcm.Dpi * inchesToMm; + var height = config.DesktopSize.Height / wcm.Dpi * inchesToMm; + var x = config.TabletFullArea.Width / 2; + var y = config.TabletFullArea.Height / 2; + + textTabletAreaWidth.Text = width.ToString(); + textTabletAreaHeight.Text = height.ToString(); + textTabletAreaX.Text = x.ToString(); + textTabletAreaY.Text = y.ToString(); + config.SelectedTabletArea.Width = width; + config.SelectedTabletArea.Height = height; + config.SelectedTabletArea.X = x; + config.SelectedTabletArea.Y = y; + + UpdateSettingsToConfiguration(); + } #region Wacom / Draw area diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml index f20350b..20a4af3 100644 --- a/TabletDriverGUI/MainWindow.xaml +++ b/TabletDriverGUI/MainWindow.xaml @@ -411,7 +411,17 @@ - + + + + WindowConvertMouse.xaml + WindowTabletViewSettings.xaml @@ -106,6 +109,10 @@ WindowAreaEditor.xaml + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/TabletDriverGUI/WindowConvertMouse.xaml b/TabletDriverGUI/WindowConvertMouse.xaml new file mode 100644 index 0000000..4d6fa62 --- /dev/null +++ b/TabletDriverGUI/WindowConvertMouse.xaml @@ -0,0 +1,28 @@ + + + + + + + + +