Fixed multiple thread safety and stability issues

Author: hawku

TabletDriverGUI/Configuration.cs

@@ -122,6 +122,7 @@ public class TabletViewSettings
             public Point OffsetText;
             public Point OffsetPressure;
             public bool FadeInOut;
+            public bool Borderless;
             public TabletViewSettings()
             {
                 BackgroundColor = "#FFFFFF";
@@ -133,11 +134,12 @@ public TabletViewSettings()
                 InputTrailLength = 30;
                 OutputTrailLength = 30;
                 DrawLength = 0;
-                Font = "Arial";
+                Font = "Segoe UI";
                 FontSize = 25;
                 OffsetPressure = new Point(0, 0);
                 OffsetText = new Point(0, 0);
                 FadeInOut = false;
+                Borderless = false;
             }
         };
         public TabletViewSettings TabletView;

TabletDriverGUI/MainWindow.Areas.cs

@@ -908,18 +908,19 @@ void UpdateAreaInformation()
 
             // Screen area
             labelScreenAreaInfo.Content = areaText +
-                "" + Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedScreenArea.Height, "0.000") + ":1" +
-                " | " + Utils.GetNumberString(config.SelectedScreenArea.Width * config.SelectedScreenArea.Height, "0") + " pixels";
+                Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedScreenArea.Height, "0.000") + ":1 | " +
+                Utils.GetNumberString(config.SelectedScreenArea.Width * config.SelectedScreenArea.Height, "0") + " pixels";
 
             // Tablet area
             labelTabletAreaInfo.Content = areaText +
-                "" + Utils.GetNumberString(config.SelectedTabletArea.Width / config.SelectedTabletArea.Height, "0.000") + ":1" +
-                " | " + Utils.GetNumberString(config.SelectedTabletArea.Width * config.SelectedTabletArea.Height, "0") + " mm²" +
-                " " + Utils.GetNumberString(
+                Utils.GetNumberString(config.SelectedTabletArea.Width / config.SelectedTabletArea.Height, "0.000") + ":1 | " +
+                Utils.GetNumberString(config.SelectedTabletArea.Width * config.SelectedTabletArea.Height, "0") + " mm² " +
+                Utils.GetNumberString(
                     config.SelectedTabletArea.Width * config.SelectedTabletArea.Height /
                     (config.TabletFullArea.Width * config.TabletFullArea.Height) * 100.0
-                    , "0") + "%" +
-                " | " + Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedTabletArea.Width, "0.0") + " x " +
+                    , "0") + "% of " +
+                Utils.GetNumberString(config.TabletFullArea.Width) + "x" + Utils.GetNumberString(config.TabletFullArea.Height) + " mm | " +
+                Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedTabletArea.Width, "0.0") + "x" +
                 Utils.GetNumberString(config.SelectedScreenArea.Height / config.SelectedTabletArea.Height, "0.0") + " px/mm";
 
         }
@@ -995,7 +996,7 @@ private void CanvasArea_MouseUp(object sender, MouseButtonEventArgs e)
             canvasTabletArea.ReleaseMouseCapture();
 
             // Focus
-            if(sender == canvasScreenMap)
+            if (sender == canvasScreenMap)
                 canvasScreenMap.Focus();
             else if (sender == canvasTabletArea)
                 canvasTabletArea.Focus();

TabletDriverGUI/MainWindow.Settings.cs

@@ -1401,17 +1401,6 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
             }
 
 
-            //
-            // Fit window to content
-            //
-            else if (sender == mainMenuFitToContent)
-            {
-                SizeToContent = SizeToContent.WidthAndHeight;
-                UpdateLayout();
-                SizeToContent = SizeToContent.Manual;
-            }
-
-
             //
             // Update desktop image
             //
@@ -1433,6 +1422,15 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
             }
 
 
+            //
+            // Fit window to content
+            //
+            else if (sender == mainMenuFitToContent)
+            {
+                SizeToContent = SizeToContent.WidthAndHeight;
+                UpdateLayout();
+                SizeToContent = SizeToContent.Manual;
+            }
 
         }