diff --git a/data/main-font.tres b/data/main-font.tres index f75961c..24d67ef 100644 --- a/data/main-font.tres +++ b/data/main-font.tres @@ -1,9 +1,12 @@ -[gd_resource type="FontFile" load_steps=2 format=2] +[gd_resource type="FontFile" load_steps=2 format=3 uid="uid://clrxfflc1wrhj"] -[ext_resource path="res://data/DejaVuSansCondensed.ttf" type="FontFile" id=1] +[ext_resource type="FontFile" uid="uid://c7hvei2ks7jp6" path="res://data/DejaVuSansCondensed.ttf" id="1"] [resource] -size = 20 -use_mipmaps = true -use_filter = true -font_data = ExtResource( 1 ) +fallbacks = Array[Font]([ExtResource("1")]) +cache/0/16/0/ascent = 0.0 +cache/0/16/0/descent = 0.0 +cache/0/16/0/underline_position = 0.0 +cache/0/16/0/underline_thickness = 0.0 +cache/0/16/0/scale = 1.0 +cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) diff --git a/data/secondary-font.tres b/data/secondary-font.tres index 5f7ba84..bb0ebdd 100644 --- a/data/secondary-font.tres +++ b/data/secondary-font.tres @@ -4,9 +4,6 @@ [resource] fallbacks = Array[Font]([ExtResource("1_cxid7")]) -face_index = null -embolden = null -transform = null cache/0/17/0/ascent = 0.0 cache/0/17/0/descent = 0.0 cache/0/17/0/underline_position = 0.0 @@ -19,6 +16,7 @@ cache/0/17/0/kerning_overrides/14/0 = Vector2(0, 0) cache/0/17/0/kerning_overrides/8/0 = Vector2(0, 0) cache/0/17/0/kerning_overrides/15/0 = Vector2(0, 0) cache/0/17/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/17/0/kerning_overrides/20/0 = Vector2(0, 0) cache/0/16/0/ascent = 0.0 cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 @@ -31,6 +29,7 @@ cache/0/16/0/kerning_overrides/14/0 = Vector2(0, 0) cache/0/16/0/kerning_overrides/8/0 = Vector2(0, 0) cache/0/16/0/kerning_overrides/15/0 = Vector2(0, 0) cache/0/16/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/16/0/kerning_overrides/20/0 = Vector2(0, 0) cache/0/18/0/ascent = 0.0 cache/0/18/0/descent = 0.0 cache/0/18/0/underline_position = 0.0 @@ -43,6 +42,7 @@ cache/0/18/0/kerning_overrides/14/0 = Vector2(0, 0) cache/0/18/0/kerning_overrides/8/0 = Vector2(0, 0) cache/0/18/0/kerning_overrides/15/0 = Vector2(0, 0) cache/0/18/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/18/0/kerning_overrides/20/0 = Vector2(0, 0) cache/0/14/0/ascent = 0.0 cache/0/14/0/descent = 0.0 cache/0/14/0/underline_position = 0.0 @@ -55,6 +55,7 @@ cache/0/14/0/kerning_overrides/14/0 = Vector2(0, 0) cache/0/14/0/kerning_overrides/8/0 = Vector2(0, 0) cache/0/14/0/kerning_overrides/15/0 = Vector2(0, 0) cache/0/14/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/14/0/kerning_overrides/20/0 = Vector2(0, 0) cache/0/8/0/ascent = 0.0 cache/0/8/0/descent = 0.0 cache/0/8/0/underline_position = 0.0 @@ -67,6 +68,7 @@ cache/0/8/0/kerning_overrides/14/0 = Vector2(0, 0) cache/0/8/0/kerning_overrides/8/0 = Vector2(0, 0) cache/0/8/0/kerning_overrides/15/0 = Vector2(0, 0) cache/0/8/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/8/0/kerning_overrides/20/0 = Vector2(0, 0) cache/0/15/0/ascent = 0.0 cache/0/15/0/descent = 0.0 cache/0/15/0/underline_position = 0.0 @@ -79,6 +81,7 @@ cache/0/15/0/kerning_overrides/14/0 = Vector2(0, 0) cache/0/15/0/kerning_overrides/8/0 = Vector2(0, 0) cache/0/15/0/kerning_overrides/15/0 = Vector2(0, 0) cache/0/15/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/15/0/kerning_overrides/20/0 = Vector2(0, 0) cache/0/13/0/ascent = 0.0 cache/0/13/0/descent = 0.0 cache/0/13/0/underline_position = 0.0 @@ -91,3 +94,17 @@ cache/0/13/0/kerning_overrides/14/0 = Vector2(0, 0) cache/0/13/0/kerning_overrides/8/0 = Vector2(0, 0) cache/0/13/0/kerning_overrides/15/0 = Vector2(0, 0) cache/0/13/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/13/0/kerning_overrides/20/0 = Vector2(0, 0) +cache/0/20/0/ascent = 0.0 +cache/0/20/0/descent = 0.0 +cache/0/20/0/underline_position = 0.0 +cache/0/20/0/underline_thickness = 0.0 +cache/0/20/0/scale = 1.0 +cache/0/20/0/kerning_overrides/17/0 = Vector2(0, 0) +cache/0/20/0/kerning_overrides/16/0 = Vector2(0, 0) +cache/0/20/0/kerning_overrides/18/0 = Vector2(0, 0) +cache/0/20/0/kerning_overrides/14/0 = Vector2(0, 0) +cache/0/20/0/kerning_overrides/8/0 = Vector2(0, 0) +cache/0/20/0/kerning_overrides/15/0 = Vector2(0, 0) +cache/0/20/0/kerning_overrides/13/0 = Vector2(0, 0) +cache/0/20/0/kerning_overrides/20/0 = Vector2(0, 0) diff --git a/project.godot b/project.godot index 080df7b..3a6cdef 100644 --- a/project.godot +++ b/project.godot @@ -83,11 +83,11 @@ map_server_addr=false [gui] -common/text_edit_undo_stack_max_size=10 +common/text_edit_undo_stack_max_size=100 theme/custom_font="res://data/secondary-font.tres" theme/default_font_antialiasing=0 theme/default_font_hinting=2 -theme/default_font_subpixel_positioning=0 +theme/default_font_subpixel_positioning=3 theme/lcd_subpixel_layout=0 common/drop_mouse_on_gui_input_disabled=true diff --git a/scenes/frame-ecm-list/scroll-ecm-list.gd b/scenes/frame-ecm-list/scroll-ecm-list.gd index a417d70..b7f5e43 100644 --- a/scenes/frame-ecm-list/scroll-ecm-list.gd +++ b/scenes/frame-ecm-list/scroll-ecm-list.gd @@ -49,6 +49,7 @@ const COLUMN_STATE = 4 func on_row_pressed(i_row: int): $table.clear_rows_selected() $table.set_row_selected(i_row, true) + $table.ensure_row_visible(i_row) var ecm = $table.get_node_user_data(0, i_row) if interfer.thrs.has(ecm.ispp): signaller.emit_signal('rto_threat_sel', interfer.thrs[ecm.ispp]) @@ -65,6 +66,7 @@ func on_rto_threat_sel(th_id: int, table_index): ecm = $table.get_node_user_data(0, i_row) $table.clear_rows_selected() $table.set_row_selected(i_row, true) + $table.ensure_row_visible(i_row) else: $table.clear_rows_selected() signaller.emit_signal('interfer_selected', ecm) @@ -111,6 +113,7 @@ func on_interfer_new(ecm, table_index): table_index[ecm.ispp] = i_row $table.clear_rows_selected() $table.set_row_selected(i_row, true) + $table.ensure_row_visible(i_row) signaller.emit_signal('interfer_selected', ecm) diff --git a/scenes/frame-threats/scroll-threats.gd b/scenes/frame-threats/scroll-threats.gd index b5026b2..3438a73 100644 --- a/scenes/frame-threats/scroll-threats.gd +++ b/scenes/frame-threats/scroll-threats.gd @@ -23,6 +23,7 @@ func on_row_pressed(i_row: int): func row_pressed(i_row: int): $table.clear_rows_selected() $table.set_row_selected(i_row, true) + $table.ensure_row_visible(i_row) var threat = $table.get_node_user_data(0, i_row) signaller.emit_signal('threat_selected', threat) diff --git a/scenes/frm_ecm_list.gd b/scenes/frm_ecm_list.gd new file mode 100644 index 0000000..cf95ef2 --- /dev/null +++ b/scenes/frm_ecm_list.gd @@ -0,0 +1,17 @@ +extends NinePatchRect + + +# Called when the node enters the scene tree for the first time. +func _ready(): + $grd_forced/btn_cancel.button_connect('pressed', Callable(self, 'on_btn_cancel_pressed').bind($grd_forced/btn_cancel)) + + +func on_btn_cancel_pressed(btn): + signaller.emit_signal('interfer_off_all') + await get_tree().create_timer(0.1).timeout + btn.pressed = false + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass