mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-12 20:25:59 +01:00
Merge branch 'main' into fix-active-window-json-bools
This commit is contained in:
commit
6d788f0fc9
2 changed files with 5 additions and 2 deletions
|
@ -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,
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue