hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 01:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

xcursors: store themes in a std:set to order it (#8474)

Browse source 
using a unordered_set means its store based on a hash_value meaning
currently it can end up loading inherited themes before the actual theme
itself depending on the hash of the theme name used, reason for using
set at all over vector is to keep unique members and not foreverever
looping broken inherit themeing.
This commit is contained in:
Tom Englund 2024-11-14 21:38:16 +01:00 committed by GitHub
parent 6f7280a690
commit 940ed3d525
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/managers/XCursorManager.cpp
View file

@ -197,7 +197,7 @@ SP<SXCursors> CXCursorManager::createCursor(std::string const& shape, XcursorIma
return xcursor; return xcursor;
} }
std::unordered_set<std::string> CXCursorManager::themePaths(std::string const& theme) { std::set<std::string> CXCursorManager::themePaths(std::string const& theme) {
auto const* path = XcursorLibraryPath(); auto const* path = XcursorLibraryPath();
auto expandTilde = [](std::string const& path) { auto expandTilde = [](std::string const& path) {
@ -276,10 +276,10 @@ std::unordered_set<std::string> CXCursorManager::themePaths(std::string const& t
return themes; return themes;
}; };
std::unordered_set<std::string> paths; std::set<std::string> paths;
std::unordered_set<std::string> inherits; std::set<std::string> inherits;
auto scanTheme = [&path, &paths, &expandTilde, &inherits, &getInheritThemes](auto const& t) { auto scanTheme = [&path, &paths, &expandTilde, &inherits, &getInheritThemes](auto const& t) {
std::stringstream ss(path); std::stringstream ss(path);
std::string line; std::string line;

24
src/managers/XCursorManager.hpp
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <vector> #include <vector>
#include <unordered_set> #include <set>
#include <array> #include <array>
#include <cstdint> #include <cstdint>
#include <hyprutils/math/Vector2D.hpp> #include <hyprutils/math/Vector2D.hpp>
@ -34,16 +34,16 @@ class CXCursorManager {
void syncGsettings(); void syncGsettings();
private: private:
SP<SXCursors> createCursor(std::string const& shape, XcursorImages* xImages); SP<SXCursors> createCursor(std::string const& shape, XcursorImages* xImages);
std::unordered_set<std::string> themePaths(std::string const& theme); std::set<std::string> themePaths(std::string const& theme);
std::string getLegacyShapeName(std::string const& shape); std::string getLegacyShapeName(std::string const& shape);
std::vector<SP<SXCursors>> loadStandardCursors(std::string const& name, int size); std::vector<SP<SXCursors>> loadStandardCursors(std::string const& name, int size);
std::vector<SP<SXCursors>> loadAllFromDir(std::string const& path, int size); std::vector<SP<SXCursors>> loadAllFromDir(std::string const& path, int size);
int lastLoadSize = 0; int lastLoadSize = 0;
float lastLoadScale = 0; float lastLoadScale = 0;
std::string themeName = ""; std::string themeName = "";
SP<SXCursors> defaultCursor; SP<SXCursors> defaultCursor;
SP<SXCursors> hyprCursor; SP<SXCursors> hyprCursor;
std::vector<SP<SXCursors>> cursors; std::vector<SP<SXCursors>> cursors;
}; };