From 723870337f299d4c80aa0048144f3a1ca1c885bd Mon Sep 17 00:00:00 2001
From: Vaxry <43317083+vaxerski@users.noreply.github.com>
Date: Sat, 21 Feb 2026 21:30:39 +0000
Subject: layout: rethonk layouts from the ground up (#12890)

Rewrites layouts to be much smaller, and deal with much less annoying
BS. Improves the overall architecture, unifies handling of pseudotiling,
and various other improvements.
---
 src/layout/MasterLayout.hpp | 112 --------------------------------------------
 1 file changed, 112 deletions(-)
 delete mode 100644 src/layout/MasterLayout.hpp

(limited to 'src/layout/MasterLayout.hpp')

diff --git a/src/layout/MasterLayout.hpp b/src/layout/MasterLayout.hpp
deleted file mode 100644
index a5968916..00000000
--- a/src/layout/MasterLayout.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#pragma once
-
-#include "IHyprLayout.hpp"
-#include "../desktop/DesktopTypes.hpp"
-#include "../helpers/varlist/VarList.hpp"
-#include <vector>
-#include <list>
-#include <any>
-
-enum eFullscreenMode : int8_t;
-
-//orientation determines which side of the screen the master area resides
-enum eOrientation : uint8_t {
-    ORIENTATION_LEFT = 0,
-    ORIENTATION_TOP,
-    ORIENTATION_RIGHT,
-    ORIENTATION_BOTTOM,
-    ORIENTATION_CENTER
-};
-
-struct SMasterNodeData {
-    bool         isMaster   = false;
-    float        percMaster = 0.5f;
-
-    PHLWINDOWREF pWindow;
-
-    Vector2D     position;
-    Vector2D     size;
-
-    float        percSize = 1.f; // size multiplier for resizing children
-
-    WORKSPACEID  workspaceID = WORKSPACE_INVALID;
-
-    bool         ignoreFullscreenChecks = false;
-
-    //
-    bool operator==(const SMasterNodeData& rhs) const {
-        return pWindow.lock() == rhs.pWindow.lock();
-    }
-};
-
-struct SMasterWorkspaceData {
-    WORKSPACEID  workspaceID = WORKSPACE_INVALID;
-    eOrientation orientation = ORIENTATION_LEFT;
-    // Previously focused non-master window when `focusmaster previous` command was issued
-    PHLWINDOWREF focusMasterPrev;
-
-    //
-    bool operator==(const SMasterWorkspaceData& rhs) const {
-        return workspaceID == rhs.workspaceID;
-    }
-};
-
-class CHyprMasterLayout : public IHyprLayout {
-  public:
-    virtual void                     onWindowCreatedTiling(PHLWINDOW, eDirection direction = DIRECTION_DEFAULT);
-    virtual void                     onWindowRemovedTiling(PHLWINDOW);
-    virtual bool                     isWindowTiled(PHLWINDOW);
-    virtual void                     recalculateMonitor(const MONITORID&);
-    virtual void                     recalculateWindow(PHLWINDOW);
-    virtual void                     resizeActiveWindow(const Vector2D&, eRectCorner corner = CORNER_NONE, PHLWINDOW pWindow = nullptr);
-    virtual void                     fullscreenRequestForWindow(PHLWINDOW pWindow, const eFullscreenMode CURRENT_EFFECTIVE_MODE, const eFullscreenMode EFFECTIVE_MODE);
-    virtual std::any                 layoutMessage(SLayoutMessageHeader, std::string);
-    virtual SWindowRenderLayoutHints requestRenderHints(PHLWINDOW);
-    virtual void                     switchWindows(PHLWINDOW, PHLWINDOW);
-    virtual void                     moveWindowTo(PHLWINDOW, const std::string& dir, bool silent);
-    virtual void                     alterSplitRatio(PHLWINDOW, float, bool);
-    virtual std::string              getLayoutName();
-    virtual void                     replaceWindowDataWith(PHLWINDOW from, PHLWINDOW to);
-    virtual Vector2D                 predictSizeForNewWindowTiled();
-
-    virtual void                     onEnable();
-    virtual void                     onDisable();
-
-  private:
-    std::list<SMasterNodeData>        m_masterNodesData;
-    std::vector<SMasterWorkspaceData> m_masterWorkspacesData;
-
-    bool                              m_forceWarps = false;
-
-    void                              buildOrientationCycleVectorFromVars(std::vector<eOrientation>& cycle, CVarList& vars);
-    void                              buildOrientationCycleVectorFromEOperation(std::vector<eOrientation>& cycle);
-    void                              runOrientationCycle(SLayoutMessageHeader& header, CVarList* vars, int next);
-    eOrientation                      getDynamicOrientation(PHLWORKSPACE);
-    int                               getNodesOnWorkspace(const WORKSPACEID&);
-    void                              applyNodeDataToWindow(SMasterNodeData*);
-    SMasterNodeData*                  getNodeFromWindow(PHLWINDOW);
-    SMasterNodeData*                  getMasterNodeOnWorkspace(const WORKSPACEID&);
-    SMasterWorkspaceData*             getMasterWorkspaceData(const WORKSPACEID&);
-    void                              calculateWorkspace(PHLWORKSPACE);
-    PHLWINDOW                         getNextWindow(PHLWINDOW, bool, bool);
-    int                               getMastersOnWorkspace(const WORKSPACEID&);
-
-    friend struct SMasterNodeData;
-    friend struct SMasterWorkspaceData;
-};
-
-template <typename CharT>
-struct std::formatter<SMasterNodeData*, CharT> : std::formatter<CharT> {
-    template <typename FormatContext>
-    auto format(const SMasterNodeData* const& node, FormatContext& ctx) const {
-        auto out = ctx.out();
-        if (!node)
-            return std::format_to(out, "[Node nullptr]");
-        std::format_to(out, "[Node {:x}: workspace: {}, pos: {:j2}, size: {:j2}", rc<uintptr_t>(node), node->workspaceID, node->position, node->size);
-        if (node->isMaster)
-            std::format_to(out, ", master");
-        if (!node->pWindow.expired())
-            std::format_to(out, ", window: {:x}", node->pWindow.lock());
-        return std::format_to(out, "]");
-    }
-};
-- 
cgit v1.2.3