From 38d3346faa3fd7b8d38930b6322e3f78f67430f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 3 Dec 2015 15:27:21 +0100 Subject: [PATCH] Mode dontMoveResize from Client to AbstractClient --- abstract_client.cpp | 8 ++++++++ abstract_client.h | 1 + client.cpp | 8 -------- client.h | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/abstract_client.cpp b/abstract_client.cpp index 1f6a0228a7..44b6fd7f04 100644 --- a/abstract_client.cpp +++ b/abstract_client.cpp @@ -1283,6 +1283,14 @@ QSize AbstractClient::resizeIncrements() const return QSize(1, 1); } +void AbstractClient::dontMoveResize() +{ + setMoveResizePointerButtonDown(false); + stopDelayedMoveResize(); + if (isMoveResize()) + finishMoveResize(false); +} + AbstractClient::Position AbstractClient::mousePosition() const { if (isDecorated()) { diff --git a/abstract_client.h b/abstract_client.h index 2c7864a060..ea04378b1b 100644 --- a/abstract_client.h +++ b/abstract_client.h @@ -791,6 +791,7 @@ protected: virtual void doResizeSync(); void handleMoveResize(int x, int y, int x_root, int y_root); void handleMoveResize(const QPoint &local, const QPoint &global); + void dontMoveResize(); virtual QSize resizeIncrements() const; diff --git a/client.cpp b/client.cpp index 6f6c03d97e..972405bae5 100644 --- a/client.cpp +++ b/client.cpp @@ -1632,14 +1632,6 @@ void Client::syncTabGroupFor(QString property, bool fromThisClient) tab_group->sync(property.toAscii().data(), fromThisClient ? this : tab_group->current()); } -void Client::dontMoveResize() -{ - setMoveResizePointerButtonDown(false); - stopDelayedMoveResize(); - if (isMoveResize()) - finishMoveResize(false); -} - void Client::setClientShown(bool shown) { if (deleting) diff --git a/client.h b/client.h index c5a1dd4f21..c1cb126e26 100644 --- a/client.h +++ b/client.h @@ -328,7 +328,6 @@ public: * to change the visible client it starts to move-resize the new * client, this function stops it. */ - void dontMoveResize(); bool isCurrentTab() const override; /**