mirror of
https://github.com/hyprwm/Hyprland.git
synced 2025-08-02 05:01:56 -07:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
12f9a0d0b9 | ||
|
fab0f426b5 | ||
|
e735eae4ad | ||
|
57cf6d81a9 |
12
flake.lock
generated
12
flake.lock
generated
@@ -16,11 +16,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731774881,
|
"lastModified": 1731959031,
|
||||||
"narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
|
"narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
|
"rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -229,11 +229,11 @@
|
|||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731363552,
|
"lastModified": 1732021966,
|
||||||
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
|
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
|
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@@ -1389,6 +1389,9 @@ void CCompositor::changeWindowZOrder(PHLWINDOW pWindow, bool top) {
|
|||||||
if (!validMapped(pWindow))
|
if (!validMapped(pWindow))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (top)
|
||||||
|
pWindow->m_bCreatedOverFullscreen = true;
|
||||||
|
|
||||||
if (pWindow == (top ? m_vWindows.back() : m_vWindows.front()))
|
if (pWindow == (top ? m_vWindows.back() : m_vWindows.front()))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -1413,9 +1416,6 @@ void CCompositor::changeWindowZOrder(PHLWINDOW pWindow, bool top) {
|
|||||||
g_pHyprRenderer->damageMonitor(pw->m_pMonitor.lock());
|
g_pHyprRenderer->damageMonitor(pw->m_pMonitor.lock());
|
||||||
};
|
};
|
||||||
|
|
||||||
if (top)
|
|
||||||
pWindow->m_bCreatedOverFullscreen = true;
|
|
||||||
|
|
||||||
if (!pWindow->m_bIsX11)
|
if (!pWindow->m_bIsX11)
|
||||||
moveToZ(pWindow, top);
|
moveToZ(pWindow, top);
|
||||||
else {
|
else {
|
||||||
|
@@ -324,10 +324,14 @@ void CXDGToplevelResource::close() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Vector2D CXDGToplevelResource::layoutMinSize() {
|
Vector2D CXDGToplevelResource::layoutMinSize() {
|
||||||
|
if (current.minSize.x <= 1 && current.minSize.y <= 1)
|
||||||
|
return {0, 0};
|
||||||
return owner ? current.minSize + owner->current.geometry.pos() : current.minSize;
|
return owner ? current.minSize + owner->current.geometry.pos() : current.minSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector2D CXDGToplevelResource::layoutMaxSize() {
|
Vector2D CXDGToplevelResource::layoutMaxSize() {
|
||||||
|
if (current.maxSize.x <= 1 && current.maxSize.y <= 1)
|
||||||
|
return {0, 0};
|
||||||
return owner ? current.maxSize + owner->current.geometry.pos() : current.maxSize;
|
return owner ? current.maxSize + owner->current.geometry.pos() : current.maxSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user