From b1f4eac5b03fe4e3f62936059d7560221ff8aa80 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 25 Jul 2023 16:20:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/ЭМС.gd | 6 +++--- table/table.gd | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scenes/ЭМС.gd b/scenes/ЭМС.gd index de894cdf..e4b0c801 100644 --- a/scenes/ЭМС.gd +++ b/scenes/ЭМС.gd @@ -111,8 +111,8 @@ func init_tbl_out(): cell.add_item(opt) cell.select(0) $tbl_out.set_columns_min_size([270, 100, 70, 70, 100, 100, 100]) - $tbl_out.set_callbacks(self, 'text_submitted', 'on_edit_entry_in', TABLE_ENTRY_COLUMNS, []) - $tbl_out.set_callbacks(self, 'item_selected', 'on_item_selected', COLUMN_OPTS_BTN, []) + $tbl_out.connect_columns(self, 'text_submitted', 'on_edit_entry_in', TABLE_ENTRY_COLUMNS, []) + $tbl_out.connect_columns(self, 'item_selected', 'on_item_selected', COLUMN_OPTS_BTN, []) func init_tbl_in(): @@ -151,7 +151,7 @@ func init_tbl_in(): btn.connect('mouse_entered', Callable(self, 'on_mouse_entered').bind(btn, i - dot_collums[0], row_index)) $tbl_in.set_node_user_data(i, row_index, in_dev) $tbl_in.set_columns_min_size(column_size) - $tbl_in.set_callbacks(self, 'text_submitted', 'on_edit_entry_in', TABLE_ENTRY_COLUMNS, []) + $tbl_in.connect_columns(self, 'text_submitted', 'on_edit_entry_in', TABLE_ENTRY_COLUMNS, []) func on_dot_button(btn, i: int, j: int): diff --git a/table/table.gd b/table/table.gd index e370d860..6b53e32d 100644 --- a/table/table.gd +++ b/table/table.gd @@ -277,7 +277,7 @@ func get_node2(i_col: int, i_row: int) -> Node: func set_node_user_data(i_col: int, i_row: int, user_data: Object) -> void: - var key: = get_node_key(NODE_KEY_FORMAT, i_col, i_row) + var key: = DATA_KEY_FORMAT % [i_row, i_col] nodes[key] = user_data