[CtrlInventoryGridEx] Additional boundary checks

TGRCdev · Apr 17, 2024 · 82f0ed4 · 82f0ed4
1 parent f9339a4
commit 82f0ed4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/addons/gloot/ui/ctrl_dragable.gd b/addons/gloot/ui/ctrl_dragable.gd
@@ -38,6 +38,10 @@ static func get_grab_offset() -> Vector2:
     return _grab_offset
 
 
+static func get_grab_offset_local_to(control: Control) -> Vector2:
+    return CtrlDragable.get_grab_offset() / control.get_global_transform().get_scale()
+
+
 func _get_drag_data(at_position: Vector2):
     if !_enabled:
         return null

diff --git a/addons/gloot/ui/ctrl_drop_zone.gd b/addons/gloot/ui/ctrl_drop_zone.gd
@@ -4,7 +4,6 @@ extends Control
 signal dragable_dropped(dragable, position)
 
 const CtrlDragable = preload("res://addons/gloot/ui/ctrl_dragable.gd")
-const CtrlDropZone = preload("res://addons/gloot/ui/ctrl_drop_zone.gd")
 
 
 func activate() -> void:
@@ -24,7 +23,8 @@ func _can_drop_data(at_position: Vector2, data) -> bool:
 
 
 func _drop_data(at_position: Vector2, data) -> void:
-    var local_pos := CtrlDragable.get_grab_offset() / get_global_transform().get_scale()
-    dragable_dropped.emit(data, at_position - local_pos)
-    CtrlDragable.dragable_dropped.emit(data, self, at_position - local_pos)
+    var local_offset := CtrlDragable.get_grab_offset_local_to(self)
+    dragable_dropped.emit(data, at_position - local_offset)
+    CtrlDragable.dragable_dropped.emit(data, self, at_position - local_offset)
+
 
diff --git a/addons/gloot/ui/ctrl_inventory_grid_ex.gd b/addons/gloot/ui/ctrl_inventory_grid_ex.gd
@@ -335,10 +335,13 @@ func _highlight_grabbed_item(style: StyleBox):
         _fill_background(field_style, PriorityPanel.StylePriority.LOW)
         return
 
+    _fill_background(field_style, PriorityPanel.StylePriority.LOW)
+
     var grabbed_item_coords := _ctrl_inventory_grid_basic.get_field_coords(global_grabbed_item_pos + (field_dimensions / 2))
     var item_size := inventory.get_item_size(grabbed_item)
     var rect := Rect2i(grabbed_item_coords, item_size)
-    _fill_background(field_style, PriorityPanel.StylePriority.LOW)
+    if !Rect2i(Vector2i.ZERO, inventory.size).encloses(rect):
+        return
     _set_rect_background(rect, style, PriorityPanel.StylePriority.LOW)
 
 
@@ -375,7 +378,7 @@ func _get_global_grabbed_item() -> InventoryItem:
 
 func _get_global_grabbed_item_local_pos() -> Vector2:
     if CtrlDragable.get_grabbed_dragable():
-        return get_local_mouse_position() - CtrlDragable.get_grab_offset()
+        return get_local_mouse_position() - CtrlDragable.get_grab_offset_local_to(self)
     return Vector2(-1, -1)