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

SEBWIN-220: Ensured that splash screen and runtime window are always centered on the primary display.

Browse source
This commit is contained in:
dbuechel 2018-09-21 14:40:48 +02:00
parent bedfc5eac0
commit b31ba1c2d5
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs
View file

@ -168,7 +168,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
explorerShell.Verify(s => s.Resume(), Times.Once); explorerShell.Verify(s => s.Resume(), Times.Once);
explorerShell.Verify(s => s.Terminate(), Times.Once); explorerShell.Verify(s => s.Terminate(), Times.Once);
explorerShell.Verify(s => s.Suspend(), Times.Once); explorerShell.Verify(s => s.Suspend(), Times.Exactly(2));
explorerShell.Verify(s => s.Start(), Times.Once); explorerShell.Verify(s => s.Start(), Times.Once);
newDesktop.Verify(d => d.Activate(), Times.Exactly(2)); newDesktop.Verify(d => d.Activate(), Times.Exactly(2));
newDesktop.Verify(d => d.Close(), Times.Once); newDesktop.Verify(d => d.Close(), Times.Once);

8
SafeExamBrowser.UserInterface.Classic/RuntimeWindow.xaml.cs
View file

@ -44,6 +44,8 @@ namespace SafeExamBrowser.UserInterface.Classic
InitializeComponent(); InitializeComponent();
InitializeRuntimeWindow(); InitializeRuntimeWindow();
Loaded += RuntimeWindow_Loaded;
} }
public void BringToForeground() public void BringToForeground()
@ -141,5 +143,11 @@ namespace SafeExamBrowser.UserInterface.Classic
Closing += (o, args) => args.Cancel = !allowClose; Closing += (o, args) => args.Cancel = !allowClose;
} }
private void RuntimeWindow_Loaded(object sender, RoutedEventArgs e)
{
Left = (SystemParameters.WorkArea.Right / 2) - (Width / 2);
Top = (SystemParameters.WorkArea.Bottom / 2) - (Height / 2);
}
} }
} }

8
SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml.cs
View file

@ -49,6 +49,8 @@ namespace SafeExamBrowser.UserInterface.Classic
InitializeComponent(); InitializeComponent();
InitializeSplashScreen(); InitializeSplashScreen();
Loaded += SplashScreen_Loaded;
} }
public void BringToForeground() public void BringToForeground()
@ -134,5 +136,11 @@ namespace SafeExamBrowser.UserInterface.Classic
InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 }); InfoTextBlock.Inlines.Add(new Run(appConfig.ProgramCopyright) { FontSize = 10 });
} }
} }
private void SplashScreen_Loaded(object sender, RoutedEventArgs e)
{
Left = (SystemParameters.WorkArea.Right / 2) - (Width / 2);
Top = (SystemParameters.WorkArea.Bottom / 2) - (Height / 2);
}
} }
} }