From 706dee5b74e9fcd98630f445b7df8186d05665bf Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 21 Apr 2019 11:17:00 +0300 Subject: [PATCH] move tasks layout to dedicated folder --- .../contents/ui/{ => listlayout}/MouseHandler.qml | 2 +- .../contents/ui/{ => listlayout}/ScrollEdgeShadows.qml | 0 .../contents/ui/{ => listlayout}/ScrollOpacityMask.qml | 0 .../contents/ui/{ => listlayout}/ScrollableList.qml | 0 plasmoid/package/contents/ui/main.qml | 9 +++++---- 5 files changed, 6 insertions(+), 5 deletions(-) rename plasmoid/package/contents/ui/{ => listlayout}/MouseHandler.qml (99%) rename plasmoid/package/contents/ui/{ => listlayout}/ScrollEdgeShadows.qml (100%) rename plasmoid/package/contents/ui/{ => listlayout}/ScrollOpacityMask.qml (100%) rename plasmoid/package/contents/ui/{ => listlayout}/ScrollableList.qml (100%) diff --git a/plasmoid/package/contents/ui/MouseHandler.qml b/plasmoid/package/contents/ui/listlayout/MouseHandler.qml similarity index 99% rename from plasmoid/package/contents/ui/MouseHandler.qml rename to plasmoid/package/contents/ui/listlayout/MouseHandler.qml index 399b8e7c8..fe59abbaf 100644 --- a/plasmoid/package/contents/ui/MouseHandler.qml +++ b/plasmoid/package/contents/ui/listlayout/MouseHandler.qml @@ -28,7 +28,7 @@ import org.kde.taskmanager 0.1 as TaskManager import org.kde.latte 0.2 as Latte -import "../code/tools.js" as TaskTools +import "../../code/tools.js" as TaskTools Item { // signal urlDropped(url url) diff --git a/plasmoid/package/contents/ui/ScrollEdgeShadows.qml b/plasmoid/package/contents/ui/listlayout/ScrollEdgeShadows.qml similarity index 100% rename from plasmoid/package/contents/ui/ScrollEdgeShadows.qml rename to plasmoid/package/contents/ui/listlayout/ScrollEdgeShadows.qml diff --git a/plasmoid/package/contents/ui/ScrollOpacityMask.qml b/plasmoid/package/contents/ui/listlayout/ScrollOpacityMask.qml similarity index 100% rename from plasmoid/package/contents/ui/ScrollOpacityMask.qml rename to plasmoid/package/contents/ui/listlayout/ScrollOpacityMask.qml diff --git a/plasmoid/package/contents/ui/ScrollableList.qml b/plasmoid/package/contents/ui/listlayout/ScrollableList.qml similarity index 100% rename from plasmoid/package/contents/ui/ScrollableList.qml rename to plasmoid/package/contents/ui/listlayout/ScrollableList.qml diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 74bbc71f2..79ff2d044 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -33,6 +33,7 @@ import org.kde.activities 0.1 as Activities import org.kde.latte 0.2 as Latte +import "listlayout" as ListLayout import "task" as Task import "../code/tools.js" as TaskTools import "../code/activitiesTools.js" as ActivitiesTools @@ -1145,7 +1146,7 @@ Item { } - MouseHandler { + ListLayout.MouseHandler { id: mouseHandler anchors.bottom: (root.position === PlasmaCore.Types.BottomPositioned) ? scrollableList.bottom : undefined anchors.top: (root.position === PlasmaCore.Types.TopPositioned) ? scrollableList.top : undefined @@ -1205,7 +1206,7 @@ Item { } } - ScrollableList { + ListLayout.ScrollableList { id: scrollableList width: !root.vertical ? Math.min(root.width, icList.width) : thickness height: root.vertical ? Math.min(root.height, icList.height) : thickness @@ -1267,7 +1268,7 @@ Item { layer.enabled: contentsExceed && root.scrollingEnabled layer.effect: OpacityMask { - maskSource: ScrollOpacityMask{ + maskSource: ListLayout.ScrollOpacityMask{ width: scrollableList.width + root.lengthMargins height: scrollableList.height } @@ -1353,7 +1354,7 @@ Item { } } // ScrollableList - ScrollEdgeShadows { + ListLayout.ScrollEdgeShadows { id: scrollShadows width: !root.vertical ? scrollableList.width : thickness height: !root.vertical ? thickness : scrollableList.height