Merge pull request #4 from Jeremi360:godot-4

Last fixes for 1.0
rakugoteam · Dec 17, 2024 · dae03ff · dae03ff
2 parents 01873b0 + 9d3af92
commit dae03ff
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -96,6 +96,7 @@ extends RichTextLabel
 @export_multiline
 var text_with_icons: String:
 	set(value):
+		if !is_node_ready(): await ready
 		text_with_icons = value
 		bbcode_enabled = true
 		text = IconsFonts.parse_text(value)
@@ -113,11 +114,9 @@ you need add `*.json` files to include files settings:
 ![](.assets/export.png)
 
 ## Know Issues
+- Window mode is init with empty icons render*
 
-- Window mode is init with empty icons render
-- Sometimes click on icon doesn't copy it to clipboard
-
-To fix both of them just change back-and-forward to icon font you want to use
+\**To fix just change back-and-forward to icon font you want to use.*
 
 ## Compatibility
 This addon is replacing our previous to addons:

diff --git a/addons/icons-fonts/examples/rich_text_label_with_icons.gd b/addons/icons-fonts/examples/rich_text_label_with_icons.gd
@@ -4,6 +4,7 @@ extends RichTextLabel
 @export_multiline
 var text_with_icons: String:
 	set(value):
+		if !is_node_ready(): await ready
 		text_with_icons = value
 		bbcode_enabled = true
 		text = IconsFonts.parse_text(value)

diff --git a/addons/icons-fonts/examples/test_icons_fonts.tscn b/addons/icons-fonts/examples/test_icons_fonts.tscn
@@ -1,15 +1,15 @@
 [gd_scene load_steps=23 format=3 uid="uid://casymgu2sqx81"]
 
-[ext_resource type="FontFile" uid="uid://bbfeoo2kuf30n" path="res://addons/icons-fonts/icons_fonts/MaterialIcons/material_design_icons.ttf" id="1_7oe6v"]
+[ext_resource type="FontFile" uid="uid://be10y8fgoiayy" path="res://addons/icons-fonts/icons_fonts/emojis/NotoColorEmoji.ttf" id="1_lglyu"]
 [ext_resource type="Script" path="res://addons/icons-fonts/nodes/FontIcon.gd" id="2_fd237"]
 [ext_resource type="Script" path="res://addons/icons-fonts/resources/FontIconSetting.gd" id="3_jajcj"]
 [ext_resource type="Script" path="res://addons/icons-fonts/nodes/FontIconButton.gd" id="4_5ca3b"]
 [ext_resource type="Script" path="res://addons/icons-fonts/nodes/FontIconCheckButton.gd" id="5_qfxwr"]
 [ext_resource type="Script" path="res://addons/icons-fonts/examples/rich_text_label_with_icons.gd" id="6_3361y"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_fw4y0"]
-font = ExtResource("1_7oe6v")
-font_size = 128
+font = ExtResource("1_lglyu")
+font_size = 64
 shadow_size = 0
 shadow_color = Color(1, 1, 1, 1)
 shadow_offset = Vector2(0, 0)

diff --git a/addons/icons-fonts/icon_finder/icon_finder.gd b/addons/icons-fonts/icon_finder/icon_finder.gd
@@ -37,11 +37,12 @@ func _ready():
 
 	for renderer: IconsFontsRender in icons_renderers:
 		renderer.tooltip_text = tooltip
-		
+
 func setup():
 	for renderer: IconsFontsRender in icons_renderers:
 		if !renderer.is_node_ready(): await ready
 		renderer.setup()
+		renderer.meta_clicked.connect(_on_meta)
 	icons_renderer = icons_renderers[0]
 
 func update_icons_size(value: int):
@@ -52,15 +53,9 @@ func update_icons_size(value: int):
 	IconsFonts.preview_size = value
 
 func on_font_changed(font_id: int):
-	if icons_renderer:
-		if icons_renderer.meta_clicked.is_connected(_on_meta):
-			icons_renderer.meta_clicked.disconnect(_on_meta)
-
 	icons_renderers_tabs.current_tab = font_id
 	icons_renderer = icons_renderers[font_id]
 
-	icons_renderer.meta_clicked.connect(_on_meta)
-
 func update_table(filter := ""):
 	if not icons_renderer: return
 	icons_renderer.update_table(filter)

diff --git a/addons/icons-fonts/icons_fonts.gd b/addons/icons-fonts/icons_fonts.gd
@@ -42,6 +42,7 @@ var icon_finder_window_loaded:PackedScene
 func _enter_tree():
 	add_autoload_singleton("IconsFonts", icons_db)
 	await IconsFonts.ready
+
 	icon_finder_loaded = load(icon_finder_scene)
 	icon_finder_window_loaded = load(icon_finder_window_scene)
 
@@ -54,7 +55,6 @@ func _enter_tree():
 	inspector_plugin = preload(inspector_plugin_path).new()
 	add_inspector_plugin(inspector_plugin)
 
-
 func help():
 	# todo update when docs are ready!
 	# OS.shell_open("https://rakugoteam.github.io/material-icons-docs/")

diff --git a/addons/icons-fonts/nodes/FontIcon.gd b/addons/icons-fonts/nodes/FontIcon.gd
@@ -2,7 +2,6 @@
 @icon("res://addons/icons-fonts/nodes/FontIcon.svg")
 
 # todo add description and docs links when ready
-## Don't change LabelSettings value in this node!
 class_name FontIcon
 extends Label
 
@@ -15,7 +14,6 @@ extends Label
 		icon_settings.emit_changed()
 
 func _ready():
-	clip_text = false
 	_on_icon_settings_changed()
 
 func _on_icon_settings_changed():

diff --git a/addons/icons-fonts/nodes/FontIconButton.gd b/addons/icons-fonts/nodes/FontIconButton.gd
@@ -85,6 +85,7 @@ func _clear_box():
 
 func _set_order(order:String):
 	_clear_box()
+	await get_tree().create_timer(0.2).timeout
 	_apply_layout(_crate_layout(order))
 
 func _crate_layout(order:String) -> Array[Control]:
@@ -97,6 +98,7 @@ func _crate_layout(order:String) -> Array[Control]:
 
 func _apply_layout(layout: Array[Control]):
 	for control: Control in layout:
+		if control.get_parent() == _box: continue
 		_box.add_child(control)
 		if control is FontIcon:
 			control.size_flags_horizontal\