From 89401df6f6ff7a13e62415e9bb8eb5017e8bb58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20B=C3=BCchel?= <damian.buechel@let.ethz.ch>
Date: Thu, 27 Oct 2022 13:06:49 +0200
Subject: [PATCH] Implemented visual indication for active applications in
 taskbar.

---
 .../Controls/Taskbar/ApplicationControl.xaml              | 3 +++
 .../Controls/Taskbar/ApplicationControl.xaml.cs           | 8 ++++++--
 .../Controls/Taskbar/ApplicationControl.xaml              | 3 +++
 .../Controls/Taskbar/ApplicationControl.xaml.cs           | 8 ++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml
index 602cc6d0..365307cd 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml
+++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml
@@ -24,5 +24,8 @@
             </Border>
         </Popup>
         <Button x:Name="Button" Background="{StaticResource BackgroundBrush}" Padding="4" Template="{StaticResource TaskbarButton}" Width="50" />
+        <Grid>
+            <Rectangle x:Name="ActiveBar" Cursor="Hand" Height="2.5" Width="40" VerticalAlignment="Bottom" Fill="DodgerBlue" Visibility="Collapsed" />
+        </Grid>
     </Grid>
 </UserControl>
diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs
index b29f118c..eb3c1a31 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/ApplicationControl.xaml.cs
@@ -21,7 +21,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
 {
 	internal partial class ApplicationControl : UserControl, IApplicationControl
 	{
-		private IApplication application;
+		private readonly IApplication application;
 		private IApplicationWindow single;
 
 		internal ApplicationControl(IApplication application)
@@ -38,22 +38,25 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
 
 			application.WindowsChanged += Application_WindowsChanged;
 
+			ActiveBar.MouseLeave += (o, args) => WindowPopup.IsOpen &= WindowPopup.IsMouseOver || Button.IsMouseOver;
 			Button.Click += Button_Click;
 			Button.Content = IconResourceLoader.Load(application.Icon);
 			Button.MouseEnter += (o, args) => WindowPopup.IsOpen = WindowStackPanel.Children.Count > 0;
-			Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => WindowPopup.IsOpen = WindowPopup.IsMouseOver));
+			Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => WindowPopup.IsOpen = WindowPopup.IsMouseOver || ActiveBar.IsMouseOver));
 			Button.ToolTip = application.Tooltip;
 			WindowPopup.CustomPopupPlacementCallback = new CustomPopupPlacementCallback(WindowPopup_PlacementCallback);
 			WindowPopup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => WindowPopup.IsOpen = IsMouseOver));
 
 			WindowPopup.Opened += (o, args) =>
 			{
+				ActiveBar.Width = double.NaN;
 				Background = Brushes.LightGray;
 				Button.Background = Brushes.LightGray;
 			};
 
 			WindowPopup.Closed += (o, args) =>
 			{
+				ActiveBar.Width = 40;
 				Background = originalBrush;
 				Button.Background = originalBrush;
 			};
@@ -88,6 +91,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar
 		{
 			var windows = application.GetWindows();
 
+			ActiveBar.Visibility = windows.Any() ? Visibility.Visible : Visibility.Collapsed;
 			WindowStackPanel.Children.Clear();
 
 			foreach (var window in windows)
diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml
index 6a42777c..aa99b9cc 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml
@@ -24,5 +24,8 @@
             </Border>
         </Popup>
         <Button x:Name="Button" Background="{StaticResource BackgroundBrush}" Padding="4" Template="{StaticResource TaskbarButton}" Width="60" />
+        <Grid>
+            <Rectangle x:Name="ActiveBar" Cursor="Hand" Height="2.5" Width="40" VerticalAlignment="Bottom" Fill="DodgerBlue" Visibility="Collapsed" />
+        </Grid>
     </Grid>
 </UserControl>
diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml.cs
index 94fdacf2..195043af 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml.cs
@@ -21,7 +21,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
 	internal partial class ApplicationControl : UserControl, IApplicationControl
 	{
-		private IApplication application;
+		private readonly IApplication application;
 		private IApplicationWindow single;
 
 		internal ApplicationControl(IApplication application)
@@ -38,22 +38,25 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 
 			application.WindowsChanged += Application_WindowsChanged;
 
+			ActiveBar.MouseLeave += (o, args) => WindowPopup.IsOpen &= WindowPopup.IsMouseOver || Button.IsMouseOver;
 			Button.Click += Button_Click;
 			Button.Content = IconResourceLoader.Load(application.Icon);
 			Button.MouseEnter += (o, args) => WindowPopup.IsOpen = WindowStackPanel.Children.Count > 0;
-			Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => WindowPopup.IsOpen = WindowPopup.IsMouseOver));
+			Button.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => WindowPopup.IsOpen = WindowPopup.IsMouseOver || ActiveBar.IsMouseOver));
 			Button.ToolTip = application.Tooltip;
 			WindowPopup.CustomPopupPlacementCallback = new CustomPopupPlacementCallback(WindowPopup_PlacementCallback);
 			WindowPopup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => WindowPopup.IsOpen = IsMouseOver));
 
 			WindowPopup.Opened += (o, args) =>
 			{
+				ActiveBar.Width = double.NaN;
 				Background = Brushes.LightGray;
 				Button.Background = Brushes.LightGray;
 			};
 
 			WindowPopup.Closed += (o, args) =>
 			{
+				ActiveBar.Width = 40;
 				Background = originalBrush;
 				Button.Background = originalBrush;
 			};
@@ -88,6 +91,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 		{
 			var windows = application.GetWindows();
 
+			ActiveBar.Visibility = windows.Any() ? Visibility.Visible : Visibility.Collapsed;
 			WindowStackPanel.Children.Clear();
 
 			foreach (var window in windows)