diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-06-26 20:08:19 +0200 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-06-26 20:08:19 +0200 |
| commit | 6a47a305f8e5ddd7a4e813b47aca2af188e00d26 (patch) | |
| tree | b8371ffca016a6215e02e4f374e5e30202250ebb /src | |
| parent | 1a0b2c4ade0b221a1fee013702fd01b8a794951b (diff) | |
fix some xwayland popups
Diffstat (limited to 'src')
| -rw-r--r-- | src/Window.hpp | 1 | ||||
| -rw-r--r-- | src/events/Windows.cpp | 2 | ||||
| -rw-r--r-- | src/managers/XWaylandManager.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/Window.hpp b/src/Window.hpp index 9f92432a..2086c903 100644 --- a/src/Window.hpp +++ b/src/Window.hpp @@ -76,6 +76,7 @@ public: // For nofocus bool m_bNoFocus = false; + bool m_bNoInitialFocus = false; SSurfaceTreeNode* m_pSurfaceTree = nullptr; diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 76dfadda..f0b38c10 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -228,7 +228,7 @@ void Events::listener_mapWindow(void* owner, void* data) { PWINDOW->m_vPseudoSize = PWINDOW->m_vRealSize.goalv() - Vector2D(10,10); } - if (!PWINDOW->m_bNoFocus) + if (!PWINDOW->m_bNoFocus && !PWINDOW->m_bNoInitialFocus) g_pCompositor->focusWindow(PWINDOW); PWINDOW->m_pSurfaceTree = SubsurfaceTree::createTreeRoot(g_pXWaylandManager->getWindowSurface(PWINDOW), addViewCoords, PWINDOW, PWINDOW); diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp index 65f5ddd8..fbb6693e 100644 --- a/src/managers/XWaylandManager.cpp +++ b/src/managers/XWaylandManager.cpp @@ -146,8 +146,10 @@ bool CHyprXWaylandManager::shouldBeFloated(CWindow* pWindow) { if (pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_DIALOG"] || pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_SPLASH"] || pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_TOOLBAR"] || pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_UTILITY"] || pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_TOOLTIP"] || pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_POPUP_MENU"] || - pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_DOCK"] || pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_DROPDOWN_MENU"]) + pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_DOCK"] || pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_DROPDOWN_MENU"] || + pWindow->m_uSurface.xwayland->window_type[i] == HYPRATOMS["_NET_WM_WINDOW_TYPE_MENU"]) { + pWindow->m_bNoInitialFocus = true; return true; } |