diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs
index 5cb68264..f5760e95 100644
--- a/SafeExamBrowser.Client/CompositionRoot.cs
+++ b/SafeExamBrowser.Client/CompositionRoot.cs
@@ -44,6 +44,8 @@ using SafeExamBrowser.Monitoring.Processes;
using SafeExamBrowser.Monitoring.Windows;
using SafeExamBrowser.SystemComponents;
using SafeExamBrowser.WindowsApi;
+using Desktop = SafeExamBrowser.UserInterface.Desktop;
+using Mobile = SafeExamBrowser.UserInterface.Mobile;
namespace SafeExamBrowser.Client
{
@@ -293,9 +295,9 @@ namespace SafeExamBrowser.Client
switch (uiMode)
{
case UserInterfaceMode.Mobile:
- return new UserInterface.Mobile.ActionCenter();
+ return new Mobile.ActionCenter();
default:
- return new UserInterface.Desktop.ActionCenter();
+ return new Desktop.ActionCenter();
}
}
@@ -304,9 +306,9 @@ namespace SafeExamBrowser.Client
switch (uiMode)
{
case UserInterfaceMode.Mobile:
- return new UserInterface.Mobile.MessageBox(text);
+ return new Mobile.MessageBox(text);
default:
- return new UserInterface.Desktop.MessageBox(text);
+ return new Desktop.MessageBox(text);
}
}
@@ -315,9 +317,9 @@ namespace SafeExamBrowser.Client
switch (uiMode)
{
case UserInterfaceMode.Mobile:
- return new UserInterface.Mobile.Taskbar(new ModuleLogger(logger, nameof(UserInterface.Mobile.Taskbar)));
+ return new Mobile.Taskbar(new ModuleLogger(logger, nameof(Mobile.Taskbar)));
default:
- return new UserInterface.Desktop.Taskbar(new ModuleLogger(logger, nameof(UserInterface.Desktop.Taskbar)));
+ return new Desktop.Taskbar(new ModuleLogger(logger, nameof(Desktop.Taskbar)));
}
}
@@ -326,9 +328,9 @@ namespace SafeExamBrowser.Client
switch (uiMode)
{
case UserInterfaceMode.Mobile:
- return new UserInterface.Mobile.UserInterfaceFactory(text);
+ return new Mobile.UserInterfaceFactory(text);
default:
- return new UserInterface.Desktop.UserInterfaceFactory(text);
+ return new Desktop.UserInterfaceFactory(text);
}
}
diff --git a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml
index bdc6ece4..8e66f36a 100644
--- a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml
@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:fa="http://schemas.fontawesome.io/icons/"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile.Controls"
- mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon=".\Images\SafeExamBrowser.ico">
+ mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" FontSize="16" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon=".\Images\SafeExamBrowser.ico">
@@ -29,18 +29,18 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml
index a881ffff..cdf1e581 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterClock.xaml
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml
index d2afcb4a..2c427e6f 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterKeyboardLayoutControl.xaml
@@ -30,7 +30,7 @@
-
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml
index 578d84a0..8c296372 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterNotificationButton.xaml
@@ -21,7 +21,7 @@
-
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml
index 9d924722..648b40b4 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterQuitButton.xaml
@@ -21,7 +21,7 @@
-
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml
index 5bdf5973..5c59c893 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterWirelessNetworkControl.xaml
@@ -35,7 +35,7 @@
-
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml b/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml
index fa88dc2a..7350b639 100644
--- a/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/LogWindow.xaml
@@ -14,7 +14,8 @@
-
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml b/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml
index 45d7b52f..24a93a96 100644
--- a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml
@@ -5,7 +5,7 @@
xmlns:fa="http://schemas.fontawesome.io/icons/"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile"
- mc:Ignorable="d" Height="200" Width="450" ResizeMode="NoResize" Topmost="True">
+ mc:Ignorable="d" Background="Transparent" Height="750" Width="1000" FontSize="16" ResizeMode="NoResize" Topmost="True" AllowsTransparency="True" WindowStyle="None">
@@ -13,32 +13,35 @@
-
+
-
-
+
+
+
+
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml.cs
index 05e2bcb5..6ce88f3b 100644
--- a/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/PasswordDialog.xaml.cs
@@ -47,9 +47,10 @@ namespace SafeExamBrowser.UserInterface.Mobile
if (parent is Window)
{
Owner = parent as Window;
- WindowStartupLocation = WindowStartupLocation.CenterOwner;
}
+ InitializeBounds();
+
if (ShowDialog() is true)
{
result.Password = Password.Password;
@@ -60,11 +61,20 @@ namespace SafeExamBrowser.UserInterface.Mobile
});
}
+ private void InitializeBounds()
+ {
+ Left = 0;
+ Top = 0;
+ Height = SystemParameters.PrimaryScreenHeight;
+ Width = SystemParameters.PrimaryScreenWidth;
+ }
+
private void InitializePasswordDialog(string message, string title)
{
+ InitializeBounds();
+
Message.Text = message;
Title = title;
- WindowStartupLocation = WindowStartupLocation.CenterScreen;
CancelButton.Content = text.Get(TextKey.PasswordDialog_Cancel);
CancelButton.Click += CancelButton_Click;
@@ -74,6 +84,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
Closing += (o, args) => closing?.Invoke();
Password.KeyUp += Password_KeyUp;
+ SystemParameters.StaticPropertyChanged += SystemParameters_StaticPropertyChanged;
}
private void CancelButton_Click(object sender, RoutedEventArgs e)
@@ -97,6 +108,14 @@ namespace SafeExamBrowser.UserInterface.Mobile
}
}
+ private void SystemParameters_StaticPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == nameof(SystemParameters.WorkArea))
+ {
+ Dispatcher.InvokeAsync(InitializeBounds);
+ }
+ }
+
private class PasswordDialogResult : IPasswordDialogResult
{
public string Password { get; set; }
diff --git a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml b/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml
index 7b9fbaef..4a73e73d 100644
--- a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml
+++ b/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml
@@ -5,24 +5,24 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile"
mc:Ignorable="d"
- Title="SplashScreen" Background="White" Height="200" Width="350" WindowStyle="None" WindowStartupLocation="CenterScreen"
+ Title="SplashScreen" Background="White" FontSize="16" Height="250" Width="500" WindowStyle="None" WindowStartupLocation="CenterScreen"
Cursor="Wait" Icon="./Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True">
-
+
-
+
-
+
-
+
diff --git a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs
index 3a270cc5..d1a108ff 100644
--- a/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/SplashScreen.xaml.cs
@@ -125,7 +125,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
InfoTextBlock.Inlines.Add(new Run($"Version {appConfig.ProgramVersion}") { FontStyle = FontStyles.Italic });
InfoTextBlock.Inlines.Add(new LineBreak());
InfoTextBlock.Inlines.Add(new LineBreak());
- InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 });
+ InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 12 });
}
}
}