From 89e81d27bd77202068fbc6e9c7927ddde67e580a Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 6 May 2025 14:11:19 +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=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D1=8B=D1=85=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/контроль/элемент-в.tscn | 15 ++++++++++----- scenes/контроль/элемент-г.tscn | 10 +++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/scenes/контроль/элемент-в.tscn b/scenes/контроль/элемент-в.tscn index ba1d3bc..702b757 100644 --- a/scenes/контроль/элемент-в.tscn +++ b/scenes/контроль/элемент-в.tscn @@ -16,6 +16,11 @@ extends Control @export var textures: Array[Texture] +@export var show_rname: bool = true: + set(v): + show_rname = v + $lbl_rname.visible = v + @export var self_size: Vector2i = Vector2i(50, 150): set(v): @@ -92,9 +97,9 @@ vertical_alignment = 1 [node name="lbl_fname" type="Label" parent="."] self_modulate = Color(1, 1, 1, 0.627451) layout_mode = 0 -offset_top = 122.0 -offset_right = 94.0 -offset_bottom = 172.0 +offset_top = 111.0 +offset_right = 84.0 +offset_bottom = 161.0 rotation = -1.5708 theme_override_font_sizes/font_size = 17 text = "Ячейка" @@ -104,9 +109,9 @@ vertical_alignment = 1 [node name="txr_state" type="TextureRect" parent="."] layout_mode = 0 offset_left = 13.8 -offset_top = 119.6 +offset_top = 121.6 offset_right = 237.8 -offset_bottom = 343.6 +offset_bottom = 345.6 scale = Vector2(0.1, 0.1) texture = ExtResource("1_01aoa") diff --git a/scenes/контроль/элемент-г.tscn b/scenes/контроль/элемент-г.tscn index 56a656e..f9a38bb 100644 --- a/scenes/контроль/элемент-г.tscn +++ b/scenes/контроль/элемент-г.tscn @@ -14,6 +14,13 @@ extends PanelContainer @export var textures: Array +@export var show_state: bool = true: + set(v): + show_state = v + $margin/vbox/grid/state.visible = v + $margin/vbox/grid.columns = 3 if v else 2 + + signal pressed(control: PanelContainer) @export var fname: String: @@ -36,6 +43,7 @@ signal pressed(control: PanelContainer) @export var alignment: int: set(v): + alignment = v $margin/vbox.alignment = v @@ -142,7 +150,7 @@ vertical_alignment = 1 [node name="rname" type="Label" parent="margin/vbox/grid"] layout_mode = 2 -size_flags_horizontal = 3 +size_flags_horizontal = 10 size_flags_vertical = 6 theme_override_font_sizes/font_size = 22 horizontal_alignment = 2