135 lines
4.5 KiB
Diff
135 lines
4.5 KiB
Diff
From b9138794ca476a3e533c0f49041a436e15b66eae Mon Sep 17 00:00:00 2001
|
|
From: Robin Lee <cheeselee@fedoraproject.org>
|
|
Date: Fri, 22 Apr 2022 11:17:36 +0800
|
|
Subject: [PATCH] revert added functions from their forked kwin
|
|
|
|
---
|
|
deepin-wm-dbus/com.deepin.wm.xml.in | 6 ------
|
|
deepin-wm-dbus/deepinwmfaker.cpp | 14 --------------
|
|
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, 48 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 f026a8f23..1e0ddf645 100644
|
|
--- a/deepin-wm-dbus/deepinwmfaker.cpp
|
|
+++ b/deepin-wm-dbus/deepinwmfaker.cpp
|
|
@@ -911,20 +911,6 @@ void DeepinWMFaker::BeginToMoveActiveWindow()
|
|
m_kwinUtilsInter->WindowMove();
|
|
}
|
|
|
|
-void DeepinWMFaker::TouchToMove(int x, int y)
|
|
-{
|
|
-#ifndef DISABLE_DEEPIN_WM
|
|
- m_kwinUtilsInter->TouchPadToMoveWindow(x,y);
|
|
-#endif
|
|
-}
|
|
-
|
|
-void DeepinWMFaker::ClearMoveStatus()
|
|
-{
|
|
-#ifndef DISABLE_DEEPIN_WM
|
|
- m_kwinUtilsInter->EndTouchPadToMoveWindow();
|
|
-#endif
|
|
-}
|
|
-
|
|
void DeepinWMFaker::SwitchApplication(bool backward)
|
|
{
|
|
if (!m_kwinUtilsInter->isValid()) {
|
|
diff --git a/deepin-wm-dbus/deepinwmfaker.h b/deepin-wm-dbus/deepinwmfaker.h
|
|
index f44edc7fd..f6f7dd40b 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 ee283a60e..cfa0e1b0f 100644
|
|
--- a/plugins/platforms/lib/kwinutils.cpp
|
|
+++ b/plugins/platforms/lib/kwinutils.cpp
|
|
@@ -92,8 +92,6 @@ public Q_SLOTS:
|
|
// change to Compositor::compositing()
|
|
bool compositing() const;
|
|
#endif
|
|
- 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
|
|
@@ -1129,22 +1127,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 ca2919bb2..d41754300 100644
|
|
--- a/plugins/platforms/lib/kwinutils.h
|
|
+++ b/plugins/platforms/lib/kwinutils.h
|
|
@@ -166,8 +166,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.34.1
|
|
|