6643cbb6d4b3afa9e988e9cf4291b971ee3d65a1

Author
outfoxxed <outfoxxed@outfoxxed.me>
Committer
outfoxxed <outfoxxed@outfoxxed.me>
Date

Message

Update tracked hyprland

Diff

 1diff --git a/flake.lock b/flake.lock
 2index ba51f5d05eb42c4723f46803123c8e34f37f2b90..53bf8a6257b9d039943ba343abcea550acf06eaf 100644
 3--- a/flake.lock
 4+++ b/flake.lock
 5@@ -8,17 +8,16 @@
 6         "xdph": "xdph"
 7       },
 8       "locked": {
 9-        "lastModified": 1685907323,
10-        "narHash": "sha256-P6GbgWE72pLEhyI8+Bofzph0boZItKUDM/94xwOgE8I=",
11+        "lastModified": 1686764691,
12+        "narHash": "sha256-H4Pd2ny0euUNqYAQEi4ZQhbgUCBXarceOokNnjGcUSE=",
13         "owner": "hyprwm",
14         "repo": "Hyprland",
15-        "rev": "4ef684f6153c167afd6e84c01a814f46d9f287ae",
16+        "rev": "c4dec4f79697cb789b585f8e4febf92e929b5291",
17         "type": "github"
18       },
19       "original": {
20-        "owner": "outfoxxed",
21+        "owner": "hyprwm",
22         "repo": "Hyprland",
23-        "rev": "51441d5b9de13335e5723cdbb78e372ebe36490e",
24         "type": "github"
25       }
26     },
27@@ -45,11 +44,11 @@
28     },
29     "nixpkgs": {
30       "locked": {
31-        "lastModified": 1685655444,
32-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
33+        "lastModified": 1686501370,
34+        "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
35         "owner": "NixOS",
36         "repo": "nixpkgs",
37-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
38+        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
39         "type": "github"
40       },
41       "original": {
42@@ -68,11 +67,11 @@
43       "flake": false,
44       "locked": {
45         "host": "gitlab.freedesktop.org",
46-        "lastModified": 1685803001,
47-        "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=",
48+        "lastModified": 1686573751,
49+        "narHash": "sha256-5vnFxEMvn4wzT+XKR5Jo8VSn1hXrdf/mWuTmdHhRFBs=",
50         "owner": "wlroots",
51         "repo": "wlroots",
52-        "rev": "b61d5922f1d0910a848deb100570ad8587aea38d",
53+        "rev": "6e8fb5509f2c94d09d4efa0f9b1f40b37bf73863",
54         "type": "gitlab"
55       },
56       "original": {
57diff --git a/flake.nix b/flake.nix
58index 6cfab11ab4c45e9bf6f8dabb678f185fbea883c6..4eac23c38d13bc99fd9fea1c42bad31a0b911c01 100644
59--- a/flake.nix
60+++ b/flake.nix
61@@ -1,7 +1,6 @@
62 {
63   inputs = {
64-    #hyprland.url = "github:hyprwm/Hyprland";
65-    hyprland.url = "github:outfoxxed/Hyprland?rev=51441d5b9de13335e5723cdbb78e372ebe36490e";
66+    hyprland.url = "github:hyprwm/Hyprland";
67   };
68 
69   outputs = { self, hyprland, ... }: let
70@@ -42,7 +41,7 @@
71         name = "hy3";
72 
73         nativeBuildInputs = with pkgs; [
74-          clang-tools_16
75+          clang-tools
76           bear
77         ];
78 
79diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
80index 96b8b7612bb3188fee608c0b91e4049e10ee9d7e..6d2bcf288cde74664c4ffbad692a2b9d166590e3 100644
81--- a/src/Hy3Layout.cpp
82+++ b/src/Hy3Layout.cpp
83@@ -196,8 +196,11 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
84 
85 	double offset = 0;
86 
87-	if (group->layout == Hy3GroupLayout::Tabbed && group->focused_child != nullptr) {
88+	if (group->layout == Hy3GroupLayout::Tabbed && group->focused_child != nullptr && !group->focused_child->hidden) {
89 		group->focused_child->setHidden(false);
90+
91+		auto box = wlr_box { tpos.x, tpos.y, tsize.x, tsize.y };
92+		g_pHyprRenderer->damageBox(&box);
93 	}
94 
95 	for (auto* child: group->children) {