summaryrefslogtreecommitdiff
path: root/src/helpers
diff options
context:
space:
mode:
authorVaxry <43317083+vaxerski@users.noreply.github.com>2025-12-20 22:16:13 +0000
committerGitHub <noreply@github.com>2025-12-20 22:16:13 +0000
commitb9bef6955487b75d13cfedd230bdc4adafedd115 (patch)
tree21400bb6bbb37651ad8e2f3338d2fa5e317b4098 /src/helpers
parent70f54a1e1ba3478a56faf82431b2770bd727431d (diff)
Desktop/history: Move history to desktop (#12676)
Diffstat (limited to 'src/helpers')
-rw-r--r--src/helpers/MiscFunctions.cpp3
-rw-r--r--src/helpers/Monitor.cpp23
-rw-r--r--src/helpers/Monitor.hpp4
3 files changed, 2 insertions, 28 deletions
diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
index 79504b31..34b06c2e 100644
--- a/src/helpers/MiscFunctions.cpp
+++ b/src/helpers/MiscFunctions.cpp
@@ -4,6 +4,7 @@
#include "../Compositor.hpp"
#include "../managers/TokenManager.hpp"
#include "../desktop/state/FocusState.hpp"
+#include "../desktop/history/WorkspaceHistoryTracker.hpp"
#include "Monitor.hpp"
#include "../config/ConfigManager.hpp"
#include "fs/FsUtils.hpp"
@@ -179,7 +180,7 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) {
if (!valid(PWORKSPACE))
return {WORKSPACE_INVALID};
- const auto PREVWORKSPACEIDNAME = PWORKSPACE->getPrevWorkspaceIDName();
+ const auto PREVWORKSPACEIDNAME = Desktop::History::workspaceTracker()->previousWorkspaceIDName(PWORKSPACE);
if (PREVWORKSPACEIDNAME.id == -1)
return {WORKSPACE_INVALID};
diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
index 37e11908..cbb02118 100644
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -1480,29 +1480,6 @@ void CMonitor::moveTo(const Vector2D& pos) {
m_position = pos;
}
-SWorkspaceIDName CMonitor::getPrevWorkspaceIDName(const WORKSPACEID id) {
- while (!m_prevWorkSpaces.empty()) {
- const int PREVID = m_prevWorkSpaces.top();
- m_prevWorkSpaces.pop();
- if (PREVID == id) // skip same workspace
- continue;
-
- // recheck if previous workspace's was moved to another monitor
- const auto ws = g_pCompositor->getWorkspaceByID(PREVID);
- if (ws && ws->monitorID() == m_id)
- return {.id = PREVID, .name = ws->m_name};
- }
-
- return {.id = WORKSPACE_INVALID};
-}
-
-void CMonitor::addPrevWorkspaceID(const WORKSPACEID id) {
- if (!m_prevWorkSpaces.empty() && m_prevWorkSpaces.top() == id)
- return;
-
- m_prevWorkSpaces.emplace(id);
-}
-
Vector2D CMonitor::middle() {
return m_position + m_size / 2.f;
}
diff --git a/src/helpers/Monitor.hpp b/src/helpers/Monitor.hpp
index 95e5ce5c..ea2cf185 100644
--- a/src/helpers/Monitor.hpp
+++ b/src/helpers/Monitor.hpp
@@ -351,10 +351,6 @@ class CMonitor {
return m_position == rhs.m_position && m_size == rhs.m_size && m_name == rhs.m_name;
}
- // workspace previous per monitor functionality
- SWorkspaceIDName getPrevWorkspaceIDName(const WORKSPACEID id);
- void addPrevWorkspaceID(const WORKSPACEID id);
-
private:
void setupDefaultWS(const SMonitorRule&);
WORKSPACEID findAvailableDefaultWS();