From 824813fc6a6b4bfaac2edb791bf3a429a9990d4e Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Mon, 15 May 2023 15:16:06 +0100 Subject: [PATCH] internal: remove check for negative exact vector args --- src/Compositor.cpp | 5 ----- src/managers/KeybindManager.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 96c8b34c..39c17a36 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -2219,11 +2219,6 @@ Vector2D CCompositor::parseWindowVectorArgsRelative(const std::string& args, con const int X = std::stoi(newX); const int Y = std::stoi(newY); - if (X < 0 || Y < 0) { - Debug::log(ERR, "parseWindowVectorArgsRelative: exact args cannot be < 0"); - return relativeTo; - } - return Vector2D(X, Y); } diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index c0ed8d53..a502f147 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -1553,6 +1553,9 @@ void CKeybindManager::resizeActive(std::string args) { const auto SIZ = g_pCompositor->parseWindowVectorArgsRelative(args, g_pCompositor->m_pLastWindow->m_vRealSize.goalv()); + if (SIZ.x < 1 || SIZ.y < 1) + return; + g_pLayoutManager->getCurrentLayout()->resizeActiveWindow(SIZ - g_pCompositor->m_pLastWindow->m_vRealSize.goalv()); if (g_pCompositor->m_pLastWindow->m_vRealSize.goalv().x > 1 && g_pCompositor->m_pLastWindow->m_vRealSize.goalv().y > 1) @@ -1605,6 +1608,9 @@ void CKeybindManager::resizeWindow(std::string args) { const auto SIZ = g_pCompositor->parseWindowVectorArgsRelative(MOVECMD, PWINDOW->m_vRealSize.goalv()); + if (SIZ.x < 1 || SIZ.y < 1) + return; + g_pLayoutManager->getCurrentLayout()->resizeActiveWindow(SIZ - PWINDOW->m_vRealSize.goalv(), PWINDOW); if (PWINDOW->m_vRealSize.goalv().x > 1 && PWINDOW->m_vRealSize.goalv().y > 1)