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

SEBWIN-587: Perform forward search on enter.

Browse source
This commit is contained in:
Damian Büchel 2022-08-09 15:37:50 +02:00
parent 29547179c5
commit 5129c2cb43
3 changed files with 108 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Browser/Handlers/KeyboardHandler.cs
View file

@ -63,7 +63,7 @@ namespace SafeExamBrowser.Browser.Handlers
ZoomResetRequested?.Invoke(); ZoomResetRequested?.Invoke();
} }
if (keyCode == (int)Keys.Tab && keyCode == currentKeyDown) if (keyCode == (int) Keys.Tab && keyCode == currentKeyDown)
{ {
TabPressed?.Invoke(shift); TabPressed?.Invoke(shift);
} }

109
SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
View file

@ -114,6 +114,51 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
}); });
} }
public void FocusToolbar(bool forward)
{
Dispatcher.BeginInvoke((Action) (async () =>
{
Activate();
await Task.Delay(50);
// focus all elements in the toolbar, such that the last element that is enabled gets focus
var buttons = new System.Windows.Controls.Control[] { ForwardButton, BackwardButton, ReloadButton, UrlTextBox, MenuButton, };
for (var i = forward ? 0 : buttons.Length - 1; i >= 0 && i < buttons.Length; i += forward ? 1 : -1)
{
if (buttons[i].IsEnabled && buttons[i].Visibility == Visibility.Visible)
{
buttons[i].Focus();
break;
}
}
}));
}
public void FocusBrowser()
{
Dispatcher.BeginInvoke((Action) (async () =>
{
FocusToolbar(false);
await Task.Delay(100);
browserControlGetsFocusFromTaskbar = true;
var focusedElement = FocusManager.GetFocusedElement(this) as UIElement;
focusedElement.MoveFocus(new TraversalRequest(FocusNavigationDirection.Right));
await Task.Delay(150);
browserControlGetsFocusFromTaskbar = false;
}));
}
public void FocusAddressBar()
{
Dispatcher.BeginInvoke((Action) (() =>
{
UrlTextBox.Focus();
}));
}
public new void Hide() public new void Hide()
{ {
Dispatcher.Invoke(base.Hide); Dispatcher.Invoke(base.Hide);
@ -199,7 +244,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
ZoomLevel.Text = $"{value}%"; ZoomLevel.Text = $"{value}%";
var zoomButtonHelpText = this.text.Get(TextKey.BrowserWindow_ZoomLevelReset).Replace("%%ZOOM%%", value.ToString("0")); var zoomButtonHelpText = text.Get(TextKey.BrowserWindow_ZoomLevelReset).Replace("%%ZOOM%%", value.ToString("0"));
ZoomResetButton.SetValue(System.Windows.Automation.AutomationProperties.HelpTextProperty, zoomButtonHelpText); ZoomResetButton.SetValue(System.Windows.Automation.AutomationProperties.HelpTextProperty, zoomButtonHelpText);
}); });
} }
@ -232,7 +277,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
if (control.IsKeyboardFocusWithin) if (control.IsKeyboardFocusWithin)
{ {
this.LoseFocusRequested?.Invoke(false); LoseFocusRequested?.Invoke(false);
e.Handled = true; e.Handled = true;
} }
} }
@ -287,8 +332,6 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
if (focusedControl != null && prevFocusedControl != null) if (focusedControl != null && prevFocusedControl != null)
{ {
//var commonAncestor = focusedControl.FindCommonVisualAncestor(prevFocusedControl);
//var nextTab = GetNextTab(MenuPopup, this, true);
if (!hasShift && focusedControl.TabIndex < prevFocusedControl.TabIndex) if (!hasShift && focusedControl.TabIndex < prevFocusedControl.TabIndex)
{ {
MenuPopup.IsOpen = false; MenuPopup.IsOpen = false;
@ -320,13 +363,8 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
/// <returns>Next tab order element or null if not found</returns> /// <returns>Next tab order element or null if not found</returns>
public DependencyObject GetNextTab(DependencyObject e, DependencyObject container, bool goDownOnly) public DependencyObject GetNextTab(DependencyObject e, DependencyObject container, bool goDownOnly)
{ {
var navigation = typeof(FrameworkElement) var navigation = typeof(FrameworkElement).GetProperty("KeyboardNavigation", BindingFlags.NonPublic | BindingFlags.Static).GetValue(null);
.GetProperty("KeyboardNavigation", BindingFlags.NonPublic | BindingFlags.Static) var method = navigation.GetType().GetMethod("GetNextTab", BindingFlags.NonPublic | BindingFlags.Instance);
.GetValue(null);
var method = navigation
.GetType()
.GetMethod("GetNextTab", BindingFlags.NonPublic | BindingFlags.Instance);
return method.Invoke(navigation, new object[] { e, container, goDownOnly }) as DependencyObject; return method.Invoke(navigation, new object[] { e, container, goDownOnly }) as DependencyObject;
} }
@ -363,6 +401,10 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
{ {
FindRequested?.Invoke(CLEAR_FIND_TERM, true, false); FindRequested?.Invoke(CLEAR_FIND_TERM, true, false);
} }
else if (e.Key == Key.Enter)
{
FindRequested?.Invoke(FindTextBox.Text, false, FindCaseSensitiveCheckBox.IsChecked == true);
}
else else
{ {
FindRequested?.Invoke(FindTextBox.Text, true, FindCaseSensitiveCheckBox.IsChecked == true); FindRequested?.Invoke(FindTextBox.Text, true, FindCaseSensitiveCheckBox.IsChecked == true);
@ -612,50 +654,5 @@ if (typeof __SEB_focusElement === 'undefined') {
MenuButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_MenuButton)); MenuButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_MenuButton));
UrlTextBox.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_UrlTextBox)); UrlTextBox.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_UrlTextBox));
} }
public void FocusToolbar(bool forward)
{
this.Dispatcher.BeginInvoke((Action) (async () =>
{
this.Activate();
await Task.Delay(50);
// focus all elements in the toolbar, such that the last element that is enabled gets focus
var buttons = new System.Windows.Controls.Control[] { ForwardButton, BackwardButton, ReloadButton, UrlTextBox, MenuButton, };
for (var i = forward ? 0 : buttons.Length - 1; i >= 0 && i < buttons.Length; i += forward ? 1 : -1)
{
if (buttons[i].IsEnabled && buttons[i].Visibility == Visibility.Visible)
{
buttons[i].Focus();
break;
}
}
}));
}
public void FocusBrowser()
{
this.Dispatcher.BeginInvoke((Action) (async () =>
{
this.FocusToolbar(false);
await Task.Delay(100);
this.browserControlGetsFocusFromTaskbar = true;
var focusedElement = FocusManager.GetFocusedElement(this) as UIElement;
focusedElement.MoveFocus(new TraversalRequest(FocusNavigationDirection.Right));
await Task.Delay(150);
this.browserControlGetsFocusFromTaskbar = false;
}));
}
public void FocusAddressBar()
{
this.Dispatcher.BeginInvoke((Action) (() =>
{
this.UrlTextBox.Focus();
}));
}
} }
} }

