449c9d67f84869e2cc974b12edc8db37acf75d7b

Author
Arjun31415 <arjunp0710@gmail.com>
Committer
Arjun31415 <arjunp0710@gmail.com>
Date

Message

Fix hy3 build
`m_bNoFocus` field moved to struct `m_sAdditionalConfigData`. Ref https://github.com/hyprwm/Hyprland/pull/4672

Diff

 1diff --git a/flake.lock b/flake.lock
 2index 410c5fe41ba94d8f44c26b4047602a1bf1f2a2c9..d4b336c89ec2a7a5de2ba1822bb68763065d233c 100644
 3--- a/flake.lock
 4+++ b/flake.lock
 5@@ -9,11 +9,11 @@
 6         "xdph": "xdph"
 7       },
 8       "locked": {
 9-        "lastModified": 1707098342,
10-        "narHash": "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=",
11+        "lastModified": 1707847639,
12+        "narHash": "sha256-mBmt1lFImpIK8VwHkJIenzVS95wD67dsfH1oRk2RiEg=",
13         "owner": "hyprwm",
14         "repo": "Hyprland",
15-        "rev": "84ab8d11e8951a6551d1e1bf87796a8589da6d47",
16+        "rev": "2a3429d4cfdc01794b9d6fc1b49be1da019b5606",
17         "type": "github"
18       },
19       "original": {
20@@ -71,11 +71,11 @@
21     },
22     "nixpkgs": {
23       "locked": {
24-        "lastModified": 1706191920,
25-        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
26+        "lastModified": 1707546158,
27+        "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
28         "owner": "NixOS",
29         "repo": "nixpkgs",
30-        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
31+        "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
32         "type": "github"
33       },
34       "original": {
35@@ -141,11 +141,11 @@
36         ]
37       },
38       "locked": {
39-        "lastModified": 1706145785,
40-        "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=",
41+        "lastModified": 1706521509,
42+        "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=",
43         "owner": "hyprwm",
44         "repo": "xdg-desktop-portal-hyprland",
45-        "rev": "5a592647587cd20b9692a347df6939b6d371b3bb",
46+        "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8",
47         "type": "github"
48       },
49       "original": {
50diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
51index f341ecedff46b0169b867e4607655f5157394aa7..a99dd96bb5fb3fba9baae3362de000390d062931 100644
52--- a/src/Hy3Layout.cpp
53+++ b/src/Hy3Layout.cpp
54@@ -630,7 +630,7 @@ CWindow* Hy3Layout::getNextWindowCandidate(CWindow* window) {
55 		for (auto& w: g_pCompositor->m_vWindows | std::views::reverse) {
56 			if (w->m_bIsMapped && !w->isHidden() && w->m_bIsFloating && w->m_iX11Type != 2
57 			    && w->m_iWorkspaceID == window->m_iWorkspaceID && !w->m_bX11ShouldntFocus
58-			    && !w->m_bNoFocus && w.get() != window)
59+			    && !w->m_sAdditionalConfigData.noFocus && w.get() != window)
60 			{
61 				return w.get();
62 			}