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

Add error notification and parent removal assertion

Browse source
This commit is contained in:
outfoxxed 2023-05-01 00:05:45 -07:00
parent 0199475e78
commit 8c6f10cf86
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Hy3Layout.cpp
View file

@ -3,6 +3,16 @@
#include "SelectionHook.hpp" #include "SelectionHook.hpp"
#include <hyprland/src/Compositor.hpp> #include <hyprland/src/Compositor.hpp>
#include <hyprland/src/plugins/PluginAPI.hpp>
void errorNotif() {
HyprlandAPI::addNotificationV2(PHANDLE, {
{"text", "Something has gone very wrong. Check the log for details."},
{"time", (uint64_t)10000},
{"color", CColor(1.0, 0.0, 0.0, 1.0)},
{"icon", ICON_ERROR},
});
}
Hy3GroupData::Hy3GroupData(Hy3GroupLayout layout): layout(layout) {} Hy3GroupData::Hy3GroupData(Hy3GroupLayout layout): layout(layout) {}
@ -116,6 +126,7 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
if (child == this) { if (child == this) {
Debug::log(ERR, "a group (%p) has become its own child", this); Debug::log(ERR, "a group (%p) has become its own child", this);
errorNotif();
} }
double distortOut; double distortOut;
@ -300,7 +311,11 @@ Hy3Node* Hy3Node::removeFromParentRecursive() {
} }
} }
group.children.remove(child); if (!group.children.remove(child)) {
Debug::log(ERR, "Was unable to remove child node %p from parent %p. Child likely has a false parent pointer.", child, parent);
errorNotif();
return nullptr;
}
if (group.children.size() == 1) { if (group.children.size() == 1) {
group.lastFocusedChild = group.children.front(); group.lastFocusedChild = group.children.front();
@ -417,6 +432,7 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool force) {
if (monitor == nullptr) { if (monitor == nullptr) {
Debug::log(ERR, "Orphaned Node %x (workspace ID: %i)!!", node, node->workspace_id); Debug::log(ERR, "Orphaned Node %x (workspace ID: %i)!!", node, node->workspace_id);
errorNotif();
return; return;
} }
@ -433,6 +449,7 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool force) {
if (!g_pCompositor->windowExists(window) || !window->m_bIsMapped) { if (!g_pCompositor->windowExists(window) || !window->m_bIsMapped) {
Debug::log(ERR, "Node %p holding invalid window %p!!", node, window); Debug::log(ERR, "Node %p holding invalid window %p!!", node, window);
errorNotif();
this->onWindowRemovedTiling(window); this->onWindowRemovedTiling(window);
return; return;
} }
@ -547,6 +564,7 @@ void Hy3Layout::onWindowCreatedTiling(CWindow* window) {
if (opening_into->data.type != Hy3NodeData::Group) { if (opening_into->data.type != Hy3NodeData::Group) {
Debug::log(ERR, "opening_into node %p was not of type Group", opening_into); Debug::log(ERR, "opening_into node %p was not of type Group", opening_into);
errorNotif();
return; return;
} }