zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-567: Ensured action center and taskbar keyboard activators do not block one another.

Browse source
This commit is contained in:
Damian Büchel 2022-05-11 10:39:03 +02:00
parent 05a4bd126a
commit ee852057ce
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SafeExamBrowser.UserInterface.Shared/Activators/ActionCenterKeyboardActivator.cs
View file

@ -17,8 +17,8 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
{
public class ActionCenterKeyboardActivator : KeyboardActivator, IActionCenterActivator
{
private readonly ILogger logger;
private bool A, LeftWindows;
private ILogger logger;
public event ActivatorEventHandler Activated { add { } remove { } }
public event ActivatorEventHandler Deactivated { add { } remove { } }
@ -56,8 +56,6 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
{
logger.Debug("Detected toggle sequence for action center.");
Toggled?.Invoke();
return true;
}
return false;

10
SafeExamBrowser.UserInterface.Shared/Activators/TaskbarKeyboardActivator.cs
View file

@ -18,7 +18,7 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
public class TaskbarKeyboardActivator : KeyboardActivator, ITaskbarActivator
{
private readonly ILogger logger;
private bool leftWindows;
private bool LeftWindows;
public event ActivatorEventHandler Activated;
@ -34,16 +34,14 @@ namespace SafeExamBrowser.UserInterface.Shared.Activators
if (key == Key.LWin)
{
changed = leftWindows != pressed;
leftWindows = pressed;
changed = LeftWindows != pressed;
LeftWindows = pressed;
}
if (leftWindows && changed)
if (LeftWindows && changed)
{
logger.Debug("Detected activation sequence for taskbar.");
Activated?.Invoke();
return true;
}
return false;