Add screen selector for OSD notifications

Volumey/DataProvider/AppSettings.cs

@@ -578,6 +578,14 @@ public bool ReactToAllVolumeChanges
 				}
 			}
 
+			[OptionalField]
+			private int selectedScreenIndex;
+			public int SelectedScreenIndex
+			{
+				get => selectedScreenIndex;
+				set => selectedScreenIndex = value;
+			}
+
 			[field: NonSerialized]
 			public event PropertyChangedEventHandler PropertyChanged;
 

Volumey/Helper/NotificationManagerHelper.cs

@@ -89,6 +89,11 @@ internal static void CloseNotificationExample()
 			}
 		}
 
+		internal static void SetWindowWorkArea(double left, double top, double width, double height)
+		{
+			_notificationManager.SetWorkArea(left, top, width, height);
+		}
+
 		internal static void ChangePosition(NotificationPosition newPosition)
 		{
 			_notificationManager.ChangeNotificationAreaPosition(newPosition);

Volumey/Resources/Resources.ru.resx

@@ -251,6 +251,6 @@
     <value>Отображать при любых изменениях звука</value>
   </data>
   <data name="Settings_SelectedScreen" xml:space="preserve">
-    <value>Дисплей для отображения окна</value>
+    <value>Дисплей для отображения</value>
   </data>
 </root>

Volumey/View/SettingsPage/AppBehaviorPage.xaml

@@ -26,16 +26,14 @@
 
 			<TextBlock Text="{lc:Localization Settings_AlwaysTop}"/>
 			<ui:ToggleSwitch IsOn="{Binding AlwaysOnTop}"/>
-
-			<TextBlock
-				Text="{lc:Localization Settings_SelectedScreen}"
-				Width="{StaticResource TextBlockWidth}"/>
-			<ComboBox
-				SelectedItem="{Binding SelectedScreen}"
-				ItemsSource="{Binding AllScreens}"
-				IsSynchronizedWithCurrentItem="False"
-				Style="{StaticResource SettingsComboBoxStyle}"/>
-
+
+			<TextBlock Text="{lc:Localization Settings_SelectedScreen}"
+					   Width="{StaticResource TextBlockWidth}"/>
+			<ComboBox SelectedItem="{Binding SelectedScreen}"
+					  ItemsSource="{Binding AllScreens}"
+					  IsSynchronizedWithCurrentItem="False"
+					  Style="{StaticResource SettingsComboBoxStyle}"/>
+
 		</StackPanel>
 	</StackPanel>
 </ui:Page>

Volumey/View/SettingsPage/NotificationsPage.xaml

@@ -31,6 +31,11 @@
 			EventName="Unloaded">
 			<behaviors:InvokeCommandAction Command="{Binding UnloadedCommand}"/>
 		</behaviors:EventTrigger>
+
+		<behaviors:EventTrigger
+			EventName="Loaded">
+			<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}"/>
+		</behaviors:EventTrigger>
 	</behaviors:Interaction.Triggers>
 
 	<StackPanel>
@@ -43,6 +48,13 @@
 		<TextBlock Text="{lc:Localization Notifications_Position}"/>
 		<ComboBox ItemsSource="{Binding Positions}"
 				  SelectedItem="{Binding SelectedPosition}"/>
+
+		<TextBlock Text="{lc:Localization Settings_SelectedScreen}"
+				   Width="{StaticResource TextBlockWidth}"/>
+		<ComboBox SelectedItem="{Binding SelectedScreen}"
+				  ItemsSource="{Binding AllScreens}"
+				  IsSynchronizedWithCurrentItem="False"
+				  Style="{StaticResource SettingsComboBoxStyle}"/>
 
 		<TextBlock Text="{lc:Localization Notifications_Time}"/>
 		<controls:NumberBox Value="{Binding DisplayTime}"

Volumey/ViewModel/AppBehaviorViewModel.cs

@@ -208,7 +208,7 @@ public ScreenInfo SelectedScreen
 		        if(SettingsProvider.Settings.SelectedScreenIndex != index)
 		        {
 			        SettingsProvider.Settings.SelectedScreenIndex = index;
-			        SettingsProvider.SaveSettings();
+			        _ = SettingsProvider.SaveSettings();
 		        }
 	        }
         }
@@ -327,7 +327,6 @@ private void CheckIfSelectedScreenIsAvailable()
 					});
 				}
 
