diff --git a/applets/kicker/package/contents/ui/ItemGridDelegate.qml b/applets/kicker/package/contents/ui/ItemGridDelegate.qml index 8c5aad07b..2473c85fb 100644 --- a/applets/kicker/package/contents/ui/ItemGridDelegate.qml +++ b/applets/kicker/package/contents/ui/ItemGridDelegate.qml @@ -1,130 +1,132 @@ /*************************************************************************** * Copyright (C) 2015 by Eike Hein * * * * 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 02110-1301 USA . * ***************************************************************************/ import QtQuick 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import "code/tools.js" as Tools Item { id: item width: GridView.view.cellWidth height: width property bool showLabel: true property int itemIndex: model.index property string favoriteId: model.favoriteId != undefined ? model.favoriteId : "" property url url: model.url != undefined ? model.url : "" property variant icon: model.decoration != undefined ? model.decoration : "" property var m: model property bool hasActionList: ((model.favoriteId != null) || (("hasActionList" in model) && (model.hasActionList == true))) Accessible.role: Accessible.MenuItem Accessible.name: model.display function openActionMenu(x, y) { var actionList = hasActionList ? model.actionList : []; Tools.fillActionMenu(i18n, actionMenu, actionList, GridView.view.model.favoritesModel, model.favoriteId); actionMenu.visualParent = item; actionMenu.open(x, y); } function actionTriggered(actionId, actionArgument) { var close = (Tools.triggerAction(GridView.view.model, model.index, actionId, actionArgument) === true); if (close) { root.toggle(); } } PlasmaCore.IconItem { id: icon y: showLabel ? (2 * highlightItemSvg.margins.top) : undefined anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: showLabel ? undefined : parent.verticalCenter width: iconSize height: width colorGroup: PlasmaCore.Theme.ComplementaryColorGroup animated: false usesPlasmaTheme: item.GridView.view.usesPlasmaTheme source: model.decoration } PlasmaComponents.Label { id: label visible: showLabel anchors { top: icon.bottom topMargin: units.smallSpacing left: parent.left leftMargin: highlightItemSvg.margins.left right: parent.right rightMargin: highlightItemSvg.margins.right } horizontalAlignment: Text.AlignHCenter maximumLineCount: 2 elide: Text.ElideRight wrapMode: Text.Wrap color: "white" // FIXME TODO: Respect theming? text: ("name" in model ? model.name : model.display) } PlasmaCore.ToolTipArea { id: toolTip property string text: model.display anchors.fill: parent active: root.visible && label.truncated mainItem: toolTipDelegate + + onContainsMouseChanged: item.GridView.view.itemContainsMouseChanged(containsMouse) } Keys.onPressed: { if (event.key == Qt.Key_Menu && hasActionList) { event.accepted = true; openActionMenu(item); } else if ((event.key == Qt.Key_Enter || event.key == Qt.Key_Return)) { event.accepted = true; if ("trigger" in GridView.view.model) { GridView.view.model.trigger(index, "", null); root.toggle(); } itemGrid.itemActivated(index, "", null); } } } diff --git a/applets/kicker/package/contents/ui/ItemGridView.qml b/applets/kicker/package/contents/ui/ItemGridView.qml index 8a6e2cc76..89ed313cb 100644 --- a/applets/kicker/package/contents/ui/ItemGridView.qml +++ b/applets/kicker/package/contents/ui/ItemGridView.qml @@ -1,465 +1,469 @@ /*************************************************************************** * Copyright (C) 2015 by Eike Hein * * * * 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 02110-1301 USA . * ***************************************************************************/ import QtQuick 2.4 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.kquickcontrolsaddons 2.0 import org.kde.draganddrop 2.0 FocusScope { id: itemGrid signal keyNavLeft signal keyNavRight signal keyNavUp signal keyNavDown signal itemActivated(int index, string actionId, string argument) property bool dragEnabled: true property bool dropEnabled: false property bool showLabels: true property alias usesPlasmaTheme: gridView.usesPlasmaTheme property alias currentIndex: gridView.currentIndex property alias currentItem: gridView.currentItem property alias contentItem: gridView.contentItem property alias count: gridView.count property alias model: gridView.model property alias cellWidth: gridView.cellWidth property alias cellHeight: gridView.cellHeight property alias iconSize: gridView.iconSize property alias horizontalScrollBarPolicy: scrollArea.horizontalScrollBarPolicy property alias verticalScrollBarPolicy: scrollArea.verticalScrollBarPolicy onDropEnabledChanged: { if (!dropEnabled && "dropPlaceHolderIndex" in model) { model.dropPlaceHolderIndex = -1; } } onFocusChanged: { if (!focus && !root.keyEventProxy.activeFocus) { currentIndex = -1; } } function currentRow() { if (currentIndex == -1) { return -1; } return Math.floor(currentIndex / Math.floor(width / cellWidth)); } function currentCol() { if (currentIndex == -1) { return -1; } return currentIndex - (currentRow() * Math.floor(width / cellWidth)); } function lastRow() { var columns = Math.floor(width / cellWidth); return Math.ceil(count / columns) - 1; } function tryActivate(row, col) { if (count) { var columns = Math.floor(width / cellWidth); var rows = Math.ceil(count / columns); row = Math.min(row, rows - 1); col = Math.min(col, columns - 1); currentIndex = Math.min(row ? ((Math.max(1, row) * columns) + col) : col, count - 1); focus = true; } } function forceLayout() { gridView.forceLayout(); } ActionMenu { id: actionMenu onActionClicked: { visualParent.actionTriggered(actionId, actionArgument); } } DropArea { id: dropArea anchors.fill: parent onDragMove: { if (!dropEnabled || gridView.animating || !kicker.dragSource) { return; } var x = Math.max(0, event.x - (width % cellWidth)); var cPos = mapToItem(gridView.contentItem, x, event.y); var item = gridView.itemAt(cPos.x, cPos.y); if (item) { if (kicker.dragSource.parent == gridView.contentItem) { if (item != kicker.dragSource) { item.GridView.view.model.moveRow(dragSource.itemIndex, item.itemIndex); } } else if (kicker.dragSource.view.model.favoritesModel == model && !model.isFavorite(kicker.dragSource.favoriteId)) { var hasPlaceholder = (model.dropPlaceholderIndex != -1); model.dropPlaceholderIndex = item.itemIndex; if (!hasPlaceholder) { gridView.currentIndex = (item.itemIndex - 1); } } } else if (kicker.dragSource.parent != gridView.contentItem && kicker.dragSource.view.model.favoritesModel == model && !model.isFavorite(kicker.dragSource.favoriteId)) { var hasPlaceholder = (model.dropPlaceholderIndex != -1); model.dropPlaceholderIndex = hasPlaceholder ? model.count - 1 : model.count; if (!hasPlaceholder) { gridView.currentIndex = (model.count - 1); } } else { model.dropPlaceholderIndex = -1; gridView.currentIndex = -1; } } onDragLeave: { if ("dropPlaceholderIndex" in model) { model.dropPlaceholderIndex = -1; gridView.currentIndex = -1; } } onDrop: { if (kicker.dragSource && kicker.dragSource.parent != gridView.contentItem && kicker.dragSource.view.model.favoritesModel == model) { model.addFavorite(kicker.dragSource.favoriteId, model.dropPlaceholderIndex); gridView.currentIndex = -1; } } Timer { id: resetAnimationDurationTimer interval: 120 repeat: false onTriggered: { gridView.animationDuration = interval - 20; } } PlasmaExtras.ScrollArea { id: scrollArea anchors.fill: parent focus: true horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff GridView { id: gridView + signal itemContainsMouseChanged(bool containsMouse) + property bool usesPlasmaTheme: false property int iconSize: units.iconSizes.huge property bool animating: false property int animationDuration: dropEnabled ? resetAnimationDurationTimer.interval : 0 focus: true currentIndex: -1 move: Transition { enabled: itemGrid.dropEnabled SequentialAnimation { PropertyAction { target: gridView; property: "animating"; value: true } NumberAnimation { duration: gridView.animationDuration properties: "x, y" easing.type: Easing.OutQuad } PropertyAction { target: gridView; property: "animating"; value: false } } } moveDisplaced: Transition { enabled: itemGrid.dropEnabled SequentialAnimation { PropertyAction { target: gridView; property: "animating"; value: true } NumberAnimation { duration: gridView.animationDuration properties: "x, y" easing.type: Easing.OutQuad } PropertyAction { target: gridView; property: "animating"; value: false } } } keyNavigationWraps: false boundsBehavior: Flickable.StopAtBounds delegate: ItemGridDelegate { showLabel: showLabels } highlight: Item { property bool isDropPlaceHolder: "dropPlaceholderIndex" in model && currentIndex == model.dropPlaceholderIndex PlasmaComponents.Highlight { visible: gridView.currentItem && !isDropPlaceHolder anchors.fill: parent } PlasmaCore.FrameSvgItem { visible: gridView.currentItem && isDropPlaceHolder anchors.fill: parent imagePath: "widgets/viewitem" prefix: "selected" opacity: 0.5 PlasmaCore.IconItem { anchors { right: parent.right rightMargin: parent.margins.right bottom: parent.bottom bottomMargin: parent.margins.bottom } width: units.iconSizes.smallMedium height: width source: "list-add" active: false } } } highlightFollowsCurrentItem: true highlightMoveDuration: 0 onCurrentIndexChanged: { if (currentIndex != -1) { + hoverArea.hoverEnabled = false focus = true; } } onCountChanged: { animationDuration = 0; resetAnimationDurationTimer.start(); } onModelChanged: { currentIndex = -1; } Keys.onLeftPressed: { if (currentCol() != 0) { event.accepted = true; moveCurrentIndexLeft(); } else { itemGrid.keyNavLeft(); } } Keys.onRightPressed: { var columns = Math.floor(width / cellWidth); if (currentCol() != columns - 1 && currentIndex != count -1) { event.accepted = true; moveCurrentIndexRight(); } else { itemGrid.keyNavRight(); } } Keys.onUpPressed: { if (currentRow() != 0) { event.accepted = true; moveCurrentIndexUp(); positionViewAtIndex(currentIndex, GridView.Contain); } else { itemGrid.keyNavUp(); } } Keys.onDownPressed: { if (currentRow() < itemGrid.lastRow()) { // Fix moveCurrentIndexDown()'s lack of proper spatial nav down // into partial columns. event.accepted = true; var columns = Math.floor(width / cellWidth); var newIndex = currentIndex + columns; currentIndex = Math.min(newIndex, count - 1); positionViewAtIndex(currentIndex, GridView.Contain); } else { itemGrid.keyNavDown(); } } + + onItemContainsMouseChanged: { + if (!containsMouse) { + if (!actionMenu.opened) { + gridView.currentIndex = -1; + } + + hoverArea.pressX = -1; + hoverArea.pressY = -1; + hoverArea.lastX = -1; + hoverArea.lastY = -1; + hoverArea.pressedItem = null; + hoverArea.hoverEnabled = true; + } + } } } MouseArea { id: hoverArea anchors.fill: parent property int pressX: -1 property int pressY: -1 property int lastX: -1 property int lastY: -1 property Item pressedItem: null acceptedButtons: Qt.LeftButton | Qt.RightButton hoverEnabled: true function updatePositionProperties(x, y) { // Prevent hover event synthesis in QQuickWindow interfering // with keyboard navigation by ignoring repeated events with // identical coordinates. As the work done here would be re- // dundant in any case, these are safe to ignore. if (lastX == x && lastY == y) { return; } lastX = x; lastY = y; var cPos = mapToItem(gridView.contentItem, x, y); var item = gridView.itemAt(cPos.x, cPos.y); if (!item) { gridView.currentIndex = -1; pressedItem = null; } else { gridView.currentIndex = item.itemIndex; itemGrid.focus = (currentIndex != -1) } return item; } onPressed: { mouse.accepted = true; updatePositionProperties(mouse.x, mouse.y); pressX = mouse.x; pressY = mouse.y; if (mouse.button == Qt.RightButton) { if (gridView.currentItem) { if (gridView.currentItem.hasActionList) { var mapped = mapToItem(gridView.currentItem, mouse.x, mouse.y); gridView.currentItem.openActionMenu(mapped.x, mapped.y); } } else { var mapped = mapToItem(rootItem, mouse.x, mouse.y); contextMenu.open(mapped.x, mapped.y); } } else { pressedItem = gridView.currentItem; } } onReleased: { mouse.accepted = true; if (gridView.currentItem && gridView.currentItem == pressedItem) { if ("trigger" in gridView.model) { gridView.model.trigger(pressedItem.itemIndex, "", null); root.toggle(); } itemGrid.itemActivated(pressedItem.itemIndex, "", null); } else if (!pressedItem && mouse.button == Qt.LeftButton) { root.toggle(); } pressX = -1; pressY = -1; pressedItem = null; } onPositionChanged: { var item = updatePositionProperties(mouse.x, mouse.y); if (gridView.currentIndex != -1) { if (dragEnabled && pressX != -1 && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) { if ("pluginName" in item.m) { dragHelper.startDrag(kicker, item.url, item.icon, "text/x-plasmoidservicename", item.m.pluginName); } else { dragHelper.startDrag(kicker, item.url, item.icon); } kicker.dragSource = item; pressX = -1; pressY = -1; } } } - - onContainsMouseChanged: { - if (!containsMouse) { - if (!actionMenu.opened) { - gridView.currentIndex = -1; - } - - pressX = -1; - pressY = -1; - lastX = -1; - lastY = -1; - pressedItem = null; - } - } } } }