summaryrefslogtreecommitdiff
path: root/src/layout
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-02 20:04:32 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-02 20:04:32 +0200
commit3f99dad7f563593d298bcd548002e5b53a886825 (patch)
tree4bdd69de02aff2b8a8352ff8abbb6b38d5d91c8c /src/layout
parent7add082217b1e86f36bb152aec658eb5977622fa (diff)
Added pseudotiling
Diffstat (limited to 'src/layout')
-rw-r--r--src/layout/DwindleLayout.cpp36
-rw-r--r--src/layout/DwindleLayout.hpp1
-rw-r--r--src/layout/IHyprLayout.hpp8
3 files changed, 44 insertions, 1 deletions
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index 58eca936..ce1e2a3f 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -109,6 +109,30 @@ void CHyprDwindleLayout::applyNodeDataToWindow(SDwindleNodeData* pNode) {
PWINDOW->m_vEffectivePosition = PWINDOW->m_vEffectivePosition + OFFSETTOPLEFT;
PWINDOW->m_vEffectiveSize = PWINDOW->m_vEffectiveSize - OFFSETTOPLEFT - OFFSETBOTTOMRIGHT;
+ if (PWINDOW->m_bIsPseudotiled) {
+ // Calculate pseudo
+ float scale = 1;
+
+ // adjust if doesnt fit
+ if (PWINDOW->m_vPseudoSize.x > PWINDOW->m_vEffectiveSize.x || PWINDOW->m_vPseudoSize.y > PWINDOW->m_vEffectiveSize.y) {
+ if (PWINDOW->m_vPseudoSize.x > PWINDOW->m_vEffectiveSize.x) {
+ scale = PWINDOW->m_vEffectiveSize.x / PWINDOW->m_vPseudoSize.x;
+ }
+
+ if (PWINDOW->m_vPseudoSize.y * scale > PWINDOW->m_vEffectiveSize.y) {
+ scale = PWINDOW->m_vEffectiveSize.y / PWINDOW->m_vPseudoSize.y;
+ }
+
+ auto DELTA = PWINDOW->m_vEffectiveSize - PWINDOW->m_vPseudoSize * scale;
+ PWINDOW->m_vEffectiveSize = PWINDOW->m_vPseudoSize * scale;
+ PWINDOW->m_vEffectivePosition = PWINDOW->m_vEffectivePosition + DELTA / 2.f; // center
+ } else {
+ auto DELTA = PWINDOW->m_vEffectiveSize - PWINDOW->m_vPseudoSize;
+ PWINDOW->m_vEffectivePosition = PWINDOW->m_vEffectivePosition + DELTA / 2.f; // center
+ PWINDOW->m_vEffectiveSize = PWINDOW->m_vPseudoSize;
+ }
+ }
+
g_pXWaylandManager->setWindowSize(PWINDOW, PWINDOW->m_vEffectiveSize);
}
@@ -271,6 +295,9 @@ void CHyprDwindleLayout::changeWindowFloatingMode(CWindow* pWindow) {
const auto PSAVEDPOS = pWindow->m_vRealPosition;
const auto PSAVEDSIZE = pWindow->m_vRealSize;
+ // if the window is pseudo, update its size
+ pWindow->m_vPseudoSize = pWindow->m_vRealSize;
+
onWindowCreated(pWindow);
pWindow->m_vRealPosition = PSAVEDPOS;
@@ -430,3 +457,12 @@ void CHyprDwindleLayout::fullscreenRequestForWindow(CWindow* pWindow) {
// because otherwise they'd still be recieving mouse events
g_pCompositor->fixXWaylandWindowsOnWorkspace(PMONITOR->activeWorkspace);
}
+
+void CHyprDwindleLayout::recalculateWindow(CWindow* pWindow) {
+ const auto PNODE = getNodeFromWindow(pWindow);
+
+ if (!PNODE)
+ return;
+
+ PNODE->recalcSizePosRecursive();
+} \ No newline at end of file
diff --git a/src/layout/DwindleLayout.hpp b/src/layout/DwindleLayout.hpp
index 61b76be7..f1411322 100644
--- a/src/layout/DwindleLayout.hpp
+++ b/src/layout/DwindleLayout.hpp
@@ -32,6 +32,7 @@ public:
virtual void onWindowCreated(CWindow*);
virtual void onWindowRemoved(CWindow*);
virtual void recalculateMonitor(const int&);
+ virtual void recalculateWindow(CWindow*);
virtual void changeWindowFloatingMode(CWindow*);
virtual void onBeginDragWindow();
virtual void onMouseMove(const Vector2D&);
diff --git a/src/layout/IHyprLayout.hpp b/src/layout/IHyprLayout.hpp
index e437d703..b214dd50 100644
--- a/src/layout/IHyprLayout.hpp
+++ b/src/layout/IHyprLayout.hpp
@@ -15,12 +15,18 @@ public:
*/
virtual void onWindowRemoved(CWindow*) = 0;
/*
- Called when a the monitor requires a layout recalculation
+ Called when the monitor requires a layout recalculation
this usually means reserved area changes
*/
virtual void recalculateMonitor(const int&) = 0;
/*
+ Called when the compositor requests a window
+ to be recalculated, e.g. when pseudo is toggled.
+ */
+ virtual void recalculateWindow(CWindow*) = 0;
+
+ /*
Called when a window is requested to be floated
*/
virtual void changeWindowFloatingMode(CWindow*) = 0;