maxim/imi_sky
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lepshiy/master' into sasha80

Browse Source
This commit is contained in:
sasha80
2024-10-14 11:10:14 +03:00
parent a6b1a3fe9b 958d65b8c5
commit b4f3f16d46
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs.gd
View File

@@ -214,7 +214,7 @@ func on_btn_fs(block_fs: Fs):
lbls_param_val[6].text = str(block_fs.interfer['options']['ispp']) lbls_param_val[6].text = str(block_fs.interfer['options']['ispp'])
g_opt_btn.select(block_fs.isg) g_opt_btn.select(block_fs.isg)
g_fs_rect.visible = true g_fs_rect.visible = true
g_fs_rect.position = Vector2(g_active_fs.btn.position[0] - 1, g_active_fs.btn.position[1] - 1) g_fs_rect.position = Vector2(g_active_fs.btn.position[1] - 1, g_active_fs.btn.position[0] - 1)
func set_fs(interfer: Interfers.Interfer): func set_fs(interfer: Interfers.Interfer):

7
interfers.gd
View File

@@ -205,7 +205,6 @@ func check_interfers_state():
interfer.active_fs = null interfer.active_fs = null
for interfer in interfers.values(): for interfer in interfers.values():
var cmd_state: int = fs.set_fs(interfer) var cmd_state: int = fs.set_fs(interfer)
if interfer.svk == 3: interfer.svk = cmd_state
interfer.svk = cmd_state var cell = g_table.get_node2(COLUMN_SVK, interfer.row_id)
var cell = g_table.get_node2(COLUMN_SVK, interfer.row_id) cell.select(cmd_state)
cell.select(cmd_state)

1
main.tscn
View File

@@ -22,6 +22,7 @@ color = Color(0, 0, 0, 1)
[node name="tabs" type="TabContainer" parent="ColorRect"] [node name="tabs" type="TabContainer" parent="ColorRect"]
self_modulate = Color(0, 0, 0, 1) self_modulate = Color(0, 0, 0, 1)
layout_mode = 0
offset_right = 1594.0 offset_right = 1594.0
offset_bottom = 897.0 offset_bottom = 897.0