Merge remote-tracking branch 'lepshiy/master' into master-gd4.4

# Conflicts:
#	scenes/frame-ecm-params/scroll-ecm-params.gd
This commit is contained in:
sasha80
2025-03-28 16:32:37 +03:00
4 changed files with 68 additions and 62 deletions

View File

@@ -1,24 +1,16 @@
[gd_scene load_steps=4 format=3 uid="uid://dgidt8lifm7xe"]
[ext_resource type="PackedScene" uid="uid://dspa16ufrpanp" path="res://table/ячейка-2.tscn" id="1_eib5d"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_f4oye"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_t3fqw"]
[sub_resource type="Theme" id="Theme_odxqp"]
CheckButton/styles/focus = SubResource("StyleBoxEmpty_t3fqw")
[node name="Control" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="LineEdit" parent="." instance=ExtResource("1_eib5d")]
layout_mode = 0
[node name="LineEdit" type="LineEdit"]
offset_right = 85.0
offset_bottom = 27.0
theme_override_styles/focus = SubResource("StyleBoxEmpty_f4oye")
editable = false
[node name="CheckButton" type="CheckButton" parent="."]

View File

@@ -1,29 +1,32 @@
[gd_scene load_steps=4 format=3 uid="uid://5rw652cmnybi"]
[gd_scene load_steps=5 format=3 uid="uid://5rw652cmnybi"]
[ext_resource type="PackedScene" uid="uid://dspa16ufrpanp" path="res://table/ячейка-2.tscn" id="1_qcan0"]
[ext_resource type="Shader" path="res://shaders/color-invers.gdshader" id="1_anyuq"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_q2spu"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_7hsq1"]
[sub_resource type="Theme" id="Theme_hnhcj"]
CheckButton/styles/focus = SubResource("StyleBoxEmpty_q2spu")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_xxfw6"]
shader = ExtResource("1_anyuq")
[node name="SettingsTaggle" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_y8485"]
[node name="LineEdit" parent="." instance=ExtResource("1_qcan0")]
layout_mode = 0
[node name="LineEdit" type="LineEdit"]
offset_right = 950.0
offset_bottom = 27.0
theme_override_colors/font_uneditable_color = Color(1, 0.596078, 0.4, 1)
theme_override_colors/font_color = Color(1, 0.596078, 0.4, 1)
theme_override_styles/focus = SubResource("StyleBoxEmpty_7hsq1")
editable = false
context_menu_enabled = false
shortcut_keys_enabled = false
middle_mouse_paste_enabled = false
selecting_enabled = false
deselect_on_focus_loss_enabled = false
[node name="CheckButton" type="CheckButton" parent="."]
material = SubResource("ShaderMaterial_xxfw6")
layout_mode = 0
offset_left = 453.0
offset_top = 4.0
offset_top = 1.5
offset_right = 497.0
offset_bottom = 28.0
theme = SubResource("Theme_hnhcj")
offset_bottom = 25.5
theme_override_styles/focus = SubResource("StyleBoxEmpty_y8485")