epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove global fallback to software cursors on error.

Browse Source 
We now only fall back for the specific cursors that failed.
This commit is contained in:
Paul Chote
2021-05-02 22:31:49 +01:00
committed by reaperrr
parent 8fede9d6ba
commit dacacdf130
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenRA.Game/Graphics/CursorManager.cs
View File

@@ -106,34 +106,33 @@ namespace OpenRA.Graphics
// Dispose any existing cursors to avoid leaking native resources // Dispose any existing cursors to avoid leaking native resources
ClearHardwareCursors(); ClearHardwareCursors();
try foreach (var kv in cursors)
{ {
foreach (var kv in cursors) var template = kv.Value;
for (var i = 0; i < template.Sprites.Length; i++)
{ {
var template = kv.Value; if (template.Cursors[i] != null)
for (var i = 0; i < template.Sprites.Length; i++) template.Cursors[i].Dispose();
// Calculate the padding to position the frame within sequenceBounds
var paddingTL = -(template.Bounds.Location - template.Sprites[i].Offset.XY.ToInt2());
var paddingBR = template.PaddedSize - new int2(template.Sprites[i].Bounds.Size) - paddingTL;
try
{ {
if (template.Cursors[i] != null)
template.Cursors[i].Dispose();
// Calculate the padding to position the frame within sequenceBounds
var paddingTL = -(template.Bounds.Location - template.Sprites[i].Offset.XY.ToInt2());
var paddingBR = template.PaddedSize - new int2(template.Sprites[i].Bounds.Size) - paddingTL;
template.Cursors[i] = CreateHardwareCursor(kv.Key, template.Sprites[i], paddingTL, paddingBR, -template.Bounds.Location); template.Cursors[i] = CreateHardwareCursor(kv.Key, template.Sprites[i], paddingTL, paddingBR, -template.Bounds.Location);
} }
catch (Exception e)
{
Log.Write("debug", "Failed to initialize hardware cursor for {0}.", template.Name);
Log.Write("debug", "Error was: " + e.Message);
Console.WriteLine("Failed to initialize hardware cursor for {0}.", template.Name);
Console.WriteLine("Error was: " + e.Message);
template.Cursors[i] = null;
}
} }
} }
catch (Exception e)
{
Log.Write("debug", "Failed to initialize hardware cursors. Falling back to software cursors.");
Log.Write("debug", "Error was: " + e.Message);
Console.WriteLine("Failed to initialize hardware cursors. Falling back to software cursors.");
Console.WriteLine("Error was: " + e.Message);
ClearHardwareCursors();
}
hardwareCursorsDoubled = graphicSettings.CursorDouble; hardwareCursorsDoubled = graphicSettings.CursorDouble;
} }
@@ -177,10 +176,11 @@ namespace OpenRA.Graphics
if (cursor != null && frame >= cursor.Cursors.Length) if (cursor != null && frame >= cursor.Cursors.Length)
frame %= cursor.Cursors.Length; frame %= cursor.Cursors.Length;
if (cursor == null || isLocked) var hardwareCursor = cursor?.Cursors[frame];
if (hardwareCursor == null || isLocked)
Game.Renderer.Window.SetHardwareCursor(null); Game.Renderer.Window.SetHardwareCursor(null);
else else
Game.Renderer.Window.SetHardwareCursor(cursor.Cursors[frame]); Game.Renderer.Window.SetHardwareCursor(hardwareCursor);
} }
public void Render(Renderer renderer) public void Render(Renderer renderer)