aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAgent00Ming <[email protected]>2024-04-24 11:07:22 -0400
committerGitHub <[email protected]>2024-04-24 16:07:22 +0100
commit81bb4eb2f6e385431dab0ae664bb59f35c8c069e (patch)
treed2328e4d22462dc440212b9c253d25cbe539091b
parente5fa0007a5b3a86948582e6d7dab0073a309553a (diff)
downloadHyprland-81bb4eb2f6e385431dab0ae664bb59f35c8c069e.tar.gz
Hyprland-81bb4eb2f6e385431dab0ae664bb59f35c8c069e.zip
workspace: Fix duplication of "special:" in special workspace name (#5729)
* Fix duplication of "special:" in special workspace name modified: src/desktop/Workspace.cpp * Track default special workspace name as special:special This is to fix the edge cases with the previous commit without breaking user configs. modified: src/helpers/MiscFunctions.cpp --------- Co-authored-by: Agent_00Ming <[email protected]>
-rw-r--r--src/desktop/Workspace.cpp2
-rw-r--r--src/helpers/MiscFunctions.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/desktop/Workspace.cpp b/src/desktop/Workspace.cpp
index 7ab75fd5..e9b155a4 100644
--- a/src/desktop/Workspace.cpp
+++ b/src/desktop/Workspace.cpp
@@ -207,7 +207,7 @@ void CWorkspace::rememberPrevWorkspace(const PHLWORKSPACE& prev) {
std::string CWorkspace::getConfigName() {
if (m_bIsSpecialWorkspace) {
- return "special:" + m_szName;
+ return m_szName;
}
if (m_iID > 0)
diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
index 779b45b1..b8061bef 100644
--- a/src/helpers/MiscFunctions.cpp
+++ b/src/helpers/MiscFunctions.cpp
@@ -256,7 +256,7 @@ bool isDirection(const char& arg) {
int getWorkspaceIDFromString(const std::string& in, std::string& outName) {
int result = WORKSPACE_INVALID;
if (in.starts_with("special")) {
- outName = "special";
+ outName = "special:special";
if (in.length() > 8) {
const auto NAME = in.substr(8);
@@ -833,4 +833,4 @@ bool envEnabled(const std::string& env) {
if (!ENV)
return false;
return std::string(ENV) == "1";
-} \ No newline at end of file
+}