From 98fbbafef78057c818fb02b15c27e38ad2f5b5bc Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Tue, 28 Apr 2026 15:56:07 +0100 Subject: config/errors: Report and categorize errors properly for actions (#14192) Makes all errors categorized, some not displayed, some displayed. All errors can be obtained after hl.dispatch() --- src/layout/space/Space.cpp | 2 +- src/layout/space/Space.hpp | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/layout/space') diff --git a/src/layout/space/Space.cpp b/src/layout/space/Space.cpp index 27f90e36..26c02aae 100644 --- a/src/layout/space/Space.cpp +++ b/src/layout/space/Space.cpp @@ -162,7 +162,7 @@ void CSpace::setFullscreen(SP t, eFullscreenMode mode) { recalculate(); } -std::expected CSpace::layoutMsg(const std::string_view& sv) { +Config::ErrorResult CSpace::layoutMsg(const std::string_view& sv) { if (m_algorithm) return m_algorithm->layoutMsg(sv); diff --git a/src/layout/space/Space.hpp b/src/layout/space/Space.hpp index e29a6d8f..5d7f9d01 100644 --- a/src/layout/space/Space.hpp +++ b/src/layout/space/Space.hpp @@ -20,38 +20,38 @@ namespace Layout { static SP create(PHLWORKSPACE w); ~CSpace() = default; - void add(SP t); - void remove(SP t); - void move(SP t, std::optional focalPoint = std::nullopt); + void add(SP t); + void remove(SP t); + void move(SP t, std::optional focalPoint = std::nullopt); - void swap(SP a, SP b); + void swap(SP a, SP b); - SP getNextCandidate(SP old); + SP getNextCandidate(SP old); - void setAlgorithmProvider(SP algo); - void recheckWorkArea(); - void setFullscreen(SP t, eFullscreenMode mode); + void setAlgorithmProvider(SP algo); + void recheckWorkArea(); + void setFullscreen(SP t, eFullscreenMode mode); - void moveTargetInDirection(SP t, Math::eDirection dir, bool silent); + void moveTargetInDirection(SP t, Math::eDirection dir, bool silent); - void recalculate(); + void recalculate(); - void toggleTargetFloating(SP t); + void toggleTargetFloating(SP t); - std::expected layoutMsg(const std::string_view& sv); - std::optional predictSizeForNewTiledTarget(); + Config::ErrorResult layoutMsg(const std::string_view& sv); + std::optional predictSizeForNewTiledTarget(); - const CBox& workArea(bool floating = false) const; - PHLWORKSPACE workspace() const; - CBox targetPositionLocal(SP t) const; + const CBox& workArea(bool floating = false) const; + PHLWORKSPACE workspace() const; + CBox targetPositionLocal(SP t) const; - void resizeTarget(const Vector2D& Δ, SP target, eRectCorner corner = CORNER_NONE); - void moveTarget(const Vector2D& Δ, SP target); - void setTargetGeom(const CBox& box, SP target); // only for float + void resizeTarget(const Vector2D& Δ, SP target, eRectCorner corner = CORNER_NONE); + void moveTarget(const Vector2D& Δ, SP target); + void setTargetGeom(const CBox& box, SP target); // only for float - SP algorithm() const; + SP algorithm() const; - const std::vector>& targets() const; + const std::vector>& targets() const; private: CSpace(PHLWORKSPACE parent); @@ -68,4 +68,4 @@ namespace Layout { // for recalc CHyprSignalListener m_geomUpdateCallback; }; -}; \ No newline at end of file +}; -- cgit v1.2.3