Skip to content

feat(icons): search for icon themes in $xdg_data_dirs, $xdg_data_home, and ~/.icons #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ddlees wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(icons): search for icon themes in $xdg_data_dirs, $xdg_data_home, and ~/.icons #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b784d
chore: ignore nix build output directory
ddlees Dec 8, 2025
593734e
feat(icons): search for icon themes in $xdg_data_dirs, $xdg_data_home…
ddlees Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ CMakeUserPresets.json
#cmake-build-*

build/
result
.vscode/
.cache/

protocols/*.cpp
protocols/*.hpp

*.inc
src/renderer/gl/shaders/Shaders.hpp
src/renderer/gl/shaders/Shaders.hpp
29 changes: 26 additions & 3 deletions src/system/Icons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <filesystem>
#include <fstream>

#include <glib.h>

#include <hyprutils/string/String.hpp>
#include <hyprutils/string/ConstVarList.hpp>
#include <hyprutils/utils/ScopeGuard.hpp>
Expand All @@ -32,9 +34,30 @@ static std::optional<std::string> readFileAsString(const std::string& path) {
return trim(std::string((std::istreambuf_iterator<char>(file)), (std::istreambuf_iterator<char>())));
}

static const std::array<const char*, 3> ICON_THEME_DIRS = {"/usr/share/icons", "/usr/local/share/icons", "~/.icons"};
static std::vector<std::string> getIconSearchPaths() {
std::vector<std::string> paths;

// user icons (e.g., ~/.local/share/icons)
const gchar* userDataDir = g_get_user_data_dir();
if (userDataDir) {
paths.push_back(std::string(userDataDir) + "/icons");
}

// system icons (e.g. /usr/local/share/icons, /usr/share/icons)
const gchar* const* systemDataDirs = g_get_system_data_dirs();
for (int i = 0; systemDataDirs[i] != nullptr; i++) {
paths.push_back(std::string(systemDataDirs[i]) + "/icons");
}

//non-xdg compliant icon dirs
paths.push_back("~/.icons");

return paths;
}

static const auto ICON_THEME_DIRS = getIconSearchPaths();

static std::string fromDir(const char* p) {
static std::string fromDir(const std::string& p) {
static auto HOME_ENV = getenv("HOME");

if (p[0] == '~') {
Expand Down Expand Up @@ -201,4 +224,4 @@ SP<ISystemIconDescription> CSystemIconFactory::lookupIcon(const std::string& ico
return makeShared<CSystemIconDescription>();

return makeShared<CSystemIconDescription>(iconName);
}
}