Replacing TerminalOptionsChanged event with MVVMLight Messenger implementation. (#521)

FluentTerminal.App.ViewModels/MainViewModel.cs

@@ -39,9 +39,9 @@ namespace FluentTerminal.App.ViewModels
             MessengerInstance.Register<ShellProfileDeletedMessage>(this, OnShellProfileDeleted);
             MessengerInstance.Register<SshProfileAddedMessage>(this, OnSshProfileAdded);
             MessengerInstance.Register<SshProfileDeletedMessage>(this, OnSshProfileDeleted);
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
 
             _settingsService = settingsService;
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
 
             _trayProcessCommunicationService = trayProcessCommunicationService;
             _dialogService = dialogService;
@@ -112,8 +112,6 @@ namespace FluentTerminal.App.ViewModels
         {
             MessengerInstance.Unregister(this);
 
-            _settingsService.TerminalOptionsChanged -= OnTerminalOptionsChanged;
-
             ApplicationView.CloseRequested -= OnCloseRequest;
             ApplicationView.Closed -= OnClosed;
             Terminals.CollectionChanged -= OnTerminalsCollectionChanged;
@@ -580,11 +578,11 @@ namespace FluentTerminal.App.ViewModels
             }
         }
 
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private async void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
         {
             await ApplicationView.RunOnDispatcherThread(() =>
             {
-                BackgroundOpacity = e.BackgroundOpacity;
+                BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
             });
         }
 

FluentTerminal.App.ViewModels/Settings/ThemesPageViewModel.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+using FluentTerminal.Models.Messages;
 
 namespace FluentTerminal.App.ViewModels.Settings
 {
@@ -36,7 +37,7 @@ namespace FluentTerminal.App.ViewModels.Settings
             ImportThemeCommand = new AsyncCommand(ImportTheme);
             CloneCommand = new RelayCommand<ThemeViewModel>(CloneTheme);
 
-            _settingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
 
             BackgroundOpacity = _settingsService.GetTerminalOptions().BackgroundOpacity;
 
@@ -182,9 +183,9 @@ namespace FluentTerminal.App.ViewModels.Settings
             }
         }
 
-        private void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
         {
-            BackgroundOpacity = e.BackgroundOpacity;
+            BackgroundOpacity = message.TerminalOptions.BackgroundOpacity;
         }
 
         private void OnSelectedThemeBackgroundChanged(object sender, string e)

FluentTerminal.App.ViewModels/TerminalViewModel.cs

@@ -99,9 +99,9 @@ namespace FluentTerminal.App.ViewModels
         {
             MessengerInstance.Register<ApplicationSettingsChangedMessage>(this, OnApplicationSettingsChanged);
             MessengerInstance.Register<CurrentThemeChangedMessage>(this, OnCurrentThemeChanged);
+            MessengerInstance.Register<TerminalOptionsChangedMessage>(this, OnTerminalOptionsChanged);
 
             SettingsService = settingsService;
-            SettingsService.TerminalOptionsChanged += OnTerminalOptionsChanged;
 
             _terminalOptions = SettingsService.GetTerminalOptions();
 
@@ -163,7 +163,6 @@ namespace FluentTerminal.App.ViewModels
         public event EventHandler Closed;
         public event EventHandler<string> FindNextRequested;
         public event EventHandler<string> FindPreviousRequested;
-        public event EventHandler<TerminalOptions> OptionsChanged;
         public event EventHandler SearchStarted;
         public event EventHandler<TerminalTheme> ThemeChanged;
         public event EventHandler<string> ShellTitleChanged;
@@ -360,7 +359,6 @@ namespace FluentTerminal.App.ViewModels
         {
             MessengerInstance.Unregister(this);
 
-            SettingsService.TerminalOptionsChanged -= OnTerminalOptionsChanged;
             return Terminal.Close();
         }
 
@@ -479,10 +477,9 @@ namespace FluentTerminal.App.ViewModels
             });
         }
 
-        private async void OnTerminalOptionsChanged(object sender, TerminalOptions e)
+        private void OnTerminalOptionsChanged(TerminalOptionsChangedMessage message)
         {
-            _terminalOptions = e;
-            await ApplicationView.RunOnDispatcherThread(() => OptionsChanged?.Invoke(this, e));
+            _terminalOptions = message.TerminalOptions;
         }
 
         private void SelectTabTheme(string id)