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

primitive plasmoids reordering

Browse source
This commit is contained in:
Marco Martin 2015-06-19 21:45:56 -07:00
parent d197736adc
commit 6439947d53
1 changed files with 62 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
containments/homescreen/package/contents/ui/main.qml
View file

@ -64,11 +64,6 @@ Item {
var before = null; var before = null;
container.animationsEnabled = false; container.animationsEnabled = false;
if (appletsSpace.lastSpacer.parent === appletsSpace.layout) {
//Uncomment to make the spacer the last element again
// before = appletsSpace.lastSpacer;
}
if (before) { if (before) {
LayoutManager.insertBefore(before, container); LayoutManager.insertBefore(before, container);
@ -90,7 +85,7 @@ Item {
LayoutManager.plasmoid = plasmoid; LayoutManager.plasmoid = plasmoid;
LayoutManager.root = root; LayoutManager.root = root;
LayoutManager.layout = appletsSpace.layout; LayoutManager.layout = appletsSpace.layout;
LayoutManager.lastSpacer = appletsSpace.lastSpacer; //LayoutManager.lastSpacer = appletsSpace.lastSpacer;
LayoutManager.restore(); LayoutManager.restore();
applicationsView.contentY = -root.height; applicationsView.contentY = -root.height;
@ -434,7 +429,7 @@ Item {
//scrolling down //scrolling down
if (verticalVelocity > 0 && contentY < -headerItem.height + root.height && if (verticalVelocity > 0 && contentY < -headerItem.height + root.height &&
contentY > (-headerItem.height + root.height/6)) { contentY > (-headerItem.height + root.height/6)) {
scrollAnim.to = -plasmoid.availableScreenRect.height scrollAnim.to = -headerItem.height +plasmoid.availableScreenRect.height
scrollAnim.running = true; scrollAnim.running = true;
return; return;
@ -479,7 +474,8 @@ Item {
delegate: HomeLauncher { delegate: HomeLauncher {
visible: index > 3 visible: index > 3
} }
header: MouseArea { header: MouseEventListener {
id: headerItem
z: 999 z: 999
property Item layout: appletsLayout property Item layout: appletsLayout
property Item lastSpacer: spacer property Item lastSpacer: spacer
@ -487,13 +483,57 @@ Item {
width: root.width width: root.width
height: mainLayout.Layout.minimumHeight height: mainLayout.Layout.minimumHeight
property int margin: stripe.height + units.gridUnit * 2 property int margin: stripe.height + units.gridUnit * 2
property Item draggingApplet
onPressAndHold: { onPressAndHold: {
print(favoritesView.contains(mapToItem(favoritesView, mouse.x, mouse.y))) print(favoritesView.contains(mapToItem(favoritesView, mouse.x, mouse.y)))
if (!root.locked && !favoritesView.contains(mapToItem(favoritesView, mouse.x, mouse.y))) { if (!root.locked && !favoritesView.contains(mapToItem(favoritesView, mouse.x, mouse.y))) {
editOverlay.visible = true; editOverlay.visible = true;
var pos = mapToItem(appletsLayout, mouse.x, mouse.y);
draggingApplet = appletsSpace.layout.childAt(pos.x, pos.y);
print("BUuuH"+draggingApplet);
print("MOOO"+draggingApplet.applet.title);
if (draggingApplet) {
dndSpacer.Layout.minimumHeight = draggingApplet.height;
LayoutManager.insertBefore(draggingApplet, dndSpacer);
draggingApplet.parent = headerItem;
pos = mapToItem(headerItem, mouse.x, mouse.y);
draggingApplet.y = pos.y - draggingApplet.height/2;
applicationsView.interactive = false;
}
} }
} }
onPositionChanged: {
if (!draggingApplet) {
return;
}
var pos = mapToItem(headerItem, mouse.x, mouse.y);
draggingApplet.y = mouse.y - draggingApplet.height/2;
pos = mapToItem(appletsLayout, mouse.x, mouse.y);
var itemUnderMouse = appletsSpace.layout.childAt(pos.x, pos.y);
if (itemUnderMouse && itemUnderMouse != dndSpacer) {
dndSpacer.parent = colorScope;
if (pos.y < itemUnderMouse.y + itemUnderMouse.height/2) {
LayoutManager.insertBefore(itemUnderMouse, dndSpacer);
} else {
LayoutManager.insertAfter(itemUnderMouse, dndSpacer);
}
}
}
onReleased: {
if (!draggingApplet) {
return;
}
LayoutManager.insertBefore( dndSpacer, draggingApplet);
applicationsView.interactive = true;
dndSpacer.parent = colorScope;
draggingApplet = null;
}
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
@ -523,7 +563,14 @@ Item {
} }
} }
} }
Item {
id: spacer
Layout.fillWidth: true
Layout.minimumHeight: 0
Layout.maximumHeight: Layout.minimumHeight
}
PlasmaCore.ColorScope { PlasmaCore.ColorScope {
id: colorScope
//TODO: decide what color we want applets //TODO: decide what color we want applets
colorGroup: PlasmaCore.Theme.NormalColorGroup colorGroup: PlasmaCore.Theme.NormalColorGroup
Layout.fillWidth: true Layout.fillWidth: true
@ -531,13 +578,13 @@ Item {
Layout.maximumHeight: appletsLayout.Layout.maximumHeight Layout.maximumHeight: appletsLayout.Layout.maximumHeight
ColumnLayout { ColumnLayout {
id: appletsLayout id: appletsLayout
Item { }
id: spacer Item {
Layout.fillWidth: true id: dndSpacer
Layout.fillHeight: true Layout.fillWidth: true
Layout.minimumHeight: plasmoid.applets.length % 2 == 0 ? 0 : (root.height - margin)/2 Layout.fillHeight: true
Layout.maximumHeight: Layout.minimumHeight Layout.minimumHeight: plasmoid.applets.length % 2 == 0 ? 0 : (root.height - margin)/2
} Layout.maximumHeight: Layout.minimumHeight
} }
} }
Item { Item {