From 7b6eb03e02e89ee384a542e9db7cca216ae1f29b Mon Sep 17 00:00:00 2001
From: Morten Nilsen <morten@runsafe.no>
Date: Wed, 3 Apr 2024 02:57:48 +0200
Subject: [PATCH] Fix breakage of privacy mode shortcuts

---
 src/BrowserPicker.App/View/BrowserList.xaml    | 18 ++++++++++++------
 src/BrowserPicker.App/View/MainWindow.xaml.cs  | 14 ++++++++++----
 .../ViewModel/BrowserViewModel.cs              | 11 +++++++++++
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/BrowserPicker.App/View/BrowserList.xaml b/src/BrowserPicker.App/View/BrowserList.xaml
index a2e2677..6ab7326 100644
--- a/src/BrowserPicker.App/View/BrowserList.xaml
+++ b/src/BrowserPicker.App/View/BrowserList.xaml
@@ -100,7 +100,7 @@
 					<DataTemplate DataType="viewModel:BrowserViewModel">
 						<Button Command="{Binding Select}" CommandParameter="{Binding Path=DataContext.Url.TargetURL,RelativeSource={RelativeSource AncestorType={x:Type ScrollViewer}}}"  Margin="2">
 							<Button.Style>
-								<Style>
+								<Style TargetType="Button">
 									<Setter Property="UIElement.Visibility" Value="Visible" />
 									<Style.Triggers>
 										<DataTrigger Binding="{Binding Model.Disabled}" Value="True">
@@ -170,16 +170,22 @@
 															<Trigger Property="IsEnabled" Value="False">
 																<Setter Property="UIElement.Visibility" Value="Collapsed" />
 															</Trigger>
-															<DataTrigger Binding="{Binding Path=DataContext.AltPressed, RelativeSource={RelativeSource AncestorType=UserControl}}">
-																<Setter Property="BorderBrush" Value="White" />
-																<Setter Property="BorderThickness" Value="1" />
-															</DataTrigger>
 														</Style.Triggers>
 													</Style>
 												</Button.Style>
 												<Button.Template>
 													<ControlTemplate>
-														<Border Margin="10" Padding="10" Background="#22ffffff" Width="40" Height="40" CornerRadius="5">
+														<Border Margin="10" Padding="10" Background="#22ffffff" Width="40" Height="40" CornerRadius="5" BorderThickness="2">
+															<Border.Style>
+																<Style TargetType="Border">
+																	<Style.Triggers>
+																		<DataTrigger Binding="{Binding AltPressed}" Value="True">
+																			<Setter Property="BorderBrush" Value="White" />
+																			<Setter Property="BorderThickness" Value="1" />
+																		</DataTrigger>
+																	</Style.Triggers>
+																</Style>
+															</Border.Style>
 															<Image Source="{StaticResource PrivacyShield}" HorizontalAlignment="Center" VerticalAlignment="Center" />
 														</Border>
 													</ControlTemplate>
diff --git a/src/BrowserPicker.App/View/MainWindow.xaml.cs b/src/BrowserPicker.App/View/MainWindow.xaml.cs
index d31bef1..9152023 100644
--- a/src/BrowserPicker.App/View/MainWindow.xaml.cs
+++ b/src/BrowserPicker.App/View/MainWindow.xaml.cs
@@ -21,7 +21,7 @@ public MainWindow()
 	private void MainWindow_OnKeyDown(object sender, KeyEventArgs e)
 	{
 		ViewModel.AltPressed = Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt);
-		}
+	}
 
 	private void MainWindow_OnKeyUp(object sender, KeyEventArgs e)
 	{
@@ -37,7 +37,7 @@ private void MainWindow_OnKeyUp(object sender, KeyEventArgs e)
 
 			int n;
 			// ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
-			switch (e.Key)
+			switch (e.Key == Key.System ? e.SystemKey : e.Key)
 			{
 				case Key.Enter:
 				case Key.D1: n = 1; break;
@@ -58,8 +58,14 @@ private void MainWindow_OnKeyUp(object sender, KeyEventArgs e)
 			if (choices.Length < n)
 				return;
 
-			var privacy = Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt);
-			choices[n - 1].Select.Execute(privacy);
+			if (ViewModel.AltPressed)
+			{
+				choices[n - 1].SelectPrivacy.Execute(null);
+			}
+			else
+			{
+				choices[n - 1].Select.Execute(null);
+			}
 		}
 		catch
 		{
diff --git a/src/BrowserPicker.App/ViewModel/BrowserViewModel.cs b/src/BrowserPicker.App/ViewModel/BrowserViewModel.cs
index 72a3e1d..cdacbbb 100644
--- a/src/BrowserPicker.App/ViewModel/BrowserViewModel.cs
+++ b/src/BrowserPicker.App/ViewModel/BrowserViewModel.cs
@@ -20,6 +20,15 @@ public BrowserViewModel(BrowserModel model, ApplicationViewModel viewModel) : ba
 	{
 		model.PropertyChanged += Model_PropertyChanged;
 		parent_view_model = viewModel;
+		parent_view_model.PropertyChanged += OnParentViewModelChanged;
+	}
+
+	private void OnParentViewModelChanged(object sender, PropertyChangedEventArgs e)
+	{
+		if (e.PropertyName == nameof(ApplicationViewModel.AltPressed))
+		{
+			OnPropertyChanged(nameof(AltPressed));
+		}
 	}
 
 	private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -112,6 +121,8 @@ public bool IsRunning
 		}
 	}
 
+	public bool AltPressed => parent_view_model.AltPressed;
+
 	private bool CanLaunch(bool privacy)
 	{
 		return !string.IsNullOrWhiteSpace(parent_view_model.Url?.TargetURL) && !(privacy && Model.PrivacyArgs == null);