From ca02b1d674dea67dfef3476de5ec095fb6f77139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20B=C3=BCchel?= Date: Wed, 1 Nov 2023 09:22:24 +0100 Subject: [PATCH] SEBWIN-734: Fixed status info in Action Center WLAN control when WLAN enabled but connected to wired network. --- .../ActionCenter/NetworkControl.xaml.cs | 13 ++++----- .../Controls/Taskbar/NetworkControl.xaml.cs | 28 ++++++++----------- .../ActionCenter/NetworkControl.xaml.cs | 11 ++++---- .../Controls/Taskbar/NetworkControl.xaml.cs | 28 ++++++++----------- 4 files changed, 35 insertions(+), 45 deletions(-) diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NetworkControl.xaml.cs index e6934d17..039b999d 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/NetworkControl.xaml.cs @@ -41,14 +41,16 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter private void InitializeWirelessNetworkControl() { + var lastOpenedBySpacePress = false; var originalBrush = Grid.Background; adapter.Changed += () => Dispatcher.InvokeAsync(Update); Button.Click += (o, args) => Popup.IsOpen = !Popup.IsOpen; - var lastOpenedBySpacePress = false; Button.PreviewKeyDown += (o, args) => { - if (args.Key == System.Windows.Input.Key.Space) // for some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, we record the space bar event and leave the popup open for at least 3 seconds + // For some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, + // we record the space bar event and leave the popup open for at least 3 seconds. + if (args.Key == System.Windows.Input.Key.Space) { lastOpenedBySpacePress = true; } @@ -76,11 +78,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter { if (WirelessNetworksStackPanel.Children.Count > 0) { - var btn = WirelessNetworksStackPanel.Children[0] as NetworkButton; - if (btn != null) - { - btn.SetFocus(); - } + (WirelessNetworksStackPanel.Children[0] as NetworkButton)?.SetFocus(); } })); }; @@ -137,6 +135,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.ActionCenter switch (adapter.Status) { case ConnectionStatus.Connected: + UpdateText(text.Get(TextKey.SystemControl_NetworkWiredConnected)); NetworkStatusIcon.Rotation = 0; NetworkStatusIcon.Source = ImageAwesome.CreateImageSource(FontAwesomeIcon.Globe, Brushes.Green); NetworkStatusIcon.Spin = false; diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NetworkControl.xaml.cs index b1af52c6..2043b529 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/NetworkControl.xaml.cs @@ -42,13 +42,15 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar private void InitializeWirelessNetworkControl() { + var lastOpenedBySpacePress = false; var originalBrush = Button.Background; adapter.Changed += () => Dispatcher.InvokeAsync(Update); - var lastOpenedBySpacePress = false; Button.PreviewKeyDown += (o, args) => { - if (args.Key == System.Windows.Input.Key.Space) // for some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, we record the space bar event and leave the popup open for at least 3 seconds + // For some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, + // we record the space bar event and leave the popup open for at least 3 seconds + if (args.Key == System.Windows.Input.Key.Space) { lastOpenedBySpacePress = true; } @@ -62,6 +64,12 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar } Popup.IsOpen = Popup.IsMouseOver; })); + Popup.Closed += (o, args) => + { + Background = originalBrush; + Button.Background = originalBrush; + lastOpenedBySpacePress = false; + }; Popup.CustomPopupPlacementCallback = new CustomPopupPlacementCallback(Popup_PlacementCallback); Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => { @@ -71,8 +79,6 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar } Popup.IsOpen = IsMouseOver; })); - WirelessIcon.Child = GetWirelessIcon(0); - Popup.Opened += (o, args) => { Background = Brushes.LightGray; @@ -81,21 +87,11 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls.Taskbar { if (WirelessNetworksStackPanel.Children.Count > 0) { - var btn = WirelessNetworksStackPanel.Children[0] as NetworkButton; - if (btn != null) - { - btn.SetFocus(); - } + (WirelessNetworksStackPanel.Children[0] as NetworkButton)?.SetFocus(); } })); }; - - Popup.Closed += (o, args) => - { - Background = originalBrush; - Button.Background = originalBrush; - lastOpenedBySpacePress = false; - }; + WirelessIcon.Child = GetWirelessIcon(0); Update(); } diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NetworkControl.xaml.cs index b01e961a..e72c8ba6 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NetworkControl.xaml.cs @@ -48,7 +48,9 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter var lastOpenedBySpacePress = false; Button.PreviewKeyDown += (o, args) => { - if (args.Key == System.Windows.Input.Key.Space) // for some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, we record the space bar event and leave the popup open for at least 3 seconds + // For some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, + // we record the space bar event and leave the popup open for at least 3 seconds. + if (args.Key == System.Windows.Input.Key.Space) { lastOpenedBySpacePress = true; } @@ -76,11 +78,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter { if (WirelessNetworksStackPanel.Children.Count > 0) { - var btn = WirelessNetworksStackPanel.Children[0] as NetworkButton; - if (btn != null) - { - btn.SetFocus(); - } + (WirelessNetworksStackPanel.Children[0] as NetworkButton)?.SetFocus(); } })); }; @@ -137,6 +135,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter switch (adapter.Status) { case ConnectionStatus.Connected: + UpdateText(text.Get(TextKey.SystemControl_NetworkWiredConnected)); NetworkStatusIcon.Rotation = 0; NetworkStatusIcon.Source = ImageAwesome.CreateImageSource(FontAwesomeIcon.Globe, Brushes.Green); NetworkStatusIcon.Spin = false; diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NetworkControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NetworkControl.xaml.cs index a125249a..537c4145 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NetworkControl.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NetworkControl.xaml.cs @@ -42,14 +42,16 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar private void InitializeWirelessNetworkControl() { + var lastOpenedBySpacePress = false; var originalBrush = Button.Background; adapter.Changed += () => Dispatcher.InvokeAsync(Update); Button.Click += (o, args) => Popup.IsOpen = !Popup.IsOpen; - var lastOpenedBySpacePress = false; Button.PreviewKeyDown += (o, args) => { - if (args.Key == System.Windows.Input.Key.Space) // for some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, we record the space bar event and leave the popup open for at least 3 seconds + // For some reason, the popup immediately closes again if opened by a Space Bar key event - as a mitigation, + // we record the space bar event and leave the popup open for at least 3 seconds. + if (args.Key == System.Windows.Input.Key.Space) { lastOpenedBySpacePress = true; } @@ -62,6 +64,12 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar } Popup.IsOpen = Popup.IsMouseOver; })); + Popup.Closed += (o, args) => + { + Background = originalBrush; + Button.Background = originalBrush; + lastOpenedBySpacePress = false; + }; Popup.CustomPopupPlacementCallback = new CustomPopupPlacementCallback(Popup_PlacementCallback); Popup.MouseLeave += (o, args) => Task.Delay(250).ContinueWith(_ => Dispatcher.Invoke(() => { @@ -71,8 +79,6 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar } Popup.IsOpen = IsMouseOver; })); - WirelessIcon.Child = GetWirelessIcon(0); - Popup.Opened += (o, args) => { Background = Brushes.LightGray; @@ -81,21 +87,11 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar { if (WirelessNetworksStackPanel.Children.Count > 0) { - var btn = WirelessNetworksStackPanel.Children[0] as NetworkButton; - if (btn != null) - { - btn.SetFocus(); - } + (WirelessNetworksStackPanel.Children[0] as NetworkButton)?.SetFocus(); } })); }; - - Popup.Closed += (o, args) => - { - Background = originalBrush; - Button.Background = originalBrush; - lastOpenedBySpacePress = false; - }; + WirelessIcon.Child = GetWirelessIcon(0); Update(); }