Temp hotfix for scroll while dragging

qbcore-framework · Nov 7, 2023 · 38f3443 · 38f3443
1 parent 5b06f0d
commit 38f3443
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/html/css/main.css b/html/css/main.css
@@ -6,6 +6,11 @@
 }
 
 body {
+    width: 100vw;
+    height: 100vh;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
     background: none !important;
     font-family: "Roboto", sans-serif;
 }
@@ -130,8 +135,7 @@ input[type="number"]::-webkit-outer-spin-button {
     width: 28%;
     height: 47.16%;
     float: left;
-    overflow-x: hidden;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 .other-inventory {
@@ -145,8 +149,7 @@ input[type="number"]::-webkit-outer-spin-button {
     width: 28%;
     height: 47.16%;
     float: left;
-    overflow-x: hidden;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 .item-slot {

diff --git a/html/js/app.js b/html/js/app.js
@@ -408,11 +408,34 @@ function FormatItemInfo(itemData) {
     }
 }
 
+$(document).on("wheel", function (e) {
+    if (IsDragging) {
+        var delta = e.originalEvent.deltaY;
+        var $playerInventory = $(".player-inventory");
+        var $otherInventory = $(".other-inventory");
+
+        var playerInventoryOffset = $playerInventory.offset();
+        var otherInventoryOffset = $otherInventory.offset();
+        var mouseX = e.originalEvent.clientX;
+        var mouseY = e.originalEvent.clientY;
+
+        if (mouseX > playerInventoryOffset.left && mouseX < playerInventoryOffset.left + $playerInventory.width() && mouseY > playerInventoryOffset.top && mouseY < playerInventoryOffset.top + $playerInventory.height()) {
+            $playerInventory.scrollTop($playerInventory.scrollTop() + delta);
+        } else if (mouseX > otherInventoryOffset.left && mouseX < otherInventoryOffset.left + $otherInventory.width() && mouseY > otherInventoryOffset.top && mouseY < otherInventoryOffset.top + $otherInventory.height()) {
+            $otherInventory.scrollTop($otherInventory.scrollTop() + delta);
+        }
+
+        if ((mouseX > playerInventoryOffset.left && mouseX < playerInventoryOffset.left + $playerInventory.width() && mouseY > playerInventoryOffset.top && mouseY < playerInventoryOffset.top + $playerInventory.height()) || (mouseX > otherInventoryOffset.left && mouseX < otherInventoryOffset.left + $otherInventory.width() && mouseY > otherInventoryOffset.top && mouseY < otherInventoryOffset.top + $otherInventory.height())) {
+            e.preventDefault();
+        }
+    }
+});
+
 function handleDragDrop() {
     $(".item-drag").draggable({
         helper: "clone",
         appendTo: "body",
-        scroll: true,
+        scroll: false,
         revertDuration: 0,
         revert: "invalid",
         cancel: ".item-nodrag",