ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-24 21:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remember DisplayDevice original resolutions

Browse source 
When refreshing the AvailableDevices list, it is important to set the
original resolution on any DisplayDevices that were previously available
to allow the RestoreResolution() method to work correctly.
This commit is contained in:
cwassall 2014-01-19 19:44:12 +00:00
parent c2e3328f59
commit 5f6c8e654c
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/OpenTK/DisplayDevice.cs
View file

@ -47,7 +47,8 @@ namespace OpenTK
bool primary; bool primary;
Rectangle bounds; Rectangle bounds;
DisplayResolution current_resolution = new DisplayResolution(), original_resolution; DisplayResolution current_resolution = new DisplayResolution();
internal DisplayResolution original_resolution;
List<DisplayResolution> available_resolutions = new List<DisplayResolution>(); List<DisplayResolution> available_resolutions = new List<DisplayResolution>();
IList<DisplayResolution> available_resolutions_readonly; IList<DisplayResolution> available_resolutions_readonly;

9
Source/OpenTK/Platform/Windows/WinDisplayDevice.cs
View file

@ -96,6 +96,10 @@ namespace OpenTK.Platform.Windows
{ {
lock (display_lock) lock (display_lock)
{ {
// Store an array of the current available DisplayDevice objects.
// This is needed to preserve the original_resolution.
DisplayDevice[] previousDevices = AvailableDevices.ToArray();
AvailableDevices.Clear(); AvailableDevices.Clear();
// We save all necessary parameters in temporary variables // We save all necessary parameters in temporary variables
@ -159,6 +163,11 @@ namespace OpenTK.Platform.Windows
opentk_dev_current_res.Bounds, opentk_dev_current_res.Bounds,
dev1.DeviceName); dev1.DeviceName);
// Set the original_resolution if the DisplayDevice was previously available.
foreach (DisplayDevice existingDevice in previousDevices)
if ((string)existingDevice.Id == (string)opentk_dev.Id)
opentk_dev.original_resolution = existingDevice.original_resolution;
AvailableDevices.Add(opentk_dev); AvailableDevices.Add(opentk_dev);
if (opentk_dev_primary) if (opentk_dev_primary)