36340e627d1b9c844ce73443db042c953ffdd1bf
- Author
- ZWORX52 <66217856+ZWORX52@users.noreply.github.com>
- Committer
- ZWORX52 <66217856+ZWORX52@users.noreply.github.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
2index 5adf331fd1092ac15e13e809ebb5d7e67c3876a5..3b43f7c5ead2914712cb019f3bdc5f32fc0afe18 100644
3--- a/src/Hy3Layout.cpp
4+++ b/src/Hy3Layout.cpp
5@@ -1,12 +1,12 @@
6 #include <regex>
7 #include <set>
8-#include <dlfcn.h>
9
10+#include <dlfcn.h>
11 #include <hyprland/src/Compositor.hpp>
12 #include <hyprland/src/desktop/DesktopTypes.hpp>
13 #include <hyprland/src/desktop/Workspace.hpp>
14-#include <hyprland/src/plugins/PluginAPI.hpp>
15 #include <hyprland/src/managers/PointerManager.hpp>
16+#include <hyprland/src/plugins/PluginAPI.hpp>
17 #include <ranges>
18
19 #include "Hy3Layout.hpp"
20@@ -98,7 +98,7 @@ void Hy3Layout::onWindowCreatedTiling(PHLWINDOW window, eDirection) {
21 "onWindowCreatedTiling called with window {:x} (floating: {}, monitor: {}, workspace: {})",
22 (uintptr_t) window.get(),
23 window->m_bIsFloating,
24- window->monitorID(),
25+ window->monitorID(),
26 window->m_pWorkspace->m_iID
27 );
28
29@@ -563,8 +563,8 @@ void Hy3Layout::fullscreenRequestForWindow(
30 // clang-format on
31
32 auto gap_size_offset = Vector2D(
33- (int) (-(gaps_in->left - gaps_out->left) + -(gaps_in->right - gaps_out->right)),
34- (int) (-(gaps_in->top - gaps_out->top) + -(gaps_in->bottom - gaps_out->bottom))
35+ (int) (-(gaps_in->left - gaps_out->left) + -(gaps_in->right - gaps_out->right)),
36+ (int) (-(gaps_in->top - gaps_out->top) + -(gaps_in->bottom - gaps_out->bottom))
37 );
38
39 Hy3Node fakeNode = {
40@@ -662,8 +662,8 @@ PHLWINDOW Hy3Layout::findFloatingWindowCandidate(const PHLWINDOW& from) {
41 // return the first floating window on the same workspace that has not asked not to be focused
42 for (auto& w: g_pCompositor->m_vWindows | std::views::reverse) {
43 if (w->m_bIsMapped && !w->isHidden() && w->m_bIsFloating && !w->isX11OverrideRedirect()
44- && w->m_pWorkspace == from->m_pWorkspace && !w->m_bX11ShouldntFocus
45- && !w->m_sWindowData.noFocus.valueOrDefault() && w != from)
46+ && w->m_pWorkspace == from->m_pWorkspace && !w->m_bX11ShouldntFocus
47+ && !w->m_sWindowData.noFocus.valueOrDefault() && w != from)
48 {
49 return w;
50 }
51@@ -1374,14 +1374,14 @@ void Hy3Layout::expand(
52 if (node == nullptr) return;
53 PHLWINDOW window;
54
55- //const auto monitor = g_pCompositor->getMonitorFromID(workspace->m_iMonitorID);
56+ // const auto monitor = g_pCompositor->getMonitorFromID(workspace->m_iMonitorID);
57
58 switch (option) {
59 case ExpandOption::Expand: {
60 if (node->parent == nullptr) {
61 switch (fs_option) {
62 case ExpandFullscreenOption::MaximizeAsFullscreen:
63- case ExpandFullscreenOption::MaximizeIntermediate:// goto fullscreen;
64+ case ExpandFullscreenOption::MaximizeIntermediate: // goto fullscreen;
65 case ExpandFullscreenOption::MaximizeOnly: return;
66 }
67 }
68@@ -1397,7 +1397,7 @@ void Hy3Layout::expand(
69
70 if (node->parent->parent == nullptr) {
71 switch (fs_option) {
72- case ExpandFullscreenOption::MaximizeAsFullscreen:// goto fullscreen;
73+ case ExpandFullscreenOption::MaximizeAsFullscreen: // goto fullscreen;
74 case ExpandFullscreenOption::MaximizeIntermediate:
75 case ExpandFullscreenOption::MaximizeOnly: return;
76 }
77@@ -1426,31 +1426,31 @@ void Hy3Layout::expand(
78 }
79
80 return;
81-/*
82-fullscreen:
83- if (node->data.is_group()) return;
84- window = node->data.as_window();
85- if (!window->m_bIsFullscreen || window->m_pWorkspace->m_bIsSpecialWorkspace) return;
86-
87- if (workspace->m_bHasFullscreenWindow) return;
88-
89- window->m_bIsFullscreen = true;
90- workspace->m_bHasFullscreenWindow = true;
91- workspace->m_efFullscreenMode = FULLSCREEN_FULL;
92- window->m_vRealPosition = monitor->vecPosition;
93- window->m_vRealSize = monitor->vecSize;
94- goto fsupdate;
95-// unfullscreen:
96-// if (node->data.type != Hy3NodeType::Window) return;
97-// window = node->data.as_window;
98-// window->m_bIsFullscreen = false;
99-// workspace->m_bHasFullscreenWindow = false;
100-// goto fsupdate;
101-fsupdate:
102- g_pCompositor->updateWindowAnimatedDecorationValues(window);
103- g_pXWaylandManager->setWindowSize(window, window->m_vRealSize.goal());
104- g_pCompositor->changeWindowZOrder(window, true);
105diff --git a/src/Hy3Layout.hpp b/src/Hy3Layout.hpp
106index 39aa8338fbff2f4c726c55bda99e8255fcd5ebb9..3fd9c2e3e242b5e304e60c2fa49eb5fefd01cc83 100644
107--- a/src/Hy3Layout.hpp
108+++ b/src/Hy3Layout.hpp
109@@ -85,7 +85,9 @@ public:
110 void recalculateWindow(PHLWINDOW) override;
111 void resizeActiveWindow(const Vector2D& delta, eRectCorner corner, PHLWINDOW pWindow = nullptr)
112 override;
113- void fullscreenRequestForWindow(PHLWINDOW, eFullscreenMode current_mode, eFullscreenMode target_mode) override;
114+ void
115+ fullscreenRequestForWindow(PHLWINDOW, eFullscreenMode current_mode, eFullscreenMode target_mode)
116+ override;
117 std::any layoutMessage(SLayoutMessageHeader header, std::string content) override;
118 SWindowRenderLayoutHints requestRenderHints(PHLWINDOW) override;
119 void switchWindows(PHLWINDOW, PHLWINDOW) override;
120diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
121index 0bd3c0e7da9a76e33f2481b11c404287029d2b97..5db7d17c4b47f2a63faa4a36267d398b5f5a5f1c 100644
122--- a/src/TabGroup.cpp
123+++ b/src/TabGroup.cpp
124@@ -7,8 +7,8 @@
125 #include <hyprland/src/helpers/Color.hpp>
126 #include <hyprland/src/render/OpenGL.hpp>
127 #include <hyprland/src/render/Texture.hpp>
128-#include <hyprutils/memory/SharedPtr.hpp>
129 #include <hyprutils/math/Box.hpp>
130+#include <hyprutils/memory/SharedPtr.hpp>
131 #include <pango/pangocairo.h>
132 #include <pixman.h>
133
134@@ -458,7 +458,7 @@ void Hy3TabGroup::tick() {
135 if (!has_fullscreen && *no_gaps_when_only) {
136 auto root_node = g_Hy3Layout->getWorkspaceRootGroup(this->workspace);
137 has_fullscreen = root_node != nullptr && root_node->data.as_group().children.size() == 1
138- && root_node->data.as_group().children.front()->data.is_window();
139+ && root_node->data.as_group().children.front()->data.is_window();
140 }
141
142 if (has_fullscreen) {
143@@ -590,8 +590,8 @@ void Hy3TabGroup::renderTabBar() {
144 auto window = windowref.lock();
145
146 auto wpos =
147- window->m_vRealPosition.value() - monitor->vecPosition
148- + (window->m_pWorkspace ? window->m_pWorkspace->m_vRenderOffset.value() : Vector2D());
149+ window->m_vRealPosition.value() - monitor->vecPosition
150+ + (window->m_pWorkspace ? window->m_pWorkspace->m_vRenderOffset.value() : Vector2D());
151
152 auto wsize = window->m_vRealSize.value();
153