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

SEBWIN-305: Fixed data mapping for browser window widths and heights.

Browse source
This commit is contained in:
Damian Büchel 2020-05-04 13:47:32 +02:00
parent 63d34825f7
commit 16f2e22f2a
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SafeExamBrowser.Configuration/ConfigurationData/DataMapping/BrowserDataMapper.cs
View file

@ -684,11 +684,13 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{ {
if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeHeight)) if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeHeight))
{ {
settings.Browser.AdditionalWindow.AbsoluteHeight = default(int?);
settings.Browser.AdditionalWindow.RelativeHeight = relativeHeight; settings.Browser.AdditionalWindow.RelativeHeight = relativeHeight;
} }
else if (int.TryParse(raw, out var absoluteHeight)) else if (int.TryParse(raw, out var absoluteHeight))
{ {
settings.Browser.AdditionalWindow.AbsoluteHeight = absoluteHeight; settings.Browser.AdditionalWindow.AbsoluteHeight = absoluteHeight;
settings.Browser.AdditionalWindow.RelativeHeight = default(int?);
} }
} }
} }
@ -699,11 +701,13 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{ {
if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeHeight)) if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeHeight))
{ {
settings.Browser.MainWindow.AbsoluteHeight = default(int?);
settings.Browser.MainWindow.RelativeHeight = relativeHeight; settings.Browser.MainWindow.RelativeHeight = relativeHeight;
} }
else if (int.TryParse(raw, out var absoluteHeight)) else if (int.TryParse(raw, out var absoluteHeight))
{ {
settings.Browser.MainWindow.AbsoluteHeight = absoluteHeight; settings.Browser.MainWindow.AbsoluteHeight = absoluteHeight;
settings.Browser.MainWindow.RelativeHeight = default(int?);
} }
} }
} }
@ -760,11 +764,13 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{ {
if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeWidth)) if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeWidth))
{ {
settings.Browser.AdditionalWindow.AbsoluteWidth = default(int?);
settings.Browser.AdditionalWindow.RelativeWidth = relativeWidth; settings.Browser.AdditionalWindow.RelativeWidth = relativeWidth;
} }
else if (int.TryParse(raw, out var absoluteWidth)) else if (int.TryParse(raw, out var absoluteWidth))
{ {
settings.Browser.AdditionalWindow.AbsoluteWidth = absoluteWidth; settings.Browser.AdditionalWindow.AbsoluteWidth = absoluteWidth;
settings.Browser.AdditionalWindow.RelativeWidth = default(int?);
} }
} }
} }
@ -775,11 +781,13 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{ {
if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeWidth)) if (raw.EndsWith("%") && int.TryParse(raw.Replace("%", string.Empty), out var relativeWidth))
{ {
settings.Browser.MainWindow.AbsoluteWidth = default(int?);
settings.Browser.MainWindow.RelativeWidth = relativeWidth; settings.Browser.MainWindow.RelativeWidth = relativeWidth;
} }
else if (int.TryParse(raw, out var absoluteWidth)) else if (int.TryParse(raw, out var absoluteWidth))
{ {
settings.Browser.MainWindow.AbsoluteWidth = absoluteWidth; settings.Browser.MainWindow.AbsoluteWidth = absoluteWidth;
settings.Browser.MainWindow.RelativeWidth = default(int?);
} }
} }
} }