Merge remote-tracking branch 'sasha80/master'

This commit is contained in:
MaD_CaT
2024-11-07 14:28:48 +03:00
2 changed files with 6 additions and 4 deletions

View File

@@ -5,7 +5,7 @@ const MENU_SCENE_FILE: String = 'res://меню.tscn'
# Адрес имитатора
const MAIN_ADDR = [ '127.0.0.1', 42022 ]
const DST_ADDR = [ '127.0.0.1', 42023 ]
const DST_ADDR = [ '127.0.0.1', 42023 ]
const TABLE_ROW_HIGHT = 34 # Высота строки таблицы в пикселях

View File

@@ -471,9 +471,11 @@ func connect_columns(dest_node: Node, event_name: String, callback: String, clmn
var conn = node.get_meta(META_CALLABLE)
node.disconnect(event_name, conn)
var conn = Callable(dest_node, callback).bind([node] + user_data)
assert (OK == node.connect(event_name, conn))
node.set_meta(META_CALLABLE, conn)
node.set_meta(META_EVENT_NAME, event_name)
if OK == node.connect(event_name, conn):
node.set_meta(META_CALLABLE, conn)
node.set_meta(META_EVENT_NAME, event_name)
else:
push_error('не удаётся подключить событие \"%s\" %s к %s', event_name, conn, node)
##