cc953fc8c0b0c7fedbbc5e4656dae1326b673fdf

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

Message

fixup: fix compile against hyprland main

Diff

  1diff --git a/flake.lock b/flake.lock
  2index 977c77c617b3e7e3cdeca567fee7a1fed43539b3..21cd9cfa12170897b7d71a2fca24ec34f08b59ae 100644
  3--- a/flake.lock
  4+++ b/flake.lock
  5@@ -13,11 +13,11 @@
  6         ]
  7       },
  8       "locked": {
  9-        "lastModified": 1710257359,
 10-        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
 11+        "lastModified": 1711466786,
 12+        "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
 13         "owner": "hyprwm",
 14         "repo": "hyprcursor",
 15-        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
 16+        "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
 17         "type": "github"
 18       },
 19       "original": {
 20@@ -37,11 +37,11 @@
 21         "xdph": "xdph"
 22       },
 23       "locked": {
 24-        "lastModified": 1711070930,
 25-        "narHash": "sha256-jKOAO/NlfaTC/OcZkPoT87gsfVqt/+Ye+KcaIv6e2mU=",
 26+        "lastModified": 1711673030,
 27+        "narHash": "sha256-atpS9c2LR56DIURlDLmuKHGmVQj9Xky2aETGhdTwMKg=",
 28         "owner": "hyprwm",
 29         "repo": "Hyprland",
 30-        "rev": "9bad62b85f179ad2c95c6e7f734768ef060a604b",
 31+        "rev": "fcd9d77b642c0cd45cae61cf10ed1924f2e7945b",
 32         "type": "github"
 33       },
 34       "original": {
 35@@ -110,11 +110,11 @@
 36         ]
 37       },
 38       "locked": {
 39-        "lastModified": 1709914708,
 40-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
 41+        "lastModified": 1711250455,
 42+        "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
 43         "owner": "hyprwm",
 44         "repo": "hyprlang",
 45-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
 46+        "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
 47         "type": "github"
 48       },
 49       "original": {
 50@@ -125,11 +125,11 @@
 51     },
 52     "nixpkgs": {
 53       "locked": {
 54-        "lastModified": 1710272261,
 55-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
 56+        "lastModified": 1711523803,
 57+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
 58         "owner": "NixOS",
 59         "repo": "nixpkgs",
 60-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
 61+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
 62         "type": "github"
 63       },
 64       "original": {
 65diff --git a/src/Hy3Layout.hpp b/src/Hy3Layout.hpp
 66index 766d0bba9d3a5ed5d6d6a9410d6adc646ad15108..d269229f6acd6fdad1f84eef739146a5f189262b 100644
 67--- a/src/Hy3Layout.hpp
 68+++ b/src/Hy3Layout.hpp
 69@@ -89,6 +89,7 @@ public:
 70 	virtual void replaceWindowDataWith(CWindow* from, CWindow* to);
 71 	virtual bool isWindowReachable(CWindow*);
 72 	virtual void bringWindowToTop(CWindow*);
 73+	virtual Vector2D predictSizeForNewWindowTiled() { return Vector2D(); }
 74 
 75 	virtual void onEnable();
 76 	virtual void onDisable();
 77diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
 78index 54836838308dcee09e80f802b781677898b81a68..46651dded0fbe1a566861dc8e2a90579bf8b2b26 100644
 79--- a/src/TabGroup.cpp
 80+++ b/src/TabGroup.cpp
 81@@ -11,47 +11,23 @@
 82 #include "globals.hpp"
 83 
 84 Hy3TabBarEntry::Hy3TabBarEntry(Hy3TabBar& tab_bar, Hy3Node& node): tab_bar(tab_bar), node(node) {
 85-	this->focused.create(
 86-	    0.0f,
 87-	    g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"),
 88-	    nullptr,
 89-	    AVARDAMAGE_NONE
 90-	);
 91+	this->focused
 92+	    .create(0.0f, g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"), AVARDAMAGE_NONE);
 93 
 94-	this->urgent.create(
 95-	    0.0f,
 96-	    g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"),
 97-	    nullptr,
 98-	    AVARDAMAGE_NONE
 99-	);
100+	this->urgent
101+	    .create(0.0f, g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"), AVARDAMAGE_NONE);
102 
103-	this->offset.create(
104-	    -1.0f,
105-	    g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
106-	    nullptr,
107-	    AVARDAMAGE_NONE
108-	);
109+	this->offset
110+	    .create(-1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
111 
112-	this->width.create(
113-	    -1.0f,
114-	    g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
115-	    nullptr,
116-	    AVARDAMAGE_NONE
117-	);
118+	this->width
119+	    .create(-1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
120 
121-	this->vertical_pos.create(
122-	    1.0f,
123-	    g_pConfigManager->getAnimationPropertyConfig("windowsIn"),
124-	    nullptr,
125-	    AVARDAMAGE_NONE
126-	);
127+	this->vertical_pos
128+	    .create(1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsIn"), AVARDAMAGE_NONE);
129 
130-	this->fade_opacity.create(
131-	    0.0f,
132-	    g_pConfigManager->getAnimationPropertyConfig("windowsIn"),
133-	    nullptr,
134-	    AVARDAMAGE_NONE
135-	);
136+	this->fade_opacity
137+	    .create(0.0f, g_pConfigManager->getAnimationPropertyConfig("windowsIn"), AVARDAMAGE_NONE);
138 
139 	this->focused.registerVar();
140 	this->urgent.registerVar();
141@@ -271,12 +247,8 @@ void Hy3TabBarEntry::prepareTexture(float scale, CBox& box) {
142 }
143 
144 Hy3TabBar::Hy3TabBar() {
145-	this->fade_opacity.create(
146-	    1.0f,
147-	    g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
148-	    nullptr,
149-	    AVARDAMAGE_NONE
150-	);
151+	this->fade_opacity
152+	    .create(1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
153 
154 	this->fade_opacity.registerVar();
155 	this->fade_opacity.setUpdateCallback([this](void*) { this->dirty = true; });
156@@ -423,17 +395,9 @@ void Hy3TabBar::setSize(Vector2D size) {
157 }
158 
159 Hy3TabGroup::Hy3TabGroup(Hy3Node& node) {
160-	this->pos.create(
161-	    g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
162-	    nullptr,
163-	    AVARDAMAGE_NONE
164-	);
165+	this->pos.create(g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
166 
167-	this->size.create(
168-	    g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
169-	    nullptr,
170-	    AVARDAMAGE_NONE
171-	);
172+	this->size.create(g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
173 
174 	this->pos.registerVar();
175 	this->size.registerVar();