diff --git a/flake.lock b/flake.lock index ba51f5d..53bf8a6 100644 --- a/flake.lock +++ b/flake.lock @@ -8,17 +8,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1685907323, - "narHash": "sha256-P6GbgWE72pLEhyI8+Bofzph0boZItKUDM/94xwOgE8I=", + "lastModified": 1686764691, + "narHash": "sha256-H4Pd2ny0euUNqYAQEi4ZQhbgUCBXarceOokNnjGcUSE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4ef684f6153c167afd6e84c01a814f46d9f287ae", + "rev": "c4dec4f79697cb789b585f8e4febf92e929b5291", "type": "github" }, "original": { - "owner": "outfoxxed", + "owner": "hyprwm", "repo": "Hyprland", - "rev": "51441d5b9de13335e5723cdbb78e372ebe36490e", "type": "github" } }, @@ -45,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "type": "github" }, "original": { @@ -68,11 +67,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1685803001, - "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=", + "lastModified": 1686573751, + "narHash": "sha256-5vnFxEMvn4wzT+XKR5Jo8VSn1hXrdf/mWuTmdHhRFBs=", "owner": "wlroots", "repo": "wlroots", - "rev": "b61d5922f1d0910a848deb100570ad8587aea38d", + "rev": "6e8fb5509f2c94d09d4efa0f9b1f40b37bf73863", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 6cfab11..4eac23c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { - #hyprland.url = "github:hyprwm/Hyprland"; - hyprland.url = "github:outfoxxed/Hyprland?rev=51441d5b9de13335e5723cdbb78e372ebe36490e"; + hyprland.url = "github:hyprwm/Hyprland"; }; outputs = { self, hyprland, ... }: let @@ -42,7 +41,7 @@ name = "hy3"; nativeBuildInputs = with pkgs; [ - clang-tools_16 + clang-tools bear ]; diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp index 96b8b76..6d2bcf2 100644 --- a/src/Hy3Layout.cpp +++ b/src/Hy3Layout.cpp @@ -196,8 +196,11 @@ void Hy3Node::recalcSizePosRecursive(bool force) { double offset = 0; - if (group->layout == Hy3GroupLayout::Tabbed && group->focused_child != nullptr) { + if (group->layout == Hy3GroupLayout::Tabbed && group->focused_child != nullptr && !group->focused_child->hidden) { group->focused_child->setHidden(false); + + auto box = wlr_box { tpos.x, tpos.y, tsize.x, tsize.y }; + g_pHyprRenderer->damageBox(&box); } for (auto* child: group->children) {