From 35aa6d690eedf3f399e715c76bf90524c1c99e4d Mon Sep 17 00:00:00 2001

From: Robin Lee <cheeselee@fedoraproject.org>

Date: Thu, 12 Nov 2020 19:09:04 +0800

Subject: [PATCH 1/6] revert added functions from their forked kwin

---

 deepin-wm-dbus/com.deepin.wm.xml.in            |  6 ------

 deepin-wm-dbus/deepinwmfaker.cpp               | 10 ----------

 deepin-wm-dbus/deepinwmfaker.h                 |  2 --

 plugins/platforms/lib/kwinutils.cpp            | 18 ------------------

 plugins/platforms/lib/kwinutils.h              |  2 --

 .../plugin/org.kde.kwin.KWinUtils.xml          |  6 ------

 6 files changed, 44 deletions(-)

diff --git a/deepin-wm-dbus/com.deepin.wm.xml.in b/deepin-wm-dbus/com.deepin.wm.xml.in

index a73a88632..279ebca4a 100644

--- a/deepin-wm-dbus/com.deepin.wm.xml.in

+++ b/deepin-wm-dbus/com.deepin.wm.xml.in

@@ -175,10 +175,4 @@

     <method name="SetShowDesktop">

         <arg type="b" name="isShowDesktop" direction="in"/>

     </method>

-    <method name="TouchToMove">

-        <arg type="i" name="x" direction="in"/>

-        <arg type="i" name="y" direction="in"/>

-    </method>

-    <method name="ClearMoveStatus">

-    </method>

 </interface>

diff --git a/deepin-wm-dbus/deepinwmfaker.cpp b/deepin-wm-dbus/deepinwmfaker.cpp

index 9b87788b5..8f971a26e 100644

--- a/deepin-wm-dbus/deepinwmfaker.cpp

+++ b/deepin-wm-dbus/deepinwmfaker.cpp

@@ -681,16 +681,6 @@ void DeepinWMFaker::BeginToMoveActiveWindow()

     m_kwinUtilsInter->WindowMove();

 }

-void DeepinWMFaker::TouchToMove(int x, int y)

-{

-    m_kwinUtilsInter->TouchPadToMoveWindow(x,y);

-}

-

-void DeepinWMFaker::ClearMoveStatus()

-{

-    m_kwinUtilsInter->EndTouchPadToMoveWindow();

-}

-

 void DeepinWMFaker::SwitchApplication(bool backward)

 {

     if (!m_kwinUtilsInter->isValid()) {

diff --git a/deepin-wm-dbus/deepinwmfaker.h b/deepin-wm-dbus/deepinwmfaker.h

index ee22e6fe7..6b30a14cd 100644

--- a/deepin-wm-dbus/deepinwmfaker.h

+++ b/deepin-wm-dbus/deepinwmfaker.h

@@ -133,8 +133,6 @@ public Q_SLOTS:

     bool GetIsShowDesktop();

     void SetShowDesktop(bool isShowDesktop);

-    void TouchToMove(int x, int y);

-    void ClearMoveStatus();

 Q_SIGNALS:

     void WorkspaceBackgroundChanged(int index, const QString &newUri);

     void WorkspaceBackgroundChangedForMonitor(int index, const QString &strMonitorName, const QString &newUri);

diff --git a/plugins/platforms/lib/kwinutils.cpp b/plugins/platforms/lib/kwinutils.cpp

index b035a67f7..4d3fdc586 100644

--- a/plugins/platforms/lib/kwinutils.cpp

+++ b/plugins/platforms/lib/kwinutils.cpp

@@ -88,8 +88,6 @@ public Q_SLOTS:

     void slotWindowMove();

     void slotWindowMaximize();

     bool compositing() const;

-    void slotTouchPadTomoveWindow(int x, int y);

-    void slotEndTouchPadToMoveWindow();

 #if !defined(KWIN_VERSION) || KWIN_VERSION < KWIN_VERSION_CHECK(5, 10, 95, 0)

     // kwin < 5.10.95

@@ -1084,22 +1082,6 @@ void KWinUtils::WindowMove()

     }

 }

-void KWinUtils::TouchPadToMoveWindow(int x, int y)

-{

-    KWin::Workspace *ws = static_cast<KWin::Workspace *>(workspace());

-    if (ws) {

-        ws->slotTouchPadTomoveWindow(x,y);

-    }

-}

-

-void KWinUtils::EndTouchPadToMoveWindow()

-{

-    KWin::Workspace *ws = static_cast<KWin::Workspace *>(workspace());

-    if (ws) {

-        ws->slotEndTouchPadToMoveWindow();

-    }

-}

-

 void KWinUtils::WindowMaximize()

 {

     KWin::Workspace *ws = static_cast<KWin::Workspace *>(workspace());

diff --git a/plugins/platforms/lib/kwinutils.h b/plugins/platforms/lib/kwinutils.h

index 2c758752c..57edb8664 100644

--- a/plugins/platforms/lib/kwinutils.h

+++ b/plugins/platforms/lib/kwinutils.h

@@ -156,8 +156,6 @@ public Q_SLOTS:

     void ShowWindowsView();

     void ResumeCompositor(int type);

     void SuspendCompositor(int type);

-    void TouchPadToMoveWindow(int x, int y);

-    void EndTouchPadToMoveWindow();

 Q_SIGNALS:

     void initialized();

diff --git a/plugins/platforms/plugin/org.kde.kwin.KWinUtils.xml b/plugins/platforms/plugin/org.kde.kwin.KWinUtils.xml

index 5854ed04f..aa61b6cde 100644

--- a/plugins/platforms/plugin/org.kde.kwin.KWinUtils.xml

+++ b/plugins/platforms/plugin/org.kde.kwin.KWinUtils.xml

@@ -22,10 +22,4 @@

     <method name="SuspendCompositor">

         <arg type="i" name="type" direction="in"/>

     </method>

-    <method name="TouchPadToMoveWindow">

-        <arg type="i" name="x" direction="in"/>

-        <arg type="i" name="y" direction="in"/>

-    </method>

-    <method name="EndTouchPadToMoveWindow">

-    </method>

 </interface>

-- 

2.26.2