From 4b53b4da5c9c2afbc38ee54f3a8d19693a089d30 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Sat, 12 Mar 2022 22:17:12 +0000 Subject: [PATCH] Revert "Add support for task reordering based on ordering history" This reverts commit 3a09014754faa665331bdc4b6c17b1436eb5a764 --- components/mobilehomescreencomponents/qml/LauncherRepeater.qml | 2 +- components/mobileshell/qml/taskswitcher/TaskSwitcherState.qml | 2 -- components/mobileshell/qml/taskswitcher/Thumbnail.qml | 2 +- containments/homescreen/package/contents/ui/main.qml | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/mobilehomescreencomponents/qml/LauncherRepeater.qml b/components/mobilehomescreencomponents/qml/LauncherRepeater.qml index 0daad781..3d2eb873 100644 --- a/components/mobilehomescreencomponents/qml/LauncherRepeater.qml +++ b/components/mobilehomescreencomponents/qml/LauncherRepeater.qml @@ -105,7 +105,7 @@ Repeater { onLaunch: (x, y, icon, title) => { if (icon !== "") { - print(delegate.iconItem); + print(delegate.iconItem) MobileShell.HomeScreenControls.openAppAnimation( icon, title, diff --git a/components/mobileshell/qml/taskswitcher/TaskSwitcherState.qml b/components/mobileshell/qml/taskswitcher/TaskSwitcherState.qml index 31d9afbc..09abf304 100644 --- a/components/mobileshell/qml/taskswitcher/TaskSwitcherState.qml +++ b/components/mobileshell/qml/taskswitcher/TaskSwitcherState.qml @@ -205,7 +205,6 @@ QtObject { onFinished: { root.currentlyBeingOpened = false; - taskSwitcher.tasksModel.requestLastActivatedReorderDelay(false); } } @@ -221,7 +220,6 @@ QtObject { taskSwitcher.instantHide(); if (root.wasInActiveTask) { - taskSwitcher.tasksModel.requestLastActivatedReorderDelay(true); taskSwitcher.setSingleActiveWindow(root.currentTaskIndex); } } diff --git a/components/mobileshell/qml/taskswitcher/Thumbnail.qml b/components/mobileshell/qml/taskswitcher/Thumbnail.qml index 9adcb183..5dd3139e 100644 --- a/components/mobileshell/qml/taskswitcher/Thumbnail.qml +++ b/components/mobileshell/qml/taskswitcher/Thumbnail.qml @@ -15,7 +15,7 @@ TaskManager.PipeWireSourceItem { nodeId: waylandItem.nodeId onVisibleChanged: { - if (visible) { + if (visible && waylandItem.uuid.length === 0) { if (model.WinIdList) { waylandItem.uuid = model.WinIdList[0]; } diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml index d4f589c5..33f6ab5c 100644 --- a/containments/homescreen/package/contents/ui/main.qml +++ b/containments/homescreen/package/contents/ui/main.qml @@ -184,7 +184,7 @@ FocusScope { groupMode: TaskManager.TasksModel.GroupDisabled screenGeometry: plasmoid.screenGeometry - sortMode: TaskManager.TasksModel.SortLastActivated + sortMode: TaskManager.TasksModel.SortAlpha virtualDesktop: virtualDesktopInfo.currentDesktop activity: activityInfo.currentActivity