Diff
1diff --git a/flake.lock b/flake.lock
2index fa5d3decfcd3715d500d4cfc7589d9c9069c8659..a588c3d33e0a625373d7baa3a984257c05250b90 100644
3--- a/flake.lock
4+++ b/flake.lock
5@@ -20,11 +20,11 @@
6 ]
7 },
8 "locked": {
9- "lastModified": 1724006173,
10- "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=",
11+ "lastModified": 1725268610,
12+ "narHash": "sha256-EaKtf4mESHvHF2ak5Lt7ycSTLqdjI+Ry+zWpQaPqgD8=",
13 "owner": "hyprwm",
14 "repo": "aquamarine",
15- "rev": "7f8df01d4297b9068a9592400f16044602844f86",
16+ "rev": "aac97a1fd10d18d97b3f9415e712926374808823",
17 "type": "github"
18 },
19 "original": {
20@@ -74,16 +74,16 @@
21 "xdph": "xdph"
22 },
23 "locked": {
24- "lastModified": 1724085862,
25- "narHash": "sha256-qIPLv+MmTVZ0sjhx99EZhe/2aGzy5JOskmlqPd6DNFQ=",
26- "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae",
27- "revCount": 5115,
28+ "lastModified": 1725465540,
29+ "narHash": "sha256-9OhDjPMwomJbGuIv5mFAvu/AV6ETTVHz08wVP1goNkY=",
30+ "rev": "027140b7315efe3cd2e7b78fa608bd36da839894",
31+ "revCount": 5184,
32 "submodules": true,
33 "type": "git",
34 "url": "https://github.com/hyprwm/Hyprland"
35 },
36 "original": {
37- "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae",
38+ "rev": "027140b7315efe3cd2e7b78fa608bd36da839894",
39 "submodules": true,
40 "type": "git",
41 "url": "https://github.com/hyprwm/Hyprland"
42@@ -132,11 +132,11 @@
43 ]
44 },
45 "locked": {
46- "lastModified": 1721324361,
47- "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
48+ "lastModified": 1725188252,
49+ "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
50 "owner": "hyprwm",
51 "repo": "hyprlang",
52- "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
53+ "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
54 "type": "github"
55 },
56 "original": {
57@@ -157,11 +157,11 @@
58 ]
59 },
60 "locked": {
61- "lastModified": 1722869141,
62- "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
63+ "lastModified": 1724966483,
64+ "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
65 "owner": "hyprwm",
66 "repo": "hyprutils",
67- "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
68+ "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
69 "type": "github"
70 },
71 "original": {
72@@ -197,11 +197,11 @@
73 },
74 "nixpkgs": {
75 "locked": {
76- "lastModified": 1723637854,
77- "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
78+ "lastModified": 1724479785,
79+ "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
80 "owner": "NixOS",
81 "repo": "nixpkgs",
82- "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
83+ "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
84 "type": "github"
85 },
86 "original": {
87@@ -248,11 +248,11 @@
88 ]
89 },
90 "locked": {
91- "lastModified": 1722365976,
92- "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
93+ "lastModified": 1725203932,
94+ "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
95 "owner": "hyprwm",
96 "repo": "xdg-desktop-portal-hyprland",
97- "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
98+ "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
99 "type": "github"
100 },
101 "original": {
102diff --git a/flake.nix b/flake.nix
103index 205c12ddb4e4ca699507d8d0c878a61e00ff5d21..3ec61c45c755779043fd9f4a410503c84033e137 100644
104--- a/flake.nix
105+++ b/flake.nix
106@@ -1,6 +1,6 @@
107 {
108 inputs = {
109- hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae";
110+ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&rev=027140b7315efe3cd2e7b78fa608bd36da839894";
111 };
112
113 outputs = { self, hyprland, ... }: let
114diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
115index 2f6b55043b8c10cc582ef014b6e65f22c35e47f9..ace91d31d46e5341e69d86e027695bbf46d4ac73 100644
116--- a/src/Hy3Layout.cpp
117+++ b/src/Hy3Layout.cpp
118@@ -621,7 +621,7 @@ PHLWINDOW Hy3Layout::getNextWindowCandidate(PHLWINDOW window) {
119 // return the first floating window on the same workspace that has not asked not to be focused
120 if (window->m_bIsFloating) {
121 for (auto& w: g_pCompositor->m_vWindows | std::views::reverse) {
122- if (w->m_bIsMapped && !w->isHidden() && w->m_bIsFloating && w->m_iX11Type != 2
123+ if (w->m_bIsMapped && !w->isHidden() && w->m_bIsFloating && !w->isX11OverrideRedirect()
124 && w->m_pWorkspace == window->m_pWorkspace && !w->m_bX11ShouldntFocus
125 && !w->m_sWindowData.noFocus.valueOrDefault() && w != window)
126 {