mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-16 23:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for custom tray icon on Windows via SDL hints.

Browse Source 
SDL_CreateTray now respects SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL
and SDL_HINT_WINDOWS_INTRESOURCE_ICON hints and uses the specified icon
as the tray icon.
This commit is contained in:
Scrooge86x
2025-01-14 01:56:52 +01:00
committed by Sam Lantinga
parent 5815372206
commit 0aa319e4f9
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/tray/windows/SDL_tray.c
View File

@@ -187,6 +187,28 @@ static wchar_t *escape_label(const char *in)
return out; return out;
} }
static HICON load_default_icon()
{
HINSTANCE hInstance = GetModuleHandle(NULL);
if (!hInstance) {
return LoadIcon(NULL, IDI_APPLICATION);
}
const char *hint = SDL_GetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL);
if (hint && *hint) {
HICON icon = LoadIcon(hInstance, MAKEINTRESOURCE(SDL_atoi(hint)));
return icon ? icon : LoadIcon(NULL, IDI_APPLICATION);
}
hint = SDL_GetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON);
if (hint && *hint) {
HICON icon = LoadIcon(hInstance, MAKEINTRESOURCE(SDL_atoi(hint)));
return icon ? icon : LoadIcon(NULL, IDI_APPLICATION);
}
return LoadIcon(NULL, IDI_APPLICATION);
}
SDL_Tray *SDL_CreateTray(SDL_Surface *icon, const char *tooltip) SDL_Tray *SDL_CreateTray(SDL_Surface *icon, const char *tooltip)
{ {
SDL_Tray *tray = (SDL_Tray *)SDL_malloc(sizeof(*tray)); SDL_Tray *tray = (SDL_Tray *)SDL_malloc(sizeof(*tray));
@@ -216,12 +238,12 @@ SDL_Tray *SDL_CreateTray(SDL_Surface *icon, const char *tooltip)
tray->nid.hIcon = CreateIconFromSurface(icon); tray->nid.hIcon = CreateIconFromSurface(icon);
if (!tray->nid.hIcon) { if (!tray->nid.hIcon) {
tray->nid.hIcon = LoadIcon(NULL, IDI_APPLICATION); tray->nid.hIcon = load_default_icon();
} }
tray->icon = tray->nid.hIcon; tray->icon = tray->nid.hIcon;
} else { } else {
tray->nid.hIcon = LoadIcon(NULL, IDI_APPLICATION); tray->nid.hIcon = load_default_icon();
tray->icon = tray->nid.hIcon; tray->icon = tray->nid.hIcon;
} }
@@ -245,12 +267,12 @@ void SDL_SetTrayIcon(SDL_Tray *tray, SDL_Surface *icon)
tray->nid.hIcon = CreateIconFromSurface(icon); tray->nid.hIcon = CreateIconFromSurface(icon);
if (!tray->nid.hIcon) { if (!tray->nid.hIcon) {
tray->nid.hIcon = LoadIcon(NULL, IDI_APPLICATION); tray->nid.hIcon = load_default_icon();
} }
tray->icon = tray->nid.hIcon; tray->icon = tray->nid.hIcon;
} else { } else {
tray->nid.hIcon = LoadIcon(NULL, IDI_APPLICATION); tray->nid.hIcon = load_default_icon();
tray->icon = tray->nid.hIcon; tray->icon = tray->nid.hIcon;
} }