TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0_DevHead' into tsneo

Browse source 
# Conflicts:
#	Engine/source/console/consoleInternal.cpp
This commit is contained in:
Jeff Hutchinson 2021-06-18 21:13:49 -04:00
commit acde0c3f0b
17 changed files with 96 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript
View file

@ -627,9 +627,14 @@ function onDisplayModeChange(%val)
}
%resolutionList = getScreenResolutionList(%newDeviceID, %newDeviceMode);
// If we're switching to borderless, default to monitor res
if (%newDeviceMode == $Video::ModeBorderless)
%newRes = getWords(Canvas.getMonitorRect(%newDeviceID), 2);
{ // If we're switching to borderless, default to monitor res on Windows OS,
// monitor usable area for other platforms.
if ($platform $= "windows")
%newRes = getWords(Canvas.getMonitorRect(%newDeviceID), 2);
else
%newRes = getWords(Canvas.getMonitorUsableRect(%newDeviceID), 2);
}
else
{ // Otherwise, if our old resolution is still in the list, attempt to reset it.
%oldRes = getWord(OptionsMenuSettingsList.getCurrentOption(3), 0) SPC getWord(OptionsMenuSettingsList.getCurrentOption(3), 2);