summaryrefslogtreecommitdiff
path: root/src/desktop/Window.cpp
diff options
context:
space:
mode:
authorMaximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com>2025-01-24 23:27:24 +0000
committerGitHub <noreply@github.com>2025-01-25 00:27:24 +0100
commit089fdd1ea0d991da5b068db51531f54c90a2df25 (patch)
treeacf50ded3c37960961dc22f9180892073afb0e13 /src/desktop/Window.cpp
parent1815f9a2e5e12cafa670e0f4f7eb10dc9436868c (diff)
window: only set m_iMonitorMovedFrom, when moving to a different monitor (#9160)
Diffstat (limited to 'src/desktop/Window.cpp')
-rw-r--r--src/desktop/Window.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
index 5306bbb4..4be8fac5 100644
--- a/src/desktop/Window.cpp
+++ b/src/desktop/Window.cpp
@@ -420,12 +420,13 @@ void CWindow::moveToWorkspace(PHLWORKSPACE pWorkspace) {
static auto PCLOSEONLASTSPECIAL = CConfigValue<Hyprlang::INT>("misc:close_special_on_empty");
- const auto OLDWORKSPACE = m_pWorkspace;
+ const auto OLDWORKSPACE = m_pWorkspace;
+ const bool TOANOTHERMONITOR = OLDWORKSPACE && OLDWORKSPACE->monitorID() != pWorkspace->monitorID();
m_fMovingToWorkspaceAlpha->setValueAndWarp(1.F);
*m_fMovingToWorkspaceAlpha = 0.F;
m_fMovingToWorkspaceAlpha->setCallbackOnEnd([this](auto) { m_iMonitorMovedFrom = -1; });
- m_iMonitorMovedFrom = OLDWORKSPACE ? OLDWORKSPACE->monitorID() : -1;
+ m_iMonitorMovedFrom = TOANOTHERMONITOR ? OLDWORKSPACE->monitorID() : -1;
m_pWorkspace = pWorkspace;