yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin] Use QIconItem in compact tabbox for the icon

Browse source
This commit is contained in:
Martin Gräßlin 2013-12-06 15:41:56 +01:00
parent 1db6b8003d
commit 0860bc4151
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tabbox/qml/clients/compact/contents/ui/main.qml
View file

@ -26,7 +26,6 @@ Item {
property int screenWidth : 0 property int screenWidth : 0
property int screenHeight : 0 property int screenHeight : 0
property string longestCaption: "" property string longestCaption: ""
property int imagePathPrefix: (new Date()).getTime()
property int optimalWidth: compactListView.maxRowWidth property int optimalWidth: compactListView.maxRowWidth
property int optimalHeight: compactListView.rowHeight * compactListView.count + background.topMargin + background.bottomMargin property int optimalHeight: compactListView.rowHeight * compactListView.count + background.topMargin + background.bottomMargin
property bool canStretchX: true property bool canStretchX: true
@ -49,11 +48,6 @@ Item {
function setModel(model) { function setModel(model) {
compactListView.model = model; compactListView.model = model;
compactListView.maxRowWidth = compactListView.calculateMaxRowWidth(); compactListView.maxRowWidth = compactListView.calculateMaxRowWidth();
compactListView.imageId++;
}
function modelChanged() {
compactListView.imageId++;
} }
/** /**
@ -91,15 +85,11 @@ Item {
width: compactListView.width width: compactListView.width
height: compactListView.rowHeight height: compactListView.rowHeight
opacity: minimized ? 0.6 : 1.0 opacity: minimized ? 0.6 : 1.0
Image { QIconItem {
id: iconItem id: iconItem
source: "image://client/" + index + "/" + compactTabBox.imagePathPrefix + "-" + compactListView.imageId + "/selected" icon: model.icon
width: 16 width: 16
height: 16 height: 16
sourceSize {
width: 16
height: 16
}
anchors { anchors {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
left: parent.left left: parent.left
@ -173,8 +163,6 @@ Item {
// the maximum text width + icon item width (32 + 4 margin) + margins for hover item + margins for background // the maximum text width + icon item width (32 + 4 margin) + margins for hover item + margins for background
property int maxRowWidth: calculateMaxRowWidth() property int maxRowWidth: calculateMaxRowWidth()
property int rowHeight: calcRowHeight() property int rowHeight: calcRowHeight()
// used for image provider URL to trick Qt into reloading icons when the model changes
property int imageId: 0
anchors { anchors {
fill: parent fill: parent
topMargin: background.topMargin topMargin: background.topMargin