-				//Hide the window if the selected screen is not available so the user would have to open it again using the available screen
 				if(!screens.Contains(SelectedScreen))
 				{
 					SelectedScreen = screenInfoProvider.GetPrimaryScreenInfo();

Volumey/ViewModel/Settings/NotificationViewModel.cs

@@ -1,7 +1,10 @@
-using System.ComponentModel;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using log4net;
 using Microsoft.Xaml.Behaviors.Core;
 using Notification.Wpf.Controls;
 using Volumey.Helper;
@@ -164,10 +167,41 @@ public int DisplayTime
 		public int MinDisplayTime { get; } = 1;
 
 		public ICommand UnloadedCommand { get; }  
+		public ICommand LoadedCommand { get; }
 
 		public static int MinIndent => NotificationManagerHelper.MinIndent;
 		public static int MaxIndent => NotificationManagerHelper.MaxIndent;
 
+		private ScreenInfo selectedScreen;
+		public ScreenInfo SelectedScreen
+		{
+			get => selectedScreen;
+			set
+			{
+				selectedScreen = value;
+				OnPropertyChanged();
+
+				NotificationManagerHelper.SetWindowWorkArea(value.AbsoluteLeft, value.AbsoluteTop, value.Width, value.Height);
+
+				int index = AllScreens.IndexOf(value);
+				if(SettingsProvider.NotificationsSettings.SelectedScreenIndex != index)
+				{
+					SettingsProvider.NotificationsSettings.SelectedScreenIndex = index;
+					_ = SettingsProvider.SaveSettings();
+				}
+			}
+		}
+
+		public ObservableCollection<ScreenInfo> AllScreens { get; set; } = new ObservableCollection<ScreenInfo>();
+
+		private IScreenInfoProvider _screenInfoProvider = new ScreenInfoProvider();
+		private IDeviceProvider _deviceProvider;
+		private OutputDeviceModel _currentDefaultDevice;
+		private AudioProcessStateNotificationMediator StateMediator = new AudioProcessStateNotificationMediator();
+
+		private static ILog _logger;
+		private static ILog Logger => _logger ??= LogManager.GetLogger(typeof(NotificationViewModel));
+
 		public NotificationViewModel()
 		{
 			this.NotificationsEnabled = SettingsProvider.NotificationsSettings.Enabled;
@@ -177,13 +211,53 @@ public NotificationViewModel()
 			this.ReactToAllVolumeChanges = SettingsProvider.NotificationsSettings.ReactToAllVolumeChanges;
 
 			this.UnloadedCommand = new ActionCommand(() => this.PreviewIsOn = false);
+			this.LoadedCommand = new ActionCommand(this.CheckIfSelectedScreenIsAvailable);
 
 			this.DisplayTime = SettingsProvider.NotificationsSettings.DisplayTimeInSeconds;
+
+			SetSelectedScreen();
+		}
+
+		private void SetSelectedScreen()
+		{
+			foreach(var screen in _screenInfoProvider.GetAllScreensInfo())
+				AllScreens.Add(screen);
+
+			int selectedScreenIndex = SettingsProvider.NotificationsSettings.SelectedScreenIndex;
+			if(AllScreens.Count - 1 < selectedScreenIndex)
+				SelectedScreen = _screenInfoProvider.GetPrimaryScreenInfo();
+			else
+				SelectedScreen = AllScreens[selectedScreenIndex];
+		}
+
+		private void CheckIfSelectedScreenIsAvailable()
+		{
+			Task.Run(() =>
+			{
+				var screens = _screenInfoProvider.GetAllScreensInfo().ToList();
+
+				if(screens.Count != AllScreens.Count || screens.Except(AllScreens).Any())
+				{
+					App.Current.Dispatcher.Invoke(() =>
+					{
+						AllScreens.Clear();
+						foreach(var screen in screens)
+							AllScreens.Add(screen);
+					});
+				}
+
+				if(!screens.Contains(SelectedScreen))
+				{
+					SelectedScreen = _screenInfoProvider.GetPrimaryScreenInfo();
+				}
+			}).ContinueWith(task =>
+			{
+				if(task.Exception != null)
+				{
+					Logger.Error("Failed to check the screen for availability", task.Exception.Flatten());
+				}
+			}, TaskContinuationOptions.OnlyOnFaulted);
 		}
-
-		private IDeviceProvider _deviceProvider;
-		private OutputDeviceModel _currentDefaultDevice;
-		private AudioProcessStateNotificationMediator StateMediator = new AudioProcessStateNotificationMediator();
 
 		private void SetStateMediatorForDefaultDeviceProcesses()
 		{