From 2f179b2745440d08413d9256cffe14b1ee585d8c Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 15 Aug 2023 14:36:01 +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=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=86=D0=B5=D0=BB=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/canvas.tscn | 4 ++-- table/table.gd | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index de171bdd..a6d08416 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -8,7 +8,7 @@ [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_laka7"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ogspn"] resource_local_to_scene = true shader = ExtResource("4_gb4a1") shader_parameter/color = Color(1, 1, 1, 0.168627) @@ -26,6 +26,6 @@ centered = false script = ExtResource("2_vkwmy") [node name="строб" parent="." instance=ExtResource("3_uhdvc")] -material = SubResource("ShaderMaterial_laka7") +material = SubResource("ShaderMaterial_ogspn") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/table/table.gd b/table/table.gd index 68001e55..f7d64372 100644 --- a/table/table.gd +++ b/table/table.gd @@ -48,7 +48,7 @@ func pin_header(scrl: ScrollContainer, prnt: Control): scrl.remove_child(header) prnt.add_child(header) ## TODO: Это значение следует получить из темы - var v_separation: = 3.0 + var v_separation = get_theme_constant('v_separation') header.position = scrl.position - Vector2(0, header.size.y + v_separation) scroll = scrl scroll_adj = scrl.position @@ -466,6 +466,7 @@ func connect_columns(dest_node: Node, event_name: String, callback: String, clmn assert (OK == node.connect(event_name, conn)) node.set_meta(META_NAME_CALLEBLE, conn) + ## func set_rows_text(rows: Array) -> void: for i_row in rows.size():