marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-27 06:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

imake it work with latest revision

Browse source
This commit is contained in:
Marco Martin 2018-04-22 17:09:49 +02:00
parent 727c0fd7c9
commit 3a9592419c
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,17 +40,7 @@ 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
@ -134,7 +124,7 @@ Item {
} }
onInViewportChanged: { onInViewportChanged: {
if (inViewport && !mainDelegate.containment) { if (inViewport && !mainDelegate.containment) {
mainDelegate.containment = root.candidateContainments[model.id]; mainDelegate.containment = desktop.candidateContainments[model.id];
//desktop.containmentItemForActivity(model.id); //desktop.containmentItemForActivity(model.id);
containmentNextActivityPreview = containment; containmentNextActivityPreview = containment;
mainDelegate.containment.parent = mainDelegate; mainDelegate.containment.parent = mainDelegate;
@ -145,6 +135,7 @@ Item {
if (currentActivity) { if (currentActivity) {
activitiesView.currentIndex = index; activitiesView.currentIndex = index;
} }
mainDelegate.containment.visible = true;
} }
} }
} }