MasterGordon
/
SDL3-CS
mirror of https://github.com/ppy/SDL3-CS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement helper for SDL_GetTrayEntries() 

The returned array should not be SDL_free'd as it's a `const` pointer.
This commit is contained in:
Susko3 2025-01-05 04:33:11 +00:00
parent 3681588414
commit f988cb2d0b
4 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SDL3-CS.Tests/TestTray.cs
View File

@ -25,6 +25,13 @@ namespace SDL.Tests
Assert.That(exit != null, SDL_GetError);
SetCallback(exit, () => running = false);
var entries = SDL_GetTrayEntries(RootMenu);
Assert.That(entries, Is.Not.Null, SDL_GetError);
Assert.That(entries!.Count, Is.EqualTo(3));
for (int i = 0; i < entries.Count; i++)
Console.WriteLine($"{i}. {SDL_GetTrayEntryLabel(entries[i]) ?? "<null>"}");
running = true;
while (running)

14
SDL3-CS/SDL3/SDL_tray.cs
View File

@ -18,13 +18,11 @@ namespace SDL
public static partial class SDL3
{
// The code below is currently incorrect because of https://github.com/libsdl-org/SDL/issues/11787.
// [MustDisposeResource]
// public static unsafe SDLOpaquePointerArray<SDL_TrayEntry>? SDL_GetTrayEntries(SDL_TrayMenu* menu)
// {
// int count;
// var array = SDL_GetTrayEntries(menu, &count);
// return SDLArray.CreateOpaque(array, count);
// }
public static unsafe SDLConstOpaquePointerArray<SDL_TrayEntry>? SDL_GetTrayEntries(SDL_TrayMenu* menu)
{
int count;
var array = SDL_GetTrayEntries(menu, &count);
return SDLArray.CreateConstOpaque(array, count);
}
}
}

9
SDL3-CS/SDLArray.cs
View File

@ -73,5 +73,14 @@ namespace SDL
return new SDLOpaquePointerArray<T>(array, count);
}
internal static SDLConstOpaquePointerArray<T>? CreateConstOpaque<T>(T** array, int count)
where T : unmanaged
{
if (array == null)
return null;
return new SDLConstOpaquePointerArray<T>(array, count);
}
}
}

32
SDL3-CS/SDLConstOpaquePointerArray.cs Normal file
View File

@ -0,0 +1,32 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Diagnostics;
namespace SDL
{
public sealed unsafe class SDLConstOpaquePointerArray<T>
where T : unmanaged
{
private readonly T** array;
public readonly int Count;
internal SDLConstOpaquePointerArray(T** array, int count)
{
this.array = array;
Count = count;
}
public T* this[int index]
{
get
{
ArgumentOutOfRangeException.ThrowIfNegative(index);
ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(index, Count);
Debug.Assert(array[index] != null);
return array[index];
}
}
}
}