mirror of
https://github.com/Trensa-Organization/hy3.git
synced 2025-03-15 18:53:40 +01:00
fixup: fix compile against hyprland main
This commit is contained in:
parent
315e7902c9
commit
cc953fc8c0
3 changed files with 29 additions and 64 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -13,11 +13,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710257359,
|
"lastModified": 1711466786,
|
||||||
"narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
|
"narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprcursor",
|
"repo": "hyprcursor",
|
||||||
"rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
|
"rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -37,11 +37,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711070930,
|
"lastModified": 1711673030,
|
||||||
"narHash": "sha256-jKOAO/NlfaTC/OcZkPoT87gsfVqt/+Ye+KcaIv6e2mU=",
|
"narHash": "sha256-atpS9c2LR56DIURlDLmuKHGmVQj9Xky2aETGhdTwMKg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "9bad62b85f179ad2c95c6e7f734768ef060a604b",
|
"rev": "fcd9d77b642c0cd45cae61cf10ed1924f2e7945b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -110,11 +110,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709914708,
|
"lastModified": 1711250455,
|
||||||
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
|
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
|
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -125,11 +125,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710272261,
|
"lastModified": 1711523803,
|
||||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -89,6 +89,7 @@ public:
|
||||||
virtual void replaceWindowDataWith(CWindow* from, CWindow* to);
|
virtual void replaceWindowDataWith(CWindow* from, CWindow* to);
|
||||||
virtual bool isWindowReachable(CWindow*);
|
virtual bool isWindowReachable(CWindow*);
|
||||||
virtual void bringWindowToTop(CWindow*);
|
virtual void bringWindowToTop(CWindow*);
|
||||||
|
virtual Vector2D predictSizeForNewWindowTiled() { return Vector2D(); }
|
||||||
|
|
||||||
virtual void onEnable();
|
virtual void onEnable();
|
||||||
virtual void onDisable();
|
virtual void onDisable();
|
||||||
|
|
|
@ -11,47 +11,23 @@
|
||||||
#include "globals.hpp"
|
#include "globals.hpp"
|
||||||
|
|
||||||
Hy3TabBarEntry::Hy3TabBarEntry(Hy3TabBar& tab_bar, Hy3Node& node): tab_bar(tab_bar), node(node) {
|
Hy3TabBarEntry::Hy3TabBarEntry(Hy3TabBar& tab_bar, Hy3Node& node): tab_bar(tab_bar), node(node) {
|
||||||
this->focused.create(
|
this->focused
|
||||||
0.0f,
|
.create(0.0f, g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->urgent.create(
|
this->urgent
|
||||||
0.0f,
|
.create(0.0f, g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("fadeSwitch"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->offset.create(
|
this->offset
|
||||||
-1.0f,
|
.create(-1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->width.create(
|
this->width
|
||||||
-1.0f,
|
.create(-1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->vertical_pos.create(
|
this->vertical_pos
|
||||||
1.0f,
|
.create(1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsIn"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("windowsIn"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->fade_opacity.create(
|
this->fade_opacity
|
||||||
0.0f,
|
.create(0.0f, g_pConfigManager->getAnimationPropertyConfig("windowsIn"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("windowsIn"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->focused.registerVar();
|
this->focused.registerVar();
|
||||||
this->urgent.registerVar();
|
this->urgent.registerVar();
|
||||||
|
@ -271,12 +247,8 @@ void Hy3TabBarEntry::prepareTexture(float scale, CBox& box) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Hy3TabBar::Hy3TabBar() {
|
Hy3TabBar::Hy3TabBar() {
|
||||||
this->fade_opacity.create(
|
this->fade_opacity
|
||||||
1.0f,
|
.create(1.0f, g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->fade_opacity.registerVar();
|
this->fade_opacity.registerVar();
|
||||||
this->fade_opacity.setUpdateCallback([this](void*) { this->dirty = true; });
|
this->fade_opacity.setUpdateCallback([this](void*) { this->dirty = true; });
|
||||||
|
@ -423,17 +395,9 @@ void Hy3TabBar::setSize(Vector2D size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Hy3TabGroup::Hy3TabGroup(Hy3Node& node) {
|
Hy3TabGroup::Hy3TabGroup(Hy3Node& node) {
|
||||||
this->pos.create(
|
this->pos.create(g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->size.create(
|
this->size.create(g_pConfigManager->getAnimationPropertyConfig("windowsMove"), AVARDAMAGE_NONE);
|
||||||
g_pConfigManager->getAnimationPropertyConfig("windowsMove"),
|
|
||||||
nullptr,
|
|
||||||
AVARDAMAGE_NONE
|
|
||||||
);
|
|
||||||
|
|
||||||
this->pos.registerVar();
|
this->pos.registerVar();
|
||||||
this->size.registerVar();
|
this->size.registerVar();
|
||||||
|
|
Loading…
Add table
Reference in a new issue