0f32517e29b923b9ad230fd4bf9968bf68115e17

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

Message

fixup: chase 0.56.0

Diff

This diff is truncated to protect this page.

  1diff --git a/flake.lock b/flake.lock
  2index 01347bdb68339f5d26ade4fa7ba70b8065c20e61..4869a77af1c29a7e306eb0b6c6932f44db9ede7f 100644
  3--- a/flake.lock
  4+++ b/flake.lock
  5@@ -20,11 +20,11 @@
  6         ]
  7       },
  8       "locked": {
  9-        "lastModified": 1782073106,
 10-        "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=",
 11+        "lastModified": 1784368054,
 12+        "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=",
 13         "owner": "hyprwm",
 14         "repo": "aquamarine",
 15-        "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457",
 16+        "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0",
 17         "type": "github"
 18       },
 19       "original": {
 20@@ -124,17 +124,17 @@
 21         "xdph": "xdph"
 22       },
 23       "locked": {
 24-        "lastModified": 1783881054,
 25-        "narHash": "sha256-FeiCDFKENNVFt/PMAqYiCUAJQm+SCPItcilh613dEjQ=",
 26+        "lastModified": 1784533848,
 27+        "narHash": "sha256-1dt2IyLBRn9ji79xxv82/Gh7semHCk8cjajtg72sWGI=",
 28         "owner": "hyprwm",
 29         "repo": "hyprland",
 30-        "rev": "f4b9c1ab240f5c5d2b5a2e659113361e476772a5",
 31+        "rev": "36b2e0cfe0c6094dbc47bd42a437431315bb3087",
 32         "type": "github"
 33       },
 34       "original": {
 35         "owner": "hyprwm",
 36         "repo": "hyprland",
 37-        "rev": "f4b9c1ab240f5c5d2b5a2e659113361e476772a5",
 38+        "rev": "36b2e0cfe0c6094dbc47bd42a437431315bb3087",
 39         "type": "github"
 40       }
 41     },
 42@@ -171,11 +171,11 @@
 43         ]
 44       },
 45       "locked": {
 46-        "lastModified": 1782563850,
 47-        "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=",
 48+        "lastModified": 1784196523,
 49+        "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=",
 50         "owner": "hyprwm",
 51         "repo": "hyprland-guiutils",
 52-        "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178",
 53+        "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0",
 54         "type": "github"
 55       },
 56       "original": {
 57@@ -302,11 +302,11 @@
 58         ]
 59       },
 60       "locked": {
 61-        "lastModified": 1783002634,
 62-        "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=",
 63+        "lastModified": 1784323413,
 64+        "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=",
 65         "owner": "hyprwm",
 66         "repo": "hyprutils",
 67-        "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1",
 68+        "rev": "5f03477ab3a005ff27c527486f551883535aea2f",
 69         "type": "github"
 70       },
 71       "original": {
 72@@ -371,11 +371,11 @@
 73     },
 74     "nixpkgs": {
 75       "locked": {
 76-        "lastModified": 1783522502,
 77-        "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=",
 78+        "lastModified": 1784356753,
 79+        "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=",
 80         "owner": "NixOS",
 81         "repo": "nixpkgs",
 82-        "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612",
 83+        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
 84         "type": "github"
 85       },
 86       "original": {
 87@@ -394,11 +394,11 @@
 88         ]
 89       },
 90       "locked": {
 91-        "lastModified": 1783008725,
 92-        "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=",
 93+        "lastModified": 1784288435,
 94+        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
 95         "owner": "cachix",
 96         "repo": "git-hooks.nix",
 97-        "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe",
 98+        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
 99         "type": "github"
100       },
101       "original": {
102@@ -455,11 +455,11 @@
103         ]
104       },
105diff --git a/flake.nix b/flake.nix
106index 4c34e5025aadeb5d9852d502e7cacb7d28cd50b6..d59f7f339c38199a205c14e3637b05c533e00e23 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111   inputs = {
112-    hyprland.url = "github:hyprwm/hyprland/f4b9c1ab240f5c5d2b5a2e659113361e476772a5";
113+    hyprland.url = "github:hyprwm/hyprland/36b2e0cfe0c6094dbc47bd42a437431315bb3087";
114   };
115 
116   outputs = {
117diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
118index ec1d6164e88ca0fc542c007fdc5b019058b483a1..8a5f63855b178f54fb1fe85f089e34b5a697744e 100644
119--- a/src/TabGroup.cpp
120+++ b/src/TabGroup.cpp
121@@ -11,6 +11,7 @@
122 #include <hyprland/src/config/ConfigManager.hpp>
123 #include <hyprland/src/desktop/DesktopTypes.hpp>
124 #include <hyprland/src/desktop/Workspace.hpp>
125+#include <hyprland/src/desktop/view/types/Geometric.hpp>
126 #include <hyprland/src/helpers/Color.hpp>
127 #include <hyprland/src/animation/AnimationManager.hpp>
128 #include <hyprland/src/managers/input/InputManager.hpp>
129@@ -31,6 +32,7 @@
130 #include "render/pass/PassElement.hpp"
131 
132 using Hyprgraphics::CColor;
133+using Desktop::View::IGeometric;
134 
135 // This is a workaround CHyprColor not having working arithmetic operator...
136 template <typename... Args>
137@@ -796,11 +798,10 @@ void Hy3TabGroup::renderTabBar() {
138 			if (!valid(windowref)) continue;
139 			auto window = windowref.lock();
140 
141-			auto wpos =
142-			    window->m_realPosition->value() - monitor->m_position
143-			    + (window->m_workspace ? window->m_workspace->m_renderOffset->value() : Vector2D());
144+			auto wpos = window->position(IGeometric::GEOMETRIC_CURRENT) - monitor->m_position
145+			          + (window->m_workspace ? window->m_workspace->m_renderOffset->value() : Vector2D());
146 
147-			auto wsize = window->m_realSize->value();
148+			auto wsize = window->size(IGeometric::GEOMETRIC_CURRENT);
149 
150 			CBox window_box = {wpos.x, wpos.y, wsize.x, wsize.y};
151 			auto border = window->getRealBorderSize();