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

Made browser refresh functionality respect the configured settings.

Browse source
This commit is contained in:
dbuechel 2017-08-03 08:42:48 +02:00
parent 12246bd0f5
commit cbb3e797b0
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Browser/BrowserControl.cs
View file

@ -71,7 +71,7 @@ namespace SafeExamBrowser.Browser
TitleChanged += (o, args) => titleChanged?.Invoke(args.Title); TitleChanged += (o, args) => titleChanged?.Invoke(args.Title);
MenuHandler = new BrowserContextMenuHandler(settings, text); MenuHandler = new BrowserContextMenuHandler(settings, text);
KeyboardHandler = new BrowserKeyboardHandler(); KeyboardHandler = new BrowserKeyboardHandler(settings);
} }
} }
} }

17
SafeExamBrowser.Browser/Handlers/BrowserKeyboardHandler.cs
View file

@ -8,11 +8,22 @@
using System.Windows.Forms; using System.Windows.Forms;
using CefSharp; using CefSharp;
using IBrowserSettings = SafeExamBrowser.Contracts.Configuration.Settings.IBrowserSettings;
namespace SafeExamBrowser.Browser.Handlers namespace SafeExamBrowser.Browser.Handlers
{ {
class BrowserKeyboardHandler : IKeyboardHandler /// <remarks>
/// See https://cefsharp.github.io/api/57.0.0/html/T_CefSharp_IKeyboardHandler.htm.
/// </remarks>
internal class BrowserKeyboardHandler : IKeyboardHandler
{ {
private IBrowserSettings settings;
public BrowserKeyboardHandler(IBrowserSettings settings)
{
this.settings = settings;
}
public bool OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey) public bool OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey)
{ {
return false; return false;
@ -20,9 +31,11 @@ namespace SafeExamBrowser.Browser.Handlers
public bool OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut) public bool OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut)
{ {
if (type == KeyType.KeyUp && windowsKeyCode == (int) Keys.F5) if (settings.AllowReloading && type == KeyType.KeyUp && windowsKeyCode == (int) Keys.F5)
{ {
browserControl.Reload(); browserControl.Reload();
return true;
} }
return false; return false;