From 3a3b8115e73b23996e1fad89fd6e427afdba9acd Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Wed, 6 Dec 2023 16:25:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F.=20=D0=92=20=D1=82=D0=B0=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D1=86=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BE=D1=82=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D0=BE=D1=82=D1=80?= =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=B2=D0=BA=D0=B8=20=D1=81=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B0=20=D1=80=D1=8F=D0=B4=D0=B0.=20?= =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=83=D1=8E=20=D1=88=D0=B8=D1=80=D0=B8=D0=BD=D1=83=20=D1=81?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/main-font.tres | 15 +++++++++------ data/secondary-font.tres | 23 ++++++++++++++++++++--- project.godot | 4 ++-- scenes/scroll-ecm-list.gd | 3 +++ scenes/scroll-threats.gd | 1 + scenes/tilemap.gd | 1 - table/table.gd | 4 ++++ 7 files changed, 39 insertions(+), 12 deletions(-) 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 a605683..a991edb 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/scroll-ecm-list.gd b/scenes/scroll-ecm-list.gd index 683204f..b97b3c3 100644 --- a/scenes/scroll-ecm-list.gd +++ b/scenes/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/scroll-threats.gd b/scenes/scroll-threats.gd index dad4955..5d04b42 100644 --- a/scenes/scroll-threats.gd +++ b/scenes/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/tilemap.gd b/scenes/tilemap.gd index 839e3b6..f33ea97 100644 --- a/scenes/tilemap.gd +++ b/scenes/tilemap.gd @@ -110,7 +110,6 @@ func _process(_delta: float): else: if map_tile_stack.size() == 0: signaller.emit_signal('zoom_complete', map_zoom) - print_debug('zoom_complete: %s' % [map_rects]) map_tile_state = TASK_STATE.DONE diff --git a/table/table.gd b/table/table.gd index 2595a15..154ee76 100644 --- a/table/table.gd +++ b/table/table.gd @@ -288,6 +288,10 @@ func clear_rows_selected(): ## [param i_row] - Индекс ряда. func set_row_selected(i_row: int, selected: bool = true) -> void: + call_deferred('_set_row_selected', i_row, selected) + + +func _set_row_selected(i_row: int, selected: bool = true): var key: = SELECTOR_KEY_FORMAT % [i_row, 0] var node = nodes[NODE_KEY_FORMAT % [i_row, 0]] if nodes.has(key) and (not selected):