From 2ef0b5e15b51dc30e9dff3ebe559171765faedac Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 6 Feb 2020 16:56:02 +0100 Subject: [PATCH] no background for the icons --- .../package/contents/ui/launcher/Delegate.qml | 6 +-- .../ui/launcher/LauncherContainer.qml | 4 +- .../homescreen/package/contents/ui/main.qml | 38 +++++++++++-------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/containments/homescreen/package/contents/ui/launcher/Delegate.qml b/containments/homescreen/package/contents/ui/launcher/Delegate.qml index f0c1edd9..301082c6 100644 --- a/containments/homescreen/package/contents/ui/launcher/Delegate.qml +++ b/containments/homescreen/package/contents/ui/launcher/Delegate.qml @@ -149,15 +149,15 @@ ContainmentLayoutManager.ItemContainer { } //FIXME: export smallestReadableFont font.pointSize: theme.defaultFont.pointSize * 0.9 - color: model.ApplicationLocationRole == ApplicationListModel.Desktop ? "white" : theme.textColor + color: "white"//model.ApplicationLocationRole == ApplicationListModel.Desktop ? "white" : theme.textColor - layer.enabled: model.ApplicationLocationRole == ApplicationListModel.Desktop + layer.enabled: true//model.ApplicationLocationRole == ApplicationListModel.Desktop layer.effect: DropShadow { horizontalOffset: 0 verticalOffset: 2 radius: 8.0 samples: 16 - color: Qt.rgba(0, 0, 0, 0.8) + color: Qt.rgba(0, 0, 0, 1) } } } diff --git a/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml b/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml index 17d14fe0..532cdf94 100644 --- a/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml +++ b/containments/homescreen/package/contents/ui/launcher/LauncherContainer.qml @@ -41,7 +41,7 @@ Item { property alias flow: applicationsFlow implicitWidth: frame.implicitWidth - implicitHeight: frame.implicitHeight + implicitHeight: Math.max(units.gridUnit*3, frame.implicitHeight) Controls.Label { id: metrics @@ -69,7 +69,7 @@ Item { background: PlasmaCore.FrameSvgItem { id: frameSvg - imagePath: "widgets/background" + //imagePath: "widgets/background" anchors.fill: parent } diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml index e4aa75d7..083bd41f 100644 --- a/containments/homescreen/package/contents/ui/main.qml +++ b/containments/homescreen/package/contents/ui/main.qml @@ -139,13 +139,14 @@ Item { Flickable { id: mainFlickable width: parent.width + clip: true anchors { fill: parent topMargin: plasmoid.availableScreenRect.y - bottomMargin: plasmoid.screenGeometry.height - plasmoid.availableScreenRect.height - plasmoid.availableScreenRect.y + bottomMargin: favoriteStrip.height//plasmoid.screenGeometry.height - plasmoid.availableScreenRect.height - plasmoid.availableScreenRect.y } - bottomMargin: favoriteStrip.height + //bottomMargin: favoriteStrip.height contentWidth: width contentHeight: flickableContents.height interactive: !plasmoid.editMode && !launcherDragManager.active @@ -172,14 +173,14 @@ Item { Column { id: flickableContents width: mainFlickable.width - spacing: Math.max(0, favoriteStrip.frame.height + favoriteStrip.anchors.bottomMargin - mainFlickable.contentY) + spacing: 0 DragDrop.DropArea { anchors { left: parent.left right: parent.right } - height: mainFlickable.height - favoriteStrip.frame.height //TODO: multiple widgets pages + height: mainFlickable.height //TODO: multiple widgets pages onDragEnter: { event.accept(event.proposedAction); @@ -308,6 +309,23 @@ Item { elementId: "down-arrow" } + Rectangle { + anchors { + left: parent.left + right: parent.right + bottom: favoriteStrip.top + leftMargin: units.gridUnit + rightMargin: units.gridUnit + } + height: 1 + opacity: mainFlickable.contentY > 0 ? 0.6 : 0 + Behavior on opacity { + OpacityAnimator { + duration: units.longDuration * 2 + easing.type: Easing.InOutQuad + } + } + } Launcher.FavoriteStrip { id: favoriteStrip anchors { @@ -320,17 +338,5 @@ Item { launcherGrid: launcher //y: Math.max(krunner.inputHeight, root.height - height - mainFlickable.contentY) } - -// KRunner { -// id: krunner -// z: 998 -// height: plasmoid.availableScreenRect.height -// topPadding: plasmoid.availableScreenRect.y -// anchors { -// top: parent.top -// left: parent.left -// right: parent.right -// } -// } }