Diff
1diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
2index 5488fa77184bfa6f5c105ae05def21af946b6ce1..f5cae4fa4b7a2ae79c62e6c8ea73e3c21146c0e1 100644
3--- a/src/Hy3Layout.cpp
4+++ b/src/Hy3Layout.cpp
5@@ -149,7 +149,7 @@ void Hy3Layout::insertNode(Hy3Node& node) {
6 node.reparenting = true;
7 node.size_ratio = 1.0;
8
9- auto* monitor = g_pCompositor->getMonitorFromID(node.workspace->m_iMonitorID);
10+ PHLMONITOR monitor = g_pCompositor->getMonitorFromID(node.workspace->m_iMonitorID);
11
12 Hy3Node* opening_into;
13 Hy3Node* opening_after = nullptr;
14@@ -1061,7 +1061,7 @@ void Hy3Layout::moveNodeToWorkspace(const PHLWORKSPACE& origin, std::string wsna
15 }
16
17 if (follow) {
18- auto* monitor = g_pCompositor->getMonitorFromID(workspace->m_iMonitorID);
19+ PHLMONITOR monitor = g_pCompositor->getMonitorFromID(workspace->m_iMonitorID);
20
21 if (workspace->m_bIsSpecialWorkspace) {
22 monitor->setSpecialWorkspace(workspace);
23@@ -1544,12 +1544,12 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool no_animation) {
24 auto window = node->data.as_window();
25 auto root_node = this->getWorkspaceRootGroup(window->m_pWorkspace);
26
27- CMonitor* monitor = nullptr;
28+ PHLMONITOR monitor;
29
30 if (node->workspace->m_bIsSpecialWorkspace) {
31 for (auto& m: g_pCompositor->m_vMonitors) {
32 if (m->activeSpecialWorkspace == node->workspace) {
33- monitor = m.get();
34+ monitor = m;
35 break;
36 }
37 }
38diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp
39index 095aa1404fc6c0d8aadcedc5447d7ef598b55689..3eaf4961df36106eaa63dea5c2fb3723608d53dd 100644
40--- a/src/Hy3Node.cpp
41+++ b/src/Hy3Node.cpp
42@@ -318,7 +318,7 @@ void Hy3Node::recalcSizePosRecursive(bool no_animation) {
43
44 if (this->data.is_window() && this->data.as_window()->isFullscreen()) {
45 auto window = this->data.as_window();
46- auto* monitor = g_pCompositor->getMonitorFromID(this->workspace->m_iMonitorID);
47+ PHLMONITOR monitor = g_pCompositor->getMonitorFromID(this->workspace->m_iMonitorID);
48
49 if (window->isEffectiveInternalFSMode(FSMODE_FULLSCREEN)) {
50 window->m_vRealPosition = monitor->vecPosition;
51diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
52index 09ebd3dc3ee3dd2dcadcf519fc3c66286a768761..9547d5a479f1cdcc4b6d1bac8aadc1685ce70f71 100644
53--- a/src/TabGroup.cpp
54+++ b/src/TabGroup.cpp
55@@ -513,7 +513,7 @@ void Hy3TabGroup::renderTabBar() {
56 static const auto enter_from_top = ConfigValue<Hyprlang::INT>("plugin:hy3:tabs:from_top");
57 static const auto padding = ConfigValue<Hyprlang::INT>("plugin:hy3:tabs:padding");
58
59- auto* monitor = g_pHyprOpenGL->m_RenderData.pMonitor;
60+ PHLMONITORREF monitor = g_pHyprOpenGL->m_RenderData.pMonitor;
61 auto scale = monitor->scale;
62
63 auto monitor_size = monitor->vecSize;