blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-24 15:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

move checkPinnedWidgetAnimation into dragOver function

Browse Source
This commit is contained in:
chfhtw
2026-04-17 12:10:37 +02:00
parent 3af9397689
commit 21fdf31518
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Drop/Grid.js
+20 -22
View File
@@ -459,8 +459,8 @@ export default {
[ w, h ] = this.cropSizeToAllowed(this.draggedItem.data.widget, w, h);
// check resize limits
this.draggedItem.oversized = (w !== targetW || h !== targetH);
if (this.draggedItem.oversized)
[ w, h ] = [ this.draggedItem.w, this.draggedItem.h ];
@@ -468,7 +468,25 @@ export default {
break;
}
}
this.checkPinnedWidgetAnimation();
// check for blocking pinned widgets
const itemCoord = {};
switch (this.mode) {
case MODE_RESIZE:
itemCoord.x = this.draggedItem.x;
itemCoord.y = this.draggedItem.y;
itemCoord.w = this.x - this.draggedItem.x + 1;
itemCoord.h = this.y - this.draggedItem.y + 1;
break;
case MODE_MOVE:
itemCoord.x = this.x;
itemCoord.y = this.y;
itemCoord.w = this.draggedItem.w;
itemCoord.h = this.draggedItem.h;
break;
}
const frame = this.grid.getItemFrame(itemCoord);
const itemsAtPosition = this.grid.getItemsInFrame(frame);
this.draggedItem.blockers = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
}
},
_cleanupDragging() {
@@ -523,26 +541,6 @@ export default {
this.clonedWidget.style.left = `${constrainedLeft}px`;
}
},
checkPinnedWidgetAnimation() {
const itemCoord = {};
switch (this.mode) {
case MODE_RESIZE:
itemCoord.x = this.draggedItem.x;
itemCoord.y = this.draggedItem.y;
itemCoord.w = this.x - this.draggedItem.x + 1;
itemCoord.h = this.y - this.draggedItem.y + 1;
break;
case MODE_MOVE:
itemCoord.x = this.x;
itemCoord.y = this.y;
itemCoord.w = this.draggedItem.w;
itemCoord.h = this.draggedItem.h;
break;
}
const frame = this.grid.getItemFrame(itemCoord);
const itemsAtPosition = this.grid.getItemsInFrame(frame);
this.draggedItem.blockers = itemsAtPosition.filter(index => this.indexedItems[index].pinned);
},
cropSizeToAllowed(type, w, h) {
if (w < 1)
w = 1;