Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-16 03:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix build against hyprland #a61eb76

Browse source
This commit is contained in:
outfoxxed 2023-10-22 20:25:14 -07:00
parent 65a849b0b4
commit 07c98ab654
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
3 changed files with 12 additions and 12 deletions

6
flake.lock generated
View file

@ -9,11 +9,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1697473020,
"narHash": "sha256-8n67P8wvtFgjOufTj4y1sRpBcbMrlhSlH7d8dOhUKns=",
"lastModified": 1698018813,
"narHash": "sha256-JMg+HRyTOZK3W8pRNyJTp7AOWYkbs+LaKqAFc+cScyM=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "5b8cfdf2efc44106b61e60c642fd964823fd89f3",
"rev": "015664eb4cde5ab93cfacbfd8c2e831eeb876634",
"type": "github"
},
"original": {

10
src/Hy3Layout.cpp
View file

@ -1296,7 +1296,7 @@ Hy3Node* Hy3Layout::getWorkspaceFocusedNode(
return rootNode->getFocusedNode(ignore_group_focus, stop_at_expanded);
}
void Hy3Layout::renderHook(void*, std::any data) {
void Hy3Layout::renderHook(void*, SCallbackInfo&, std::any data) {
static bool rendering_normally = false;
static std::vector<Hy3TabGroup*> rendered_groups;
@ -1339,14 +1339,14 @@ void Hy3Layout::renderHook(void*, std::any data) {
}
}
void Hy3Layout::windowGroupUrgentHook(void* p, std::any data) {
void Hy3Layout::windowGroupUrgentHook(void* p, SCallbackInfo& callback_info, std::any data) {
CWindow* window = std::any_cast<CWindow*>(data);
if (window == nullptr) return;
window->m_bIsUrgent = true;
Hy3Layout::windowGroupUpdateRecursiveHook(p, data);
Hy3Layout::windowGroupUpdateRecursiveHook(p, callback_info, data);
}
void Hy3Layout::windowGroupUpdateRecursiveHook(void*, std::any data) {
void Hy3Layout::windowGroupUpdateRecursiveHook(void*, SCallbackInfo&, std::any data) {
CWindow* window = std::any_cast<CWindow*>(data);
if (window == nullptr) return;
auto* node = g_Hy3Layout->getNodeFromWindow(window);
@ -1356,7 +1356,7 @@ void Hy3Layout::windowGroupUpdateRecursiveHook(void*, std::any data) {
node->updateTabBarRecursive();
}
void Hy3Layout::tickHook(void*, std::any) {
void Hy3Layout::tickHook(void*, SCallbackInfo&, std::any) {
auto& tab_groups = g_Hy3Layout->tab_groups;
auto entry = tab_groups.begin();
while (entry != tab_groups.end()) {

8
src/Hy3Layout.hpp
View file

@ -123,10 +123,10 @@ public:
bool stop_at_expanded = false
);
static void renderHook(void*, std::any);
static void windowGroupUrgentHook(void*, std::any);
static void windowGroupUpdateRecursiveHook(void*, std::any);
static void tickHook(void*, std::any);
static void renderHook(void*, SCallbackInfo&, std::any);
static void windowGroupUrgentHook(void*, SCallbackInfo&, std::any);
static void windowGroupUpdateRecursiveHook(void*, SCallbackInfo&, std::any);
static void tickHook(void*, SCallbackInfo&, std::any);
std::list<Hy3Node> nodes;
std::list<Hy3TabGroup> tab_groups;