Relintai/material-maker
1
0
Fork 0
mirror of https://github.com/Relintai/material-maker.git synced 2024-11-13 06:27:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from metincetin/master

Browse Source 
Fixed focus and autoconnection issues on popup
This commit is contained in:
Rodz Labs 2020-02-01 17:01:58 +01:00 committed by GitHub
commit 5fd48fe5fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
material_maker/widgets/add_node_popup.gd
View File

@ -25,8 +25,6 @@ func filter_entered(filter) -> void:
func add_node(data) -> void: func add_node(data) -> void:
var node : GraphNode = get_current_graph().create_nodes(data, get_current_graph().offset_from_global_position(insert_position))[0] var node : GraphNode = get_current_graph().create_nodes(data, get_current_graph().offset_from_global_position(insert_position))[0]
hide()
clear()
# if this node created by dragging to an empty space # if this node created by dragging to an empty space
if quick_connect_node != null: if quick_connect_node != null:
var type = quick_connect_node.get_connection_output_type(quick_connect_slot) var type = quick_connect_node.get_connection_output_type(quick_connect_slot)
@ -36,6 +34,7 @@ func add_node(data) -> void:
get_current_graph().connect_node(quick_connect_node.name, quick_connect_slot, node.name, new_slot) get_current_graph().connect_node(quick_connect_node.name, quick_connect_slot, node.name, new_slot)
break break
quick_connect_node = null quick_connect_node = null
hide()
func item_selected(index) -> void: func item_selected(index) -> void:
# checks if mouse left | enter pressed. it prevents # checks if mouse left | enter pressed. it prevents
@ -48,7 +47,17 @@ func item_selected(index) -> void:
return return
add_node(data[index]) add_node(data[index])
hide() hide()
clear()
func hide()->void:
.hide()
# clearing the quick connect data after hiding to prevent unintended autoconnection
quick_connect_node = null
# grabbing the focus for the graph again as creating popup removes the focus.
get_current_graph().grab_focus()
clear()
func show() -> void: func show() -> void:
.show() .show()