From 1f1c54ca6cea498fda8c6d14612a4bfd36402c86 Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Tue, 13 Feb 2024 22:30:27 +0100
Subject: [PATCH] window: use normal keyboard modifiers for triggering custom
 tiling

Modifiers for global shortcuts are handled differently from normal shortcuts,
because they need to consider modifiers that are consumed by xkb for keyboard
layout transitions and similar. This restriction is not relevant for custom
tiling.

BUG: 465858
---
 src/window.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/window.cpp b/src/window.cpp
index 361b8c7e40..8d16faec37 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1286,7 +1286,7 @@ void Window::finishInteractiveMoveResize(bool cancel)
     if (isElectricBorderMaximizing()) {
         setQuickTileMode(electricBorderMode());
         setElectricBorderMaximizing(false);
-    } else if (wasMove && (input()->modifiersRelevantForGlobalShortcuts() & Qt::ShiftModifier)) {
+    } else if (wasMove && (input()->keyboardModifiers() & Qt::ShiftModifier)) {
         setQuickTileMode(QuickTileFlag::Custom);
     }
     setElectricBorderMode(QuickTileMode(QuickTileFlag::None));
@@ -1397,7 +1397,7 @@ void Window::handleInteractiveMoveResize(const QPointF &local, const QPointF &gl
             handleInteractiveMoveResize(local.x(), local.y(), global.x(), global.y()); // fix position
         }
 
-        if (input()->modifiersRelevantForGlobalShortcuts() & Qt::ShiftModifier) {
+        if (input()->keyboardModifiers() & Qt::ShiftModifier) {
             resetQuickTilingMaximizationZones();
             const auto &r = quickTileGeometry(QuickTileFlag::Custom, global);
             if (r.isEmpty()) {