marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use candidatecontainments

Browse source
This commit is contained in:
Marco Martin 2018-04-19 17:37:16 +02:00
parent 8966080924
commit 727c0fd7c9
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
shell/contents/views/Desktop.qml
View file

@ -40,7 +40,17 @@ Item {
property int notificationId: 0; property int notificationId: 0;
property int buttonHeight: width/4 property int buttonHeight: width/4
property bool loadCompleted: false property bool loadCompleted: false
property var candidateContainments: Object
Connections {
target: desktop
onCandidateContainmentsChanged: {
for (var i = 0; i < desktop.candidateContainments.length; ++i) {
var cont = desktop.candidateContainments[i];
root.candidateContainments[cont.activity] = cont;
}
}
}
XAnimator { XAnimator {
id: switchAnim id: switchAnim
target: activitiesLayout target: activitiesLayout
@ -124,7 +134,8 @@ Item {
} }
onInViewportChanged: { onInViewportChanged: {
if (inViewport && !mainDelegate.containment) { if (inViewport && !mainDelegate.containment) {
mainDelegate.containment = desktop.containmentItemForActivity(model.id); mainDelegate.containment = root.candidateContainments[model.id];
//desktop.containmentItemForActivity(model.id);
containmentNextActivityPreview = containment; containmentNextActivityPreview = containment;
mainDelegate.containment.parent = mainDelegate; mainDelegate.containment.parent = mainDelegate;
mainDelegate.containment.anchors.fill = mainDelegate; mainDelegate.containment.anchors.fill = mainDelegate;
@ -135,15 +146,6 @@ Item {
activitiesView.currentIndex = index; activitiesView.currentIndex = index;
} }
} }
/*DEBUG TODO remove
Text {
z: 100
text: "inViewport: " + mainDelegate.inViewport +
"\n -activitiesLayout.x: " + -activitiesLayout.x +
"\n mainDelegate.x: "+ mainDelegate.x +
"\n (-activitiesLayout.x + activitiesView.width):"+ (-activitiesLayout.x + activitiesView.width) +
"\n (mainDelegate.x + mainDelegate.width):" + (mainDelegate.x + mainDelegate.width)
}*/
} }
} }
} }