damien/godot_grid_inventory
1
0
Fork 0
mirror of https://github.com/D4M13N-D3V/godot_grid_inventory.git synced 2025-03-14 08:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug where you could drag a item around when you have the context menu opened on it

Browse Source
This commit is contained in:
Damien Ostler 2024-01-08 00:19:33 -05:00
parent 3bdb5d3a2a
commit ace5d094bc
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
grid_inventory_system/scripts/InventoryController.gd
View File

@ -19,7 +19,7 @@ var inventory_item_cursor_offset = Vector2()
var inventory_item_dragged_last_container = null var inventory_item_dragged_last_container = null
var inventory_item_dragged_last_pos = Vector2() var inventory_item_dragged_last_pos = Vector2()
var inventory_context_menu:Control = null var inventory_context_menu:Control = null
var invenotry_context_menu_item:ItemConfiguration = null var inventory_context_menu_item
signal inventory_item_equipped(item_config,slot) signal inventory_item_equipped(item_config,slot)
@ -74,21 +74,21 @@ func try_to_open_context_menu():
if item != null: if item != null:
if(inventory_context_menu!=null): if(inventory_context_menu!=null):
inventory_context_menu.queue_free() inventory_context_menu.queue_free()
show_context_menu(mouse_position,item.item_config) show_context_menu(mouse_position,item)
else: else:
hide_context_menu() hide_context_menu()
# Function to show the context menu at a specific position # Function to show the context menu at a specific position
func show_context_menu(mouse_pos: Vector2, item: ItemConfiguration): func show_context_menu(mouse_pos: Vector2, item):
inventory_context_menu = CONTEXT_MENU.instantiate() inventory_context_menu = CONTEXT_MENU.instantiate()
inventory_background.add_child(inventory_context_menu) inventory_background.add_child(inventory_context_menu)
inventory_context_menu.global_position = mouse_pos + Vector2(-20,-15) inventory_context_menu.global_position = mouse_pos + Vector2(-20,-15)
inventory_context_menu.set_use(not item.item_usable) inventory_context_menu.set_use(not item.item_config.item_usable)
inventory_context_menu.set_drop(not item.item_droppable) inventory_context_menu.set_drop(not item.item_config.item_droppable)
inventory_context_menu.set_destroy(not item.item_destroyable) inventory_context_menu.set_destroy(not item.item_config.item_destroyable)
inventory_context_menu.set_open(not item.item_openable) inventory_context_menu.set_open(not item.item_config.item_openable)
inventory_context_menu_item = item
# Function to hide the context menu # Function to hide the context menu
func hide_context_menu(): func hide_context_menu():
if(inventory_context_menu!=null): if(inventory_context_menu!=null):
@ -115,6 +115,8 @@ func grab(cursor_pos):
inventory_item_dragged_last_container = c inventory_item_dragged_last_container = c
inventory_item_dragged_last_pos = inventory_item_dragged.global_position inventory_item_dragged_last_pos = inventory_item_dragged.global_position
inventory_item_cursor_offset = inventory_item_dragged.global_position - cursor_pos inventory_item_cursor_offset = inventory_item_dragged.global_position - cursor_pos
if(inventory_context_menu_item==inventory_item_dragged):
release(cursor_pos)
func release(cursor_pos): func release(cursor_pos):
if inventory_item_dragged == null: if inventory_item_dragged == null: