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

Merge branch 'main' into fix-active-window-json-bools

Browse source
This commit is contained in:
Yavor Kolev 2022-08-08 13:51:08 -07:00 committed by GitHub
commit 6d788f0fc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/debug/HyprCtl.cpp
View file

@ -169,12 +169,12 @@ R"#({
"id": %i, "id": %i,
"name": "%s" "name": "%s"
}, },
"floating": %s, "floating": %i,
"monitor": %i, "monitor": %i,
"class": "%s", "class": "%s",
"title": "%s", "title": "%s",
"pid": %i, "pid": %i,
"xwayland": %s "xwayland": %i
})#", })#",
PWINDOW, PWINDOW,
(int)PWINDOW->m_vRealPosition.vec().x, (int)PWINDOW->m_vRealPosition.vec().y, (int)PWINDOW->m_vRealPosition.vec().x, (int)PWINDOW->m_vRealPosition.vec().y,

3
src/managers/KeybindManager.cpp
View file

@ -736,6 +736,9 @@ void CKeybindManager::moveFocusTo(std::string args) {
const auto PLASTWINDOW = g_pCompositor->m_pLastWindow; const auto PLASTWINDOW = g_pCompositor->m_pLastWindow;
if (!PLASTWINDOW)
return;
// remove constraints // remove constraints
g_pCompositor->m_sSeat.mouse->constraintActive = false; g_pCompositor->m_sSeat.mouse->constraintActive = false;