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

prototype with a ListView

Browse source 
still doesn't change activities correctly, seems to be too eager to
load all containments at start
This commit is contained in:
Marco Martin 2018-02-09 13:04:48 +01:00
parent f0f7c69be6
commit 5e1e5e9009
1 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ MouseArea {
property int notificationId: 0; property int notificationId: 0;
property int buttonHeight: width/4 property int buttonHeight: width/4
property bool containmentsEnterFromRight: true property bool containmentsEnterFromRight: true
drag.filterChildren: true drag.filterChildren: false
//HACK: needs better api from kactivities qml //HACK: needs better api from kactivities qml
PathView { PathView {
@ -62,16 +62,60 @@ MouseArea {
} }
} }
} }
ListView {
id: mainView
z: 998
visible: root.containment
interactive: true
anchors.fill: parent
orientation: ListView.Horizontal
snapMode: ListView.SnapOneItem
boundsBehavior: Flickable.StopAtBounds
cacheBuffer: width * count * 2
model: Activities.ActivityModel {
id: activityModel2
}
delegate: Rectangle {
radius: 100
id: mainDelegate
width: mainView.width
height: mainView.height
property bool inViewport: root.containment && mainView.contentX <= x && mainView.contentX+mainView.width <= x + width
property bool current: containment == root.containment
property Item containment
onCurrentChanged: {
if (current) {
mainView.currentIndex = index
}
}
onInViewportChanged: {
if (inViewport && !mainDelegate.containment) {
mainDelegate.containment = desktop.containmentItemForActivity(model.id);
print(mainDelegate.containment+" "+root.containment);
containmentNextActivityPreview = containment;
mainDelegate.containment.parent = mainDelegate;
mainDelegate.containment.anchors.fill = mainDelegate;
}
}
Text {
x: -100
z: 100
text: mainDelegate.inViewport + " " + mainView.contentX +" "+ mainDelegate.x +" "+ (mainView.contentX + mainView.width) + " " + (mainDelegate.x + mainDelegate.width)
}
}
}
PageIndicator { PageIndicator {
z: 999 z: 999
anchors { anchors {
bottom: parent.bottom bottom: parent.bottom
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
} }
count: activitiesRepresentation.count count: mainView.count
currentIndex: activitiesRepresentation.currentIndex currentIndex: mainView.currentIndex
} }
property int startX /* property int startX
onPressed: { onPressed: {
startX = mouse.x - containment.x startX = mouse.x - containment.x
} }
@ -91,7 +135,7 @@ MouseArea {
} }
onReleased: { onReleased: {
activityModel.setCurrentActivity("395250d4-d44b-4735-8494-4db49beb29dd", function(){}); activityModel.setCurrentActivity("395250d4-d44b-4735-8494-4db49beb29dd", function(){});
} }*/
ActivityHandle { ActivityHandle {
mirrored: true mirrored: true
} }
@ -124,7 +168,7 @@ MouseArea {
} }
} }
} }
/*
onContainmentChanged: { onContainmentChanged: {
if (containment == null) { if (containment == null) {
return; return;
@ -155,7 +199,7 @@ MouseArea {
internal.oldContainment = containment; internal.oldContainment = containment;
} }
} }
*/
Binding { Binding {
target: containment target: containment
property: "width" property: "width"
@ -168,7 +212,7 @@ MouseArea {
property Item oldContainment: null; property Item oldContainment: null;
property Item newContainment: null; property Item newContainment: null;
} }
/*
SequentialAnimation { SequentialAnimation {
id: switchAnim id: switchAnim
ScriptAction { ScriptAction {
@ -212,7 +256,7 @@ MouseArea {
} }
} }
} }
*/
//pass the focus to the containment, so it can react to homescreen activate/inactivate //pass the focus to the containment, so it can react to homescreen activate/inactivate
Connections { Connections {
target: desktop target: desktop