diff --git a/containments/homescreen/package/contents/ui/launcher/Delegate.qml b/containments/homescreen/package/contents/ui/launcher/Delegate.qml index dbed1a3..5bad84a 100644 --- a/containments/homescreen/package/contents/ui/launcher/Delegate.qml +++ b/containments/homescreen/package/contents/ui/launcher/Delegate.qml @@ -1,151 +1,150 @@ /* * Copyright 2019 Marco Martin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls import QtGraphicalEffects 1.6 import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager import org.kde.phone.homescreen 1.0 ContainmentLayoutManager.ItemContainer { id: delegate z: dragActive ? 1 : 0 property var modelData: typeof model !== "undefined" ? model : null Layout.minimumWidth: launcherGrid.cellWidth Layout.minimumHeight: launcherGrid.cellHeight leftPadding: units.smallSpacing * 2 topPadding: units.smallSpacing * 2 rightPadding: units.smallSpacing * 2 bottomPadding: units.smallSpacing * 2 opacity: dragActive ? 0.4 : 1 key: model.ApplicationStorageIdRole property real dragCenterX property real dragCenterY editModeCondition: ContainmentLayoutManager.ItemContainer.AfterPressAndHold onDragActiveChanged: { launcherDragManager.active = dragActive if (dragActive) { // Must be 0, 0 as at this point dragCenterX and dragCenterY are on the drag before" launcherDragManager.startDrag(delegate); launcherDragManager.currentlyDraggedDelegate = delegate; } else { launcherDragManager.dropItem(delegate, dragCenterX, dragCenterY); plasmoid.editMode = false; editMode = false; plasmoid.fullRepresentationItem.stopScroll(); launcherDragManager.currentlyDraggedDelegate = null; } } onUserDrag: { dragCenterX = dragCenter.x; dragCenterY = dragCenter.y; launcherDragManager.dragItem(delegate, dragCenter.x, dragCenter.y); delegate.width = launcherGrid.cellWidth; delegate.height = launcherGrid.cellHeight; var pos = plasmoid.fullRepresentationItem.mapFromItem(delegate, dragCenter.x, dragCenter.y); //SCROLL UP if (pos.y < plasmoid.availableScreenRect.y + units.gridUnit) { plasmoid.fullRepresentationItem.scrollUp(); //SCROLL DOWN } else if (pos.y > plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height - units.gridUnit) { plasmoid.fullRepresentationItem.scrollDown(); //DON't SCROLL } else { plasmoid.fullRepresentationItem.stopScroll(); } } contentItem: MouseArea { onClicked: { clickFedbackAnimation.target = delegate; clickFedbackAnimation.running = true; feedbackWindow.title = modelData.ApplicationNameRole; feedbackWindow.icon = modelData.ApplicationIconRole; feedbackWindow.state = "open"; plasmoid.nativeInterface.applicationListModel.runApplication(modelData.ApplicationStorageIdRole); } //preventStealing: true ColumnLayout { anchors.fill: parent spacing: 0 PlasmaCore.IconItem { id: icon Layout.alignment: Qt.AlignHCenter | Qt.AlignTop Layout.fillWidth: true Layout.minimumHeight: parent.height - root.reservedSpaceForLabel Layout.preferredHeight: Layout.minimumHeight source: modelData ? modelData.ApplicationIconRole : "" Behavior on scale { NumberAnimation { duration: units.longDuration easing.type: Easing.InOutQuad } } } PlasmaComponents.Label { id: label visible: text.length > 0 Layout.fillWidth: true - Layout.preferredHeight: root.reservedSpaceForLabel - wrapMode: Text.WordWrap horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignTop maximumLineCount: 2 elide: Text.ElideRight - text: model.ApplicationNameRole - font.pixelSize: theme.defaultFont.pixelSize + text: model.ApplicationNameRole.split(" ")[0] + //FIXME: export smallestReadableFont + font.pixelSize: theme.defaultFont.pixelSize * 0.8 color: model.ApplicationLocationRole == ApplicationListModel.Desktop ? "white" : theme.textColor layer.enabled: model.ApplicationLocationRole == ApplicationListModel.Desktop layer.effect: DropShadow { horizontalOffset: 0 verticalOffset: 2 radius: 8.0 samples: 16 color: Qt.rgba(0, 0, 0, 0.8) } } } } } diff --git a/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml b/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml index b484080..2306833 100644 --- a/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml +++ b/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml @@ -1,101 +1,101 @@ /* * Copyright 2019 Marco Martin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager Item { id: root readonly property int reservedSpaceForLabel: metrics.height property int availableCellHeight: units.iconSizes.huge + reservedSpaceForLabel property ContainmentLayoutManager.AppletsLayout appletsLayout property Item launcherGrid property Item favoriteStrip property alias frame: frame property alias flow: applicationsFlow implicitWidth: frame.implicitWidth implicitHeight: frame.implicitHeight Controls.Label { id: metrics - text: "M\nM" + text: "M" visible: false } Item { id: spacer width: units.gridUnit * 4 height: width } Controls.Control { id: frame anchors.centerIn: parent implicitWidth: contentItem.implicitWidth + frameSvg.margins.top + frameSvg.margins.bottom implicitHeight: contentItem.implicitHeight + frameSvg.margins.top + frameSvg.margins.bottom leftPadding: frameSvg.margins.left topPadding: frameSvg.margins.top rightPadding: frameSvg.margins.right bottomPadding: frameSvg.margins.bottom background: PlasmaCore.FrameSvgItem { id: frameSvg imagePath: "widgets/background" anchors.fill: parent } // With a mousearea, it will be possible to drag with touch also on empty places contentItem: MouseArea { implicitWidth: applicationsFlow.implicitWidth implicitHeight: applicationsFlow.implicitHeight Flow { id: applicationsFlow spacing: 0 anchors.fill: parent move: Transition { NumberAnimation { duration: units.longDuration easing.type: Easing.InOutQuad properties: "x,y" } } } } Behavior on implicitWidth { NumberAnimation { duration: units.longDuration easing.type: Easing.InOutQuad } } } }