diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-09-18 15:24:32 (GMT) |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-09-18 15:24:32 (GMT) |
| commit | ad1d0e7ef020afdbb11aa14be8f9a807f80a77dc (patch) | |
| tree | 93ae5b1e6e36e3148c8ce365f5ab77da47c2e391 | |
| parent | d95fb2b7e933714e4c90b41e7a3779138f781c26 (diff) | |
Polishing
| -rw-r--r-- | discover/qml/ApplicationsGridDelegate.qml | 8 | ||||
| -rw-r--r-- | discover/qml/ApplicationsTop.qml | 1 | ||||
| -rw-r--r-- | discover/qml/CategoryDelegate.qml | 2 | ||||
| -rw-r--r-- | discover/qml/CategoryDisplay.qml | 24 | ||||
| -rw-r--r-- | discover/qml/CategoryTop.qml | 1 |
5 files changed, 19 insertions, 17 deletions
diff --git a/discover/qml/ApplicationsGridDelegate.qml b/discover/qml/ApplicationsGridDelegate.qml index 6f25d4d..9a16deb 100644 --- a/discover/qml/ApplicationsGridDelegate.qml +++ b/discover/qml/ApplicationsGridDelegate.qml @@ -31,15 +31,11 @@ GridItem { onClicked: { Navigation.openApplication(application) } - Timer { - id: timer - interval: 200 - onTriggered: delegateRoot.displayDescription=true - } + SystemPalette { id: sys } Rectangle { id: artwork - color: "black" + color: sys.shadow width: parent.width height: parent.height*0.7 diff --git a/discover/qml/ApplicationsTop.qml b/discover/qml/ApplicationsTop.qml index d33f89c..a30dea0 100644 --- a/discover/qml/ApplicationsTop.qml +++ b/discover/qml/ApplicationsTop.qml @@ -32,6 +32,7 @@ Column { property Component roleDelegate: null property string title: "" readonly property var delegateHeight: title.paintedHeight*2.5 + readonly property alias titleHeight: title.height Layout.preferredHeight: (rep.count*(topView.spacing+topView.delegateHeight) + title.paintedHeight) Layout.preferredWidth: 250 diff --git a/discover/qml/CategoryDelegate.qml b/discover/qml/CategoryDelegate.qml index 6687592..2e8a252 100644 --- a/discover/qml/CategoryDelegate.qml +++ b/discover/qml/CategoryDelegate.qml @@ -24,7 +24,7 @@ import org.kde.muon 1.0 import org.kde.kquickcontrolsaddons 2.0 import "navigation.js" as Navigation -GridItem { +MouseArea { id: categoryItem property bool horizontal: false height: horizontal ? nameLabel.paintedHeight*2.5 : layout.height+10 diff --git a/discover/qml/CategoryDisplay.qml b/discover/qml/CategoryDisplay.qml index ac31fbb..4d054b1 100644 --- a/discover/qml/CategoryDisplay.qml +++ b/discover/qml/CategoryDisplay.qml @@ -25,7 +25,6 @@ import org.kde.kquickcontrolsaddons 2.0 Item { - clip: true implicitHeight: categories.height property alias category: categoryModel.displayedCategory @@ -41,23 +40,28 @@ Item } } - GridView { - id: grid + GridItem { + clip: true anchors { top: parent.top left: parent.horizontalCenter bottom: parent.bottom right: parent.right + topMargin: categories.titleHeight-2 } + GridView { + id: grid + anchors.fill: parent - model: CategoryModel { - id: categoryModel - displayedCategory: null - } + model: CategoryModel { + id: categoryModel + displayedCategory: null + } - delegate: CategoryDelegate { - horizontal: app.isCompact - width: grid.cellWidth + delegate: CategoryDelegate { + horizontal: app.isCompact + width: grid.cellWidth + } } } } diff --git a/discover/qml/CategoryTop.qml b/discover/qml/CategoryTop.qml index 2bfa12d..468f91c 100644 --- a/discover/qml/CategoryTop.qml +++ b/discover/qml/CategoryTop.qml @@ -24,6 +24,7 @@ import QtQuick.Layouts 1.1 RowLayout { id: page property QtObject category: null + readonly property alias titleHeight: top.titleHeight implicitHeight: top.Layout.preferredHeight+5 height: top.Layout.preferredHeight+5 |
