From 0f6e53079864d411aa2de3262ba4c01eeeec4f5b Mon Sep 17 00:00:00 2001 From: vaxerski Date: Fri, 3 Nov 2023 12:19:23 +0000 Subject: layout: better storage for no fullscreen checks var fixes #3731 --- src/layout/MasterLayout.hpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/layout/MasterLayout.hpp') diff --git a/src/layout/MasterLayout.hpp b/src/layout/MasterLayout.hpp index f0f72d6b..e316556a 100644 --- a/src/layout/MasterLayout.hpp +++ b/src/layout/MasterLayout.hpp @@ -10,8 +10,7 @@ enum eFullscreenMode : int8_t; //orientation determines which side of the screen the master area resides -enum eOrientation : uint8_t -{ +enum eOrientation : uint8_t { ORIENTATION_LEFT = 0, ORIENTATION_TOP, ORIENTATION_RIGHT, @@ -32,7 +31,10 @@ struct SMasterNodeData { int workspaceID = -1; - bool operator==(const SMasterNodeData& rhs) const { + bool ignoreFullscreenChecks = false; + + // + bool operator==(const SMasterNodeData& rhs) const { return pWindow == rhs.pWindow; } }; @@ -41,7 +43,8 @@ struct SMasterWorkspaceData { int workspaceID = -1; eOrientation orientation = ORIENTATION_LEFT; - bool operator==(const SMasterWorkspaceData& rhs) const { + // + bool operator==(const SMasterWorkspaceData& rhs) const { return workspaceID == rhs.workspaceID; } }; @@ -76,7 +79,7 @@ class CHyprMasterLayout : public IHyprLayout { void buildOrientationCycleVectorFromEOperation(std::vector& cycle); void runOrientationCycle(SLayoutMessageHeader& header, CVarList* vars, int next); int getNodesOnWorkspace(const int&); - void applyNodeDataToWindow(SMasterNodeData*, bool force = false); + void applyNodeDataToWindow(SMasterNodeData*); SMasterNodeData* getNodeFromWindow(CWindow*); SMasterNodeData* getMasterNodeOnWorkspace(const int&); SMasterWorkspaceData* getMasterWorkspaceData(const int&); -- cgit v1.2.3