110
SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs
View file

@ -114,6 +114,51 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
}); });
} }
public void FocusToolbar(bool forward)
{
Dispatcher.BeginInvoke((Action) (async () =>
{
Activate();
await Task.Delay(50);
// focus all elements in the toolbar, such that the last element that is enabled gets focus
var buttons = new System.Windows.Controls.Control[] { ForwardButton, BackwardButton, ReloadButton, UrlTextBox, MenuButton, };
for (var i = forward ? 0 : buttons.Length - 1; i >= 0 && i < buttons.Length; i += forward ? 1 : -1)
{
if (buttons[i].IsEnabled && buttons[i].Visibility == Visibility.Visible)
{
buttons[i].Focus();
break;
}
}
}));
}
public void FocusBrowser()
{
Dispatcher.BeginInvoke((Action) (async () =>
{
FocusToolbar(false);
await Task.Delay(100);
browserControlGetsFocusFromTaskbar = true;
var focusedElement = FocusManager.GetFocusedElement(this) as UIElement;
focusedElement.MoveFocus(new TraversalRequest(FocusNavigationDirection.Right));
await Task.Delay(150);
browserControlGetsFocusFromTaskbar = false;
}));
}
public void FocusAddressBar()
{
Dispatcher.BeginInvoke((Action) (() =>
{
UrlTextBox.Focus();
}));
}
public new void Hide() public new void Hide()
{ {
Dispatcher.Invoke(base.Hide); Dispatcher.Invoke(base.Hide);
@ -199,7 +244,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
ZoomLevel.Text = $"{value}%"; ZoomLevel.Text = $"{value}%";
var zoomButtonHelpText = this.text.Get(TextKey.BrowserWindow_ZoomLevelReset).Replace("%%ZOOM%%", value.ToString("0")); var zoomButtonHelpText = text.Get(TextKey.BrowserWindow_ZoomLevelReset).Replace("%%ZOOM%%", value.ToString("0"));
ZoomResetButton.SetValue(System.Windows.Automation.AutomationProperties.HelpTextProperty, zoomButtonHelpText); ZoomResetButton.SetValue(System.Windows.Automation.AutomationProperties.HelpTextProperty, zoomButtonHelpText);
}); });
} }
@ -229,7 +274,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
var control = firstActiveElementInToolbar as System.Windows.UIElement; var control = firstActiveElementInToolbar as System.Windows.UIElement;
if (control.IsKeyboardFocusWithin) if (control.IsKeyboardFocusWithin)
{ {
this.LoseFocusRequested?.Invoke(false); LoseFocusRequested?.Invoke(false);
e.Handled = true; e.Handled = true;
} }
} }
@ -280,10 +325,9 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
var focusedElement = FocusManager.GetFocusedElement(this); var focusedElement = FocusManager.GetFocusedElement(this);
var focusedControl = focusedElement as System.Windows.Controls.Control; var focusedControl = focusedElement as System.Windows.Controls.Control;
var prevFocusedControl = tabKeyDownFocusElement as System.Windows.Controls.Control; var prevFocusedControl = tabKeyDownFocusElement as System.Windows.Controls.Control;
if (focusedControl != null && prevFocusedControl != null) if (focusedControl != null && prevFocusedControl != null)
{ {
//var commonAncestor = focusedControl.FindCommonVisualAncestor(prevFocusedControl);
//var nextTab = GetNextTab(MenuPopup, this, true);
if (!hasShift && focusedControl.TabIndex < prevFocusedControl.TabIndex) if (!hasShift && focusedControl.TabIndex < prevFocusedControl.TabIndex)
{ {
MenuPopup.IsOpen = false; MenuPopup.IsOpen = false;
@ -315,13 +359,8 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
/// <returns>Next tab order element or null if not found</returns> /// <returns>Next tab order element or null if not found</returns>
public DependencyObject GetNextTab(DependencyObject e, DependencyObject container, bool goDownOnly) public DependencyObject GetNextTab(DependencyObject e, DependencyObject container, bool goDownOnly)
{ {
var navigation = typeof(FrameworkElement) var navigation = typeof(FrameworkElement).GetProperty("KeyboardNavigation", BindingFlags.NonPublic | BindingFlags.Static).GetValue(null);
.GetProperty("KeyboardNavigation", BindingFlags.NonPublic | BindingFlags.Static) var method = navigation.GetType().GetMethod("GetNextTab", BindingFlags.NonPublic | BindingFlags.Instance);
.GetValue(null);
var method = navigation
.GetType()
.GetMethod("GetNextTab", BindingFlags.NonPublic | BindingFlags.Instance);
return method.Invoke(navigation, new object[] { e, container, goDownOnly }) as DependencyObject; return method.Invoke(navigation, new object[] { e, container, goDownOnly }) as DependencyObject;
} }
@ -358,6 +397,10 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
{ {
FindRequested?.Invoke(CLEAR_FIND_TERM, true, false); FindRequested?.Invoke(CLEAR_FIND_TERM, true, false);
} }
else if (e.Key == Key.Enter)
{
FindRequested?.Invoke(FindTextBox.Text, false, FindCaseSensitiveCheckBox.IsChecked == true);
}
else else
{ {
FindRequested?.Invoke(FindTextBox.Text, true, FindCaseSensitiveCheckBox.IsChecked == true); FindRequested?.Invoke(FindTextBox.Text, true, FindCaseSensitiveCheckBox.IsChecked == true);
@ -617,50 +660,5 @@ if (typeof __SEB_focusElement === 'undefined') {
MenuButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_MenuButton)); MenuButton.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_MenuButton));
UrlTextBox.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_UrlTextBox)); UrlTextBox.SetValue(System.Windows.Automation.AutomationProperties.NameProperty, text.Get(TextKey.BrowserWindow_UrlTextBox));
} }
public void FocusToolbar(bool forward)
{
this.Dispatcher.BeginInvoke((Action) (async () =>
{
this.Activate();
await Task.Delay(50);
// focus all elements in the toolbar, such that the last element that is enabled gets focus
var buttons = new System.Windows.Controls.Control[] { ForwardButton, BackwardButton, ReloadButton, UrlTextBox, MenuButton, };
for (var i = forward ? 0 : buttons.Length - 1; i >= 0 && i < buttons.Length; i += forward ? 1 : -1)
{
if (buttons[i].IsEnabled && buttons[i].Visibility == Visibility.Visible)
{
buttons[i].Focus();
break;
}
}
}));
}
public void FocusBrowser()
{
this.Dispatcher.BeginInvoke((Action) (async () =>
{
this.FocusToolbar(false);
await Task.Delay(100);
this.browserControlGetsFocusFromTaskbar = true;
var focusedElement = FocusManager.GetFocusedElement(this) as UIElement;
focusedElement.MoveFocus(new TraversalRequest(FocusNavigationDirection.Right));
await Task.Delay(150);
this.browserControlGetsFocusFromTaskbar = false;
}));
}
public void FocusAddressBar()
{
this.Dispatcher.BeginInvoke((Action) (() =>
{
this.UrlTextBox.Focus();
}));
}
} }
} }