summaryrefslogtreecommitdiff
path: root/src/layout/MasterLayout.cpp
diff options
context:
space:
mode:
authorthejch <66577496+thejch@users.noreply.github.com>2023-12-02 06:42:49 -0800
committerGitHub <noreply@github.com>2023-12-02 14:42:49 +0000
commit758cf90ea1066eea361a9d8c347e7fcf40f6636f (patch)
treea7455a55a5d8eead8f42bee08fe0b54a1e3ee535 /src/layout/MasterLayout.cpp
parent6e8b9ef7d8aa53247d5122b6641b9afa0df798df (diff)
workspacerules: Add workspace rule for master layout orientation (#3964)
* add workspace rule for master layout orientation * change rule format * edit rule name * use map for layoutopts * use std::any instead of string
Diffstat (limited to 'src/layout/MasterLayout.cpp')
-rw-r--r--src/layout/MasterLayout.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/layout/MasterLayout.cpp b/src/layout/MasterLayout.cpp
index d355a7d3..3977d8f6 100644
--- a/src/layout/MasterLayout.cpp
+++ b/src/layout/MasterLayout.cpp
@@ -42,13 +42,21 @@ SMasterWorkspaceData* CHyprMasterLayout::getMasterWorkspaceData(const int& ws) {
const auto PWORKSPACEDATA = &m_lMasterWorkspacesData.emplace_back();
PWORKSPACEDATA->workspaceID = ws;
const auto orientation = &g_pConfigManager->getConfigValuePtr("master:orientation")->strValue;
- if (*orientation == "top") {
+ const auto layoutoptsForWs = g_pConfigManager->getWorkspaceRuleFor(g_pCompositor->getWorkspaceByID(ws)).layoutopts;
+ auto orientationForWs = *orientation;
+
+ try {
+ if (layoutoptsForWs.contains("orientation"))
+ orientationForWs = std::any_cast<std::string>(layoutoptsForWs.at("orientation"));
+ } catch (std::exception& e) { Debug::log(ERR, "Error from layoutopt rules: {}", e.what()); }
+
+ if (orientationForWs == "top") {
PWORKSPACEDATA->orientation = ORIENTATION_TOP;
- } else if (*orientation == "right") {
+ } else if (orientationForWs == "right") {
PWORKSPACEDATA->orientation = ORIENTATION_RIGHT;
- } else if (*orientation == "bottom") {
+ } else if (orientationForWs == "bottom") {
PWORKSPACEDATA->orientation = ORIENTATION_BOTTOM;
- } else if (*orientation == "left") {
+ } else if (orientationForWs == "left") {
PWORKSPACEDATA->orientation = ORIENTATION_LEFT;
} else {
PWORKSPACEDATA->orientation = ORIENTATION_CENTER;