Theme (Windows): moves Windows theme detection logic from DE to dedicated module

Like the last commit
This commit is contained in:
李通洲
2025-09-29 09:40:10 +08:00
parent 093f56a03d
commit 8be070998f
3 changed files with 30 additions and 24 deletions
+1 -1
View File
@@ -1044,7 +1044,7 @@ elseif(WIN32)
src/detection/terminalfont/terminalfont_windows.c
src/detection/terminalshell/terminalshell_windows.c
src/detection/terminalsize/terminalsize_windows.c
src/detection/theme/theme_nosupport.c
src/detection/theme/theme_windows.c
src/detection/tpm/tpm_windows.c
src/detection/uptime/uptime_windows.c
src/detection/users/users_windows.c
@@ -254,27 +254,4 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
}
detectDisplays(ds);
//https://github.com/hykilpikonna/hyfetch/blob/master/neofetch#L2067
const FFOSResult* os = ffDetectOS();
uint32_t ver = (uint32_t) ffStrbufToUInt(&os->version, 0);
if (ver > 1000)
{
// Windows Server
if (ver >= 2016)
ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
else if (ver >= 2012)
ffStrbufSetStatic(&ds->dePrettyName, "Metro");
else
ffStrbufSetStatic(&ds->dePrettyName, "Aero");
}
else
{
if (ver >= 10)
ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
else if (ver >= 8)
ffStrbufSetStatic(&ds->dePrettyName, "Metro");
else
ffStrbufSetStatic(&ds->dePrettyName, "Aero");
}
}
+29
View File
@@ -0,0 +1,29 @@
#include "theme.h"
#include "detection/os/os.h"
const char* ffDetectTheme(FFThemeResult* result)
{
const FFOSResult* os = ffDetectOS();
uint32_t ver = (uint32_t) ffStrbufToUInt(&os->version, 0);
if (ver > 1000)
{
// Windows Server
if (ver >= 2016)
ffStrbufSetStatic(&result->theme1, "Fluent");
else if (ver >= 2012)
ffStrbufSetStatic(&result->theme1, "Metro");
else
ffStrbufSetStatic(&result->theme1, "Aero");
}
else
{
if (ver >= 10)
ffStrbufSetStatic(&result->theme1, "Fluent");
else if (ver >= 8)
ffStrbufSetStatic(&result->theme1, "Metro");
else
ffStrbufSetStatic(&result->theme1, "Aero");
}
return NULL;
}