From e5c5f41b5febb77716e482562f05a5cd6dc5fa07 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 15 Aug 2023 15:46:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=B2=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=D1=85=D0=BE=D0=B4=D1=8F=D1=82=20?= =?UTF-8?q?=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D1=85=20=D1=8D=D0=BB?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа.gd | 2 +- table/table.gd | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scenes/работа.gd b/scenes/работа.gd index 336859f6..a5d86c3d 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -158,7 +158,7 @@ func _on_drag_begin(event) -> void: ## Обработчик событий вввода. Вызывается godot -func _input(event): +func _on_gui_input(event): if event is InputEventMouseMotion: if drag_fsm == DragFSM.DRAG: emit_signal('drag_continue', event) diff --git a/table/table.gd b/table/table.gd index f7d64372..3013738c 100644 --- a/table/table.gd +++ b/table/table.gd @@ -40,6 +40,7 @@ func get_node_scene(): return node_type_file func _assert_meta(i_col: int, i_row: int, pname: String, node): assert(node.has_meta(pname), 'ошибка: нет мета-свойства \"%s\" у ячейки колонка:%d ряд:%d' % [pname, i_col, i_row]) func get_node_user_data(i_col: int, i_row: int): return get_node_meta(i_col, i_row, META_NAME_USER_DATA) func set_node_user_data(i_col: int, i_row: int, val) -> void: set_node_meta(i_col, i_row, META_NAME_USER_DATA, val) +func _unhandled_key_input(event: InputEvent) -> void: _gui_input(event) ## Закрепляет заголовок таблицы. [param scrl] - Прокрутка, @@ -182,9 +183,9 @@ func set_columns_aligment(alignments: Array) -> void: ## -func _input(event) -> void: +func _gui_input(event) -> void: if event is InputEventKey: - if in_focus and event.pressed: + if not event.pressed: if event.keycode == selector_key_up: selector_up() elif event.keycode == selector_key_down: