summaryrefslogtreecommitdiff
path: root/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp
diff options
context:
space:
mode:
authorNathan Ollerenshaw <chrome@stupendous.net>2026-03-15 08:06:10 -0700
committerGitHub <noreply@github.com>2026-03-15 10:06:10 -0500
commitdf55752241c81fe4faa73aa77b775eb12b3e3fa4 (patch)
tree4b4b9b338a5a30e70f3105c8eca54e443d0f128a /src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp
parent9bf8fe7a5278b5f366384d73d87844a165c16b7a (diff)
algo/scroll: fix std::clamp assertion crash on resume from suspend (#13737)
Diffstat (limited to 'src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp')
-rw-r--r--src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp b/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp
index a64edb3a..5de27b97 100644
--- a/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp
+++ b/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp
@@ -795,6 +795,11 @@ void CScrollingAlgorithm::resizeTarget(const Vector2D& delta, SP<ITarget> target
}
void CScrollingAlgorithm::recalculate() {
+ // guard against recalculation during transitional monitor states
+ // (e.g. monitor reconnecting after suspend where workspace/monitor may not be ready)
+ if (!m_parent || !m_parent->space() || !m_parent->space()->workspace() || !m_parent->space()->workspace()->m_monitor)
+ return;
+
if (Desktop::focusState()->window()) {
const auto TARGET = Desktop::focusState()->window()->layoutTarget();
@@ -1516,6 +1521,12 @@ CBox CScrollingAlgorithm::usableArea() {
return box;
box.translate(-m_parent->space()->workspace()->m_monitor->m_position);
+
+ // ensure dimensions are never zero or negative, which can happen during
+ // monitor transitions (e.g. reconnection after suspend with stale reserved areas)
+ box.w = std::max(box.w, 1.0);
+ box.h = std::max(box.h, 1.0);
+
return box;
}