Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit c92b97fe authored by Eike Hein's avatar Eike Hein

Adjust Pager to libtaskmanager API changes for Wayland virtual desktop support

Summary:
Missing:
* The KWayland API has no way to move windows yet

Depends on D13745.

This code is largely untested and subject to change.

Reviewers: mart

Reviewed By: mart

Subscribers: plasma-devel

Tags: #plasma

Maniphest Tasks: T4457

Differential Revision: https://phabricator.kde.org/D13748
parent b0d6eab4
......@@ -51,9 +51,9 @@ MouseArea {
Layout.fillHeight: !root.vertical
property bool dragging: false
property int dragId
property string dragId
property int dragSwitchDesktopId: -1
property string dragSwitchDesktopId
property int wheelDelta: 0
......@@ -302,7 +302,7 @@ MouseArea {
PlasmaCore.ToolTipArea {
id: desktop
property int desktopId: index
property string desktopId: isActivityPager ? model.TasksModel.activity : model.TasksModel.virtualDesktop
property bool active: (index == pagerModel.currentPage)
mainText: model.display
......@@ -390,7 +390,7 @@ MouseArea {
dragTimer.start();
}
onDragLeave: {
root.dragSwitchDesktopId = -1;
root.dragSwitchDesktopId = "";
dragTimer.stop();
}
onDrop: {
......@@ -404,7 +404,7 @@ MouseArea {
id: desktopMouseArea
anchors.fill: parent
hoverEnabled : true
onClicked: pagerModel.changePage(desktopId);
onClicked: pagerModel.changePage(index);
}
Item {
......@@ -429,7 +429,7 @@ MouseArea {
z: 1 + model.StackingOrder
property rect geometry: model.Geometry
property int windowId: model.LegacyWinIdList[0]
property int windowId: model.WinIdList[0]
property string visibleName: model.display
property bool minimized: (model.IsMinimized === true)
onMinimizedChanged: desktop.updateSubText()
......
This diff is collapsed.
......@@ -100,10 +100,10 @@ public:
Q_INVOKABLE void refresh();
Q_INVOKABLE void moveWindow(int window, double x, double y, int targetItemId, int sourceItemId,
Q_INVOKABLE void moveWindow(int window, double x, double y, const QVariant &targetItemId, const QVariant &sourceItemId,
qreal widthScaleFactor, qreal heightScaleFactor);
Q_INVOKABLE void changePage(int page);
Q_INVOKABLE void drop(QMimeData *mimeData, int itemId);
Q_INVOKABLE void drop(QMimeData *mimeData, const QVariant &itemId);
Q_INVOKABLE void addDesktop();
Q_INVOKABLE void removeDesktop();
......
......@@ -122,7 +122,7 @@ QVariant WindowModel::data(const QModelIndex &index, int role) const
return windowGeo;
} else if (role == StackingOrder) {
#if HAVE_X11
const QVariantList &winIds = TaskFilterProxyModel::data(index, AbstractTasksModel::LegacyWinIdList).toList();
const QVariantList &winIds = TaskFilterProxyModel::data(index, AbstractTasksModel::WinIdList).toList();
if (winIds.count()) {
const WId winId = winIds.at(0).toLongLong();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment