3121643288a5d6d55cef99f706c42b05ec31491c

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

Message

fixup: follow upstream render api changes

Diff

This diff is truncated to protect this page.

  1diff --git a/flake.lock b/flake.lock
  2index d236784f65c5a74e878e89fcb4204e0f3a85af84..ca14c4d683168a74aa93eb909d9884bc8ee19f62 100644
  3--- a/flake.lock
  4+++ b/flake.lock
  5@@ -20,11 +20,11 @@
  6         ]
  7       },
  8       "locked": {
  9-        "lastModified": 1751740947,
 10-        "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=",
 11+        "lastModified": 1753216019,
 12+        "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=",
 13         "owner": "hyprwm",
 14         "repo": "aquamarine",
 15-        "rev": "dfc1db15a08c4cd234288f66e1199c653495301f",
 16+        "rev": "be166e11d86ba4186db93e10c54a141058bdce49",
 17         "type": "github"
 18       },
 19       "original": {
 20@@ -87,11 +87,11 @@
 21         ]
 22       },
 23       "locked": {
 24-        "lastModified": 1749155331,
 25-        "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
 26+        "lastModified": 1753964049,
 27+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
 28         "owner": "hyprwm",
 29         "repo": "hyprcursor",
 30-        "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
 31+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
 32         "type": "github"
 33       },
 34       "original": {
 35@@ -116,11 +116,11 @@
 36         ]
 37       },
 38       "locked": {
 39-        "lastModified": 1751808145,
 40-        "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=",
 41+        "lastModified": 1752149140,
 42+        "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=",
 43         "owner": "hyprwm",
 44         "repo": "hyprgraphics",
 45-        "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f",
 46+        "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a",
 47         "type": "github"
 48       },
 49       "original": {
 50@@ -145,17 +145,17 @@
 51         "xdph": "xdph"
 52       },
 53       "locked": {
 54-        "lastModified": 1752658422,
 55-        "narHash": "sha256-02Gwtihml2IY3l03sumRwuxJUzHe/fCe5DmkPNIZCSc=",
 56+        "lastModified": 1754144468,
 57+        "narHash": "sha256-SOP9IpcrS3MsfYXUXcGpAao77sRZFovk+3kVjg3zmD8=",
 58         "owner": "hyprwm",
 59         "repo": "hyprland",
 60-        "rev": "c4a4c341568944bd4fb9cd503558b2de602c0213",
 61+        "rev": "824438949e60ad6d6fefdfa37f0af8fbe0849934",
 62         "type": "github"
 63       },
 64       "original": {
 65         "owner": "hyprwm",
 66         "repo": "hyprland",
 67-        "rev": "c4a4c341568944bd4fb9cd503558b2de602c0213",
 68+        "rev": "824438949e60ad6d6fefdfa37f0af8fbe0849934",
 69         "type": "github"
 70       }
 71     },
 72@@ -239,11 +239,11 @@
 73         ]
 74       },
 75       "locked": {
 76-        "lastModified": 1750371812,
 77-        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
 78+        "lastModified": 1753819801,
 79+        "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
 80         "owner": "hyprwm",
 81         "repo": "hyprland-qtutils",
 82-        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
 83+        "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
 84         "type": "github"
 85       },
 86       "original": {
 87@@ -268,11 +268,11 @@
 88         ]
 89       },
 90       "locked": {
 91-        "lastModified": 1750371198,
 92-        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
 93+        "lastModified": 1753622892,
 94+        "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
 95         "owner": "hyprwm",
 96         "repo": "hyprlang",
 97-        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
 98+        "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
 99         "type": "github"
100       },
101       "original": {
102@@ -293,11 +293,11 @@
103         ]
104       },
105diff --git a/flake.nix b/flake.nix
106index bc5a6a368e5b95b2fa46d866e0397781234decf0..8b7b641bc44445f6607c440444af585658928f12 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111   inputs = {
112-    hyprland.url = "github:hyprwm/hyprland/c4a4c341568944bd4fb9cd503558b2de602c0213";
113+    hyprland.url = "github:hyprwm/hyprland/824438949e60ad6d6fefdfa37f0af8fbe0849934";
114   };
115 
116   outputs = { self, hyprland, ... }: let
117diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
118index d993fe6fa9ffc9e3c7b5d5de2e07f8f62e72258a..e7a7fd413eaba1f90804a22715d0f7d3dde393af 100644
119--- a/src/TabGroup.cpp
120+++ b/src/TabGroup.cpp
121@@ -360,7 +360,7 @@ void Hy3TabBarEntry::renderText(float scale, CBox& box, float opacity) {
122 	glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_ALPHA);
123 	glBlendColor(c.r, c.g, c.b, c.a);
124 
125-	g_pHyprOpenGL->renderTexture(this->texture, texture_box, opacity);
126+	g_pHyprOpenGL->renderTexture(this->texture, texture_box, { .a = opacity });
127 
128 	glBlendColor(1, 1, 1, 1);
129 	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
130@@ -767,7 +767,7 @@ void Hy3TabGroup::renderTabBar() {
131 			window_box.scale(scale);
132 
133 			if (window_box.width > 0 && window_box.height > 0)
134-				g_pHyprOpenGL->renderRect(window_box, CHyprColor(0, 0, 0, 0), *window_rounding);
135+				g_pHyprOpenGL->renderRect(window_box, CHyprColor(0, 0, 0, 0), { .round = *window_rounding });
136 		}
137 
138 		glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);