hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cursor-shape: use - instead of _ in shapes 

ref #5824
This commit is contained in:
Vaxry 2024-05-02 16:20:51 +01:00
parent eeb78ef965
commit a3ca016d42
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/managers/CursorManager.cpp
View File

@ -117,16 +117,16 @@ void CCursorManager::setCursorFromName(const std::string& name) {
m_sCurrentCursorShapeData = m_pHyprcursor->getShape(name.c_str(), m_sCurrentStyleInfo);
if (m_sCurrentCursorShapeData.images.size() < 1) {
// try with '-' first (xcursor, web, etc)
// try with '_' first (old hc, etc)
std::string newName = name;
std::replace(newName.begin(), newName.end(), '_', '-');
std::replace(newName.begin(), newName.end(), '-', '_');
m_sCurrentCursorShapeData = m_pHyprcursor->getShape(newName.c_str(), m_sCurrentStyleInfo);
}
if (m_sCurrentCursorShapeData.images.size() < 1) {
// fallback to a default if available
constexpr const std::array<const char*, 2> fallbackShapes = {"default", "left_ptr"};
constexpr const std::array<const char*, 3> fallbackShapes = {"default", "left_ptr", "left-ptr"};
for (auto& s : fallbackShapes) {
m_sCurrentCursorShapeData = m_pHyprcursor->getShape(s, m_sCurrentStyleInfo);

42
src/protocols/CursorShape.cpp
View File

@ -7,7 +7,7 @@
constexpr const char* SHAPE_NAMES[] = {
"invalid",
"default",
"context_menu",
"context-menu",
"help",
"pointer",
"progress",
@ -15,31 +15,31 @@ constexpr const char* SHAPE_NAMES[] = {
"cell",
"crosshair",
"text",
"vertical_text",
"vertical-text",
"alias",
"copy",
"move",
"no_drop",
"not_allowed",
"no-drop",
"not-allowed",
"grab",
"grabbing",
"e_resize",
"n_resize",
"ne_resize",
"nw_resize",
"s_resize",
"se_resize",
"sw_resize",
"w_resize",
"ew_resize",
"ns_resize",
"nesw_resize",
"nwse_resize",
"col_resize",
"row_resize",
"all_scroll",
"zoom_in",
"zoom_out",
"e-resize",
"n-resize",
"ne-resize",
"nw-resize",
"s-resize",
"se-resize",
"sw-resize",
"w-resize",
"ew-resize",
"ns-resize",
"nesw-resize",
"nwse-resize",
"col-resize",
"row-resize",
"all-scroll",
"zoom-in",
"zoom-out",
};
// clang-format on