Add setting change handling to app so more settings can be changed without a restart

Author: AdamRoden

src/JuliusSweetland.OptiKey.Core/UI/ViewModels/Management/FeaturesViewModel.cs

@@ -385,12 +385,9 @@ public bool ChangesRequireRestart
             get
             {
 
-                return (Settings.Default.Debug != Debug)
+                return Settings.Default.Debug != Debug
                     || Settings.Default.CommuniKatePagesetLocation != CommuniKatePagesetLocation
-                    || Settings.Default.LookToScrollIsDefault != LookToScrollIsDefault
-                    || (Settings.Default.LookToScrollOverlayBoundsThickness
-                        + Settings.Default.LookToScrollOverlayDeadzoneThickness == 0
-                        && LookToScrollOverlayBoundsThickness + LookToScrollOverlayDeadzoneThickness > 0);
+                    || Settings.Default.LookToScrollIsDefault != LookToScrollIsDefault;
             }
         }
 

src/JuliusSweetland.OptiKey.Core/UI/ViewModels/Management/VisualsViewModel.cs

@@ -493,7 +493,7 @@ public string GazeIndicatorStyle
         public int GazeIndicatorSize
         {
             get { return gazeIndicatorSize; }
-            set { SetProperty(ref gazeIndicatorSize, value); }
+            set { Settings.Default.GazeIndicatorSize = value; SetProperty(ref gazeIndicatorSize, value); }
         }
 
         private bool magnifierCenterOnScreen;
@@ -586,10 +586,7 @@ public bool ChangesRequireRestart
             {
                 return Settings.Default.ConversationOnlyMode != ConversationOnlyMode
                     || Settings.Default.ConversationConfirmEnable != ConversationConfirmEnable
-                    || Settings.Default.ConversationConfirmOnlyMode != ConversationConfirmOnlyMode
-                    || Settings.Default.EnableResizeWithMouse != EnableResizeWithMouse
-                    || (Settings.Default.GazeIndicatorStyle == GazeIndicatorStyles.None
-                        && (GazeIndicatorStyles)Enum.Parse(typeof(GazeIndicatorStyles), GazeIndicatorStyle) != GazeIndicatorStyles.None);
+                    || Settings.Default.ConversationConfirmOnlyMode != ConversationConfirmOnlyMode;
             }
         }
 
@@ -719,7 +716,6 @@ public void ApplyChanges()
 
             windowManipulationService.SetOpacity(Settings.Default.MainWindowOpacity);
             Settings.Default.EnableResizeWithMouse = EnableResizeWithMouse;
-            windowManipulationService.SetResizeState();
         }
 
         #endregion

src/JuliusSweetland.OptiKey.Core/UI/Windows/MainWindow.xaml.cs

@@ -46,12 +46,6 @@ public MainWindow(
         {
             InitializeComponent();
 
-            if (Settings.Default.EnableResizeWithMouse
-                && (Settings.Default.MainWindowState == WindowStates.Floating
-                    || Settings.Default.MainWindowState == WindowStates.Docked))
-            {
-                this.ResizeMode = ResizeMode.CanResizeWithGrip;
-            }
             this.audioService = audioService;
             this.dictionaryService = dictionaryService;
             this.inputService = inputService;

src/JuliusSweetland.OptiKey.Pro/App.xaml.cs

@@ -196,15 +196,39 @@ private void App_OnStartup(object sender, StartupEventArgs e)
                 //Show the main window
                 mainWindow.Show();
 
-                if (Settings.Default.LookToScrollOverlayBoundsThickness > 0
-                    || Settings.Default.LookToScrollOverlayDeadzoneThickness > 0)
+                LookToScrollOverlayWindow lookToScrollOverlayWindow = null;
+                OverlayWindow overlayWindow = null;
+
+                void TrySetLookToScrollOverlayWindow()
+                {
+                    if (Settings.Default.LookToScrollOverlayBoundsThickness > 0
+                        || Settings.Default.LookToScrollOverlayDeadzoneThickness > 0)
+                    {
+                        lookToScrollOverlayWindow = lookToScrollOverlayWindow ?? new LookToScrollOverlayWindow(mainViewModel);
+                    }
+                }
+                void TrySetOverlayWindow()
+                {
+                    if (Settings.Default.GazeIndicatorStyle != GazeIndicatorStyles.None)
+                        overlayWindow = overlayWindow ?? new OverlayWindow(mainViewModel);
+                }
+                void TrySetResizeMode()
                 {
-                    // Create the overlay window, but don't show it yet. It'll make itself visible when the conditions are right.
-                    new LookToScrollOverlayWindow(mainViewModel);
+                    mainWindow.ResizeMode = Settings.Default.EnableResizeWithMouse
+                        && (Settings.Default.MainWindowState == WindowStates.Floating
+                            || Settings.Default.MainWindowState == WindowStates.Docked)
+                    ? ResizeMode.CanResizeWithGrip : ResizeMode.NoResize;
                 }
 
-                if (Settings.Default.GazeIndicatorStyle != GazeIndicatorStyles.None)
-                    new OverlayWindow(mainViewModel);
+                // Create the overlay window, but don't show it yet. It'll make itself visible when the conditions are right.
+                TrySetLookToScrollOverlayWindow();
+                TrySetOverlayWindow();
+                TrySetResizeMode();
+
+                Settings.Default.OnPropertyChanges(s => s.LookToScrollOverlayBoundsThickness).Subscribe(value => { TrySetLookToScrollOverlayWindow(); });
+                Settings.Default.OnPropertyChanges(s => s.LookToScrollOverlayDeadzoneThickness).Subscribe(value => { TrySetLookToScrollOverlayWindow(); });
+                Settings.Default.OnPropertyChanges(s => s.GazeIndicatorStyle).Subscribe(value => { TrySetOverlayWindow(); });
+                Settings.Default.OnPropertyChanges(s => s.EnableResizeWithMouse).Subscribe(value => { TrySetResizeMode(); });
 
                 //Display splash screen and check for updates (and display message) after the window has been sized and positioned for the 1st time
                 EventHandler sizeAndPositionInitialised = null;