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

position mapping fixes

Browse source
This commit is contained in:
Marco Martin 2019-08-22 14:01:04 +02:00
parent ff2fe85d93
commit 39a4ae5780
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
containments/homescreen2/package/contents/ui/launcher/FavoriteStrip.qml
View file

@ -39,4 +39,10 @@ LauncherContainer {
implicitWidth: launcherGrid.cellWidth * Math.max(1, plasmoid.nativeInterface.applicationListModel.favoriteCount) + leftPadding + rightPadding implicitWidth: launcherGrid.cellWidth * Math.max(1, plasmoid.nativeInterface.applicationListModel.favoriteCount) + leftPadding + rightPadding
Behavior on width {
NumberAnimation {
duration: units.longDuration
easing.type: Easing.InOutQuad
}
}
} }

10
containments/homescreen2/package/contents/ui/launcher/LauncherDragManager.qml
View file

@ -59,11 +59,13 @@ QtObject {
} }
function changeContainer(item, container) { function changeContainer(item, container) {
var pos = container.contentItem.mapFromItem(item, 0, 0); var pos;
if (container == appletsLayout) { if (container == appletsLayout) {
pos = container.mapFromItem(item, 0, 0);
item.parent = container; item.parent = container;
} else { } else {
pos = container.contentItem.mapFromItem(item, 0, 0);
item.parent = container.contentItem; item.parent = container.contentItem;
} }
@ -90,7 +92,9 @@ QtObject {
// Search Left // Search Left
for (var i = 0; i < item.width * 2; i += item.width/2) { for (var i = 0; i < item.width * 2; i += item.width/2) {
var candidate = container.flow.childAt(item.x + dragCenterX + i, item.y + dragCenterY); var candidate = container.flow.childAt(
Math.min(container.flow.width, Math.max(0, item.x + dragCenterX + i)),
Math.min(container.flow.height-1, Math.max(0, item.y + dragCenterY)));
if (candidate && i < distance) { if (candidate && i < distance) {
child = candidate; child = candidate;
break; break;
@ -99,7 +103,7 @@ QtObject {
// Search Right // Search Right
for (var i = 0; i < item.width * 2; i += item.width/2) { for (var i = 0; i < item.width * 2; i += item.width/2) {
var candidate = container.flow.childAt(item.x + dragCenterX - i, item.y + dragCenterY); var candidate = container.flow.childAt(Math.min(container.flow.width, Math.max(0, item.x + dragCenterX - i)), Math.min(container.flow.height-1, Math.max(0, item.y + dragCenterY)));
if (candidate && i < distance) { if (candidate && i < distance) {
child = candidate; child = candidate;
break; break;