From f0ec89f38b1dd86d8b79f1057706b222bce80bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 18 Feb 2016 10:30:58 +0100 Subject: [PATCH] Merge Options::MouseLower for Client and AbstractClient The implementation in Client::performMouseCommand can now also be used directly in AbstractClient. --- abstract_client.cpp | 7 +++++++ useractions.cpp | 11 ----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/abstract_client.cpp b/abstract_client.cpp index dc145c4dee..260e5fdccf 100644 --- a/abstract_client.cpp +++ b/abstract_client.cpp @@ -792,6 +792,13 @@ bool AbstractClient::performMouseCommand(Options::MouseCommand cmd, const QPoint break; case Options::MouseLower: { workspace()->lowerClient(this); + // used to be activateNextClient(this), then topClientOnDesktop + // since this is a mouseOp it's however safe to use the client under the mouse instead + if (isActive() && options->focusPolicyIsReasonable()) { + AbstractClient *next = workspace()->clientUnderMouse(screen()); + if (next && next != this) + workspace()->requestFocus(next, false); + } break; } case Options::MouseOperationsMenu: diff --git a/useractions.cpp b/useractions.cpp index 95861cceda..eb498f3581 100755 --- a/useractions.cpp +++ b/useractions.cpp @@ -1199,17 +1199,6 @@ bool Client::performMouseCommand(Options::MouseCommand command, const QPoint &gl { bool replay = false; switch(command) { - case Options::MouseLower: { - workspace()->lowerClient(this); - // used to be activateNextClient(this), then topClientOnDesktop - // since this is a mouseOp it's however safe to use the client under the mouse instead - if (isActive() && options->focusPolicyIsReasonable()) { - AbstractClient *next = workspace()->clientUnderMouse(screen()); - if (next && next != this) - workspace()->requestFocus(next, false); - } - break; - } case Options::MouseShade : toggleShade(); cancelShadeHoverTimer();