[kwin] Use QIconItem in icon only tabboxes for the icons

This commit is contained in:
Martin Gräßlin 2013-12-06 15:47:38 +01:00
parent 0860bc4151
commit f3dbaaabd7
3 changed files with 5 additions and 16 deletions

View file

@ -24,7 +24,6 @@ import org.kde.qtextracomponents 2.0
Item {
id: iconsTabBox
property int iconSize
property int imagePathPrefix: (new Date()).getTime()
property alias count: iconsListView.count
property alias margins: hoverItem.margins
property alias currentItem: iconsListView.currentItem
@ -34,11 +33,6 @@ Item {
function setModel(model) {
iconsListView.model = model;
iconsListView.imageId++;
}
function modelChanged() {
iconsListView.imageId++;
}
// just to get the margin sizes
@ -57,14 +51,13 @@ Item {
id: delegateItem
width: iconSize + hoverItem.margins.left + hoverItem.margins.right
height: iconSize + hoverItem.margins.top + hoverItem.margins.bottom
Image {
QIconItem {
property variant data: model
id: iconItem
source: "image://client/" + index + "/" + iconsTabBox.imagePathPrefix + "-" + iconsListView.imageId + (index == iconsListView.currentIndex ? "/selected" : "")
sourceSize {
width: iconSize
height: iconSize
}
icon: model.icon
width: iconSize
height: iconSize
state: index == listView.currentIndex ? QIconItem.ActiveState : QIconItem.DefaultState
anchors {
fill: parent
leftMargin: hoverItem.margins.left
@ -87,8 +80,6 @@ Item {
id: iconsListView
objectName: "listView"
orientation: ListView.Horizontal
// used for image provider URL to trick Qt into reloading icons when the model changes
property int imageId: 0
width: Math.min(parent.width, (iconSize + margins.left + margins.right) * count)
height: iconSize + margins.top + margins.bottom
anchors {

View file

@ -25,7 +25,6 @@ Item {
id: bigIconsTabBox
property int screenWidth : 0
property int screenHeight : 0
property int imagePathPrefix: (new Date()).getTime()
property int optimalWidth: (icons.iconSize + icons.margins.left + icons.margins.right) * icons.count + background.leftMargin + background.bottomMargin
property int optimalHeight: icons.iconSize + icons.margins.top + icons.margins.bottom + background.topMargin + background.bottomMargin + 40
property bool canStretchX: false

View file

@ -25,7 +25,6 @@ Item {
id: smallIconsTabBox
property int screenWidth : 0
property int screenHeight : 0
property int imagePathPrefix: (new Date()).getTime()
property int optimalWidth: (icons.iconSize + icons.margins.left + icons.margins.right) * icons.count + background.leftMargin + background.bottomMargin
property int optimalHeight: icons.iconSize + icons.margins.top + icons.margins.bottom + background.topMargin + background.bottomMargin + 40
property bool canStretchX: false