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

xwayland: avoid unfocusing on OR child focuses

Browse source 
fixes #6698
This commit is contained in:
Vaxry 2024-07-21 17:27:15 +02:00
parent efcbcd7297
commit f7fb7e7e49
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xwayland/XWM.cpp
View file

@ -398,10 +398,10 @@ void CXWM::focusWindow(SP<CXWaylandSurface> surf) {
focusedSurface = surf; focusedSurface = surf;
// send state to all surfaces, sometimes we might lose some // send state to all toplevel surfaces, sometimes we might lose some
// that could still stick with the focused atom // that could still stick with the focused atom
for (auto& s : mappedSurfaces) { for (auto& s : mappedSurfaces) {
if (!s) if (!s || s->overrideRedirect)
continue; continue;
sendState(s.lock()); sendState(s.lock());
@ -879,7 +879,7 @@ void CXWM::activateSurface(SP<CXWaylandSurface> surf, bool activate) {
if ((surf == focusedSurface && activate) || (surf && surf->overrideRedirect)) if ((surf == focusedSurface && activate) || (surf && surf->overrideRedirect))
return; return;
if (!activate || !surf) { if (!surf || (!activate || !surf->overrideRedirect /* if we are focusing on an OR child, don't unfocus parent */)) {
setActiveWindow((uint32_t)XCB_WINDOW_NONE); setActiveWindow((uint32_t)XCB_WINDOW_NONE);
focusWindow(nullptr); focusWindow(nullptr);
} else { } else {