hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

renderer: ignore set cursor surface if cursor should be hidden (#4780)

Browse source
This commit is contained in:
André Silva 2024-02-21 13:48:48 +00:00 committed by GitHub
parent ddf022d61c
commit e5eb1bdf01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/render/Renderer.cpp
View file

@ -2152,7 +2152,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
void CHyprRenderer::setCursorSurface(wlr_surface* surf, int hotspotX, int hotspotY, bool force) { void CHyprRenderer::setCursorSurface(wlr_surface* surf, int hotspotX, int hotspotY, bool force) {
m_bCursorHasSurface = surf; m_bCursorHasSurface = surf;
if ((surf == m_sLastCursorData.surf || m_bCursorHidden) && hotspotX == m_sLastCursorData.hotspotX && hotspotY == m_sLastCursorData.hotspotY && !force) if (surf == m_sLastCursorData.surf && hotspotX == m_sLastCursorData.hotspotX && hotspotY == m_sLastCursorData.hotspotY && !force)
return; return;
m_sLastCursorData.name = ""; m_sLastCursorData.name = "";
@ -2160,18 +2160,24 @@ void CHyprRenderer::setCursorSurface(wlr_surface* surf, int hotspotX, int hotspo
m_sLastCursorData.hotspotX = hotspotX; m_sLastCursorData.hotspotX = hotspotX;
m_sLastCursorData.hotspotY = hotspotY; m_sLastCursorData.hotspotY = hotspotY;
if (m_bCursorHidden && !force)
return;
wlr_cursor_set_surface(g_pCompositor->m_sWLRCursor, surf, hotspotX, hotspotY); wlr_cursor_set_surface(g_pCompositor->m_sWLRCursor, surf, hotspotX, hotspotY);
} }
void CHyprRenderer::setCursorFromName(const std::string& name, bool force) { void CHyprRenderer::setCursorFromName(const std::string& name, bool force) {
m_bCursorHasSurface = true; m_bCursorHasSurface = true;
if ((name == m_sLastCursorData.name || m_bCursorHidden) && !force) if (name == m_sLastCursorData.name && !force)
return; return;
m_sLastCursorData.name = name; m_sLastCursorData.name = name;
m_sLastCursorData.surf.reset(); m_sLastCursorData.surf.reset();
if (m_bCursorHidden && !force)
return;
wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, name.c_str()); wlr_cursor_set_xcursor(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sWLRXCursorMgr, name.c_str());
} }