UI: Improve usage of number field on floats, ints and vectors (#2638)

* Fix spinbox issue: style setting for text_max_width can not be greater than 100

* Very slightly adjust code

* Improve Vector and Number fields

* Use number field for floats and ints

---------

Co-authored-by: jinyang <jinyangcruise@163.com>

Author: Jowan-Spooner

addons/dialogic/Core/DialogicUtil.gd

@@ -433,36 +433,49 @@ static func setup_script_property_edit_node(property_info: Dictionary, value:Var
 					input.select(value)
 				input.item_selected.connect(DialogicUtil._on_export_int_enum_submitted.bind(property_info.name, property_changed))
 			else:
-				input = SpinBox.new()
-				input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_info.name, property_changed))
+				input = load("res://addons/dialogic/Editor/Events/Fields/field_number.tscn").instantiate()
+				input.property_name = property_info['name']
+				input.use_int_mode()
+
 				if ',' in property_info.hint_string:
 					input.min_value = int(property_info.hint_string.get_slice(',', 0))
 					input.max_value = int(property_info.hint_string.get_slice(',', 1))
 					if property_info.hint_string.count(',') > 1:
 						input.step = int(property_info.hint_string.get_slice(',', 2))
 				else:
 					input.step = 1
-					input.allow_greater = true
-					input.allow_lesser = true
+					input.max_value = INF
+					input.min_value = -INF
+
 				if value != null:
-					input.value = value
+					input.set_value(value)
+				input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_changed))
 		TYPE_FLOAT:
-			input = SpinBox.new()
+			input = load("res://addons/dialogic/Editor/Events/Fields/field_number.tscn").instantiate()
+			input.property_name = property_info['name']
+			input.use_float_mode()
 			input.step = 0.01
 			if ',' in property_info.hint_string:
 				input.min_value = float(property_info.hint_string.get_slice(',', 0))
 				input.max_value = float(property_info.hint_string.get_slice(',', 1))
 				if property_info.hint_string.count(',') > 1:
 					input.step = float(property_info.hint_string.get_slice(',', 2))
-			input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_info.name, property_changed))
 			if value != null:
-				input.value = value
+				input.set_value(value)
+			input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_changed))
 		TYPE_VECTOR2, TYPE_VECTOR3, TYPE_VECTOR4:
 			var vectorSize: String = type_string(typeof(value))[-1]
 			input = load("res://addons/dialogic/Editor/Events/Fields/field_vector" + vectorSize + ".tscn").instantiate()
 			input.property_name = property_info['name']
 			input.set_value(value)
 			input.value_changed.connect(DialogicUtil._on_export_vector_submitted.bind(property_changed))
+		TYPE_VECTOR2I, TYPE_VECTOR3I, TYPE_VECTOR4I:
+			var vectorSize: String = type_string(typeof(value))[-2]
+			input = load("res://addons/dialogic/Editor/Events/Fields/field_vector" + vectorSize + ".tscn").instantiate()
+			input.step = 1
+			input.property_name = property_info['name']
+			input.set_value(value)
+			input.value_changed.connect(DialogicUtil._on_export_vectori_submitted.bind(property_changed))
 		TYPE_STRING:
 			if property_info['hint'] & PROPERTY_HINT_FILE or property_info['hint'] & PROPERTY_HINT_DIR:
 				input = load("res://addons/dialogic/Editor/Events/Fields/field_file.tscn").instantiate()
@@ -520,7 +533,7 @@ static func _on_export_color_submitted(color:Color, property_name:String, callab
 static func _on_export_int_enum_submitted(item:int, property_name:String, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(item))
 
-static func _on_export_number_submitted(value:float, property_name:String, callable: Callable) -> void:
+static func _on_export_number_submitted(property_name:String, value:float, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(value))
 
 static func _on_export_file_submitted(property_name:String, value:String, callable: Callable) -> void:
@@ -532,6 +545,13 @@ static func _on_export_string_enum_submitted(value:int, property_name:String, li
 static func _on_export_vector_submitted(property_name:String, value:Variant, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(value))
 
+static func _on_export_vectori_submitted(property_name:String, value:Variant, callable: Callable) -> void:
+	match typeof(value):
+		TYPE_VECTOR2: value = Vector2i(value)
+		TYPE_VECTOR3: value = Vector3i(value)
+		TYPE_VECTOR4: value = Vector4i(value)
+	callable.call(property_name, var_to_str(value))
+
 static func _on_export_dict_submitted(property_name:String, value:Variant, callable: Callable) -> void:
 	callable.call(property_name, var_to_str(value))
 

addons/dialogic/Editor/Events/Fields/field_number.gd

@@ -14,8 +14,8 @@ extends DialogicVisualEditorField
 @export var allow_string: bool = false
 @export var step: float = 0.1
 @export var enforce_step: bool = true
-@export var min: float = -INF
-@export var max: float = INF
+@export var min_value: float = -INF
+@export var max_value: float = INF
 @export var value = 0.0
 @export var prefix: String = ""
 @export var suffix: String = ""
@@ -37,8 +37,8 @@ func _load_display_info(info: Dictionary) -> void:
 
 	for option in info.keys():
 		match option:
-			'min': min = info[option]
-			'max': max = info[option]
+			'min': min_value = info[option]
+			'max': max_value = info[option]
 			'prefix': update_prefix(info[option])
 			'suffix': update_suffix(info[option])
 			'step':
@@ -61,22 +61,20 @@ func get_value() -> float:
 	return value
 
 
-func use_float_mode(value_step: float = 0.1) -> void:
-	#step = value_step
+func use_float_mode() -> void:
 	update_suffix("")
 	enforce_step = false
 
 
-func use_int_mode(value_step: float = 1) -> void:
-	#step = value_step
+func use_int_mode() -> void:
 	update_suffix("")
 	enforce_step = true
 
 
-func use_decibel_mode(value_step: float = step) -> void:
-	max = 6
+func use_decibel_mode() -> void:
+	max_value = 6
 	update_suffix("dB")
-	min = -80
+	min_value = -80
 
 #endregion
 
@@ -160,19 +158,22 @@ func _on_value_text_submitted(new_text: String, no_signal:= false) -> void:
 	if new_text.is_empty() and not allow_string:
 		new_text = "0.0"
 	if new_text.is_valid_float():
-		var temp: float = min(max(new_text.to_float(), min), max)
-		if !enforce_step:
+		var temp: float = min(max(new_text.to_float(), min_value), max_value)
+		if not enforce_step:
 			value = temp
 		else:
 			value = snapped(temp, step)
 	elif allow_string:
 		value = new_text
-	%Value.text = str(value).pad_decimals(len(str(float(step)-floorf(step)))-2)
+	%Value.text = str(value).pad_decimals(
+		max(
+			len(str(float(step)-floorf(step)))-2,
+			len(str(float(value)-floorf(value)))-2,))
 	if not no_signal:
 		value_changed.emit(property_name, value)
 	# Visually disable Up or Down arrow when limit is reached to better indicate a limit has been hit
-	%Spin/Decrement.disabled = value <= min
-	%Spin/Increment.disabled = value >= max
+	%Spin/Decrement.disabled = value <= min_value
+	%Spin/Increment.disabled = value >= max_value
 
 
 # If prefix or suffix was clicked, select the actual value box instead and move the caret to the closest side.

addons/dialogic/Editor/Events/Fields/field_number.tscn

@@ -34,16 +34,18 @@ border_color = Color(0, 0, 0, 0)
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_right = -1102.0
+offset_right = -1011.0
 offset_bottom = -617.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_constants/separation = 0
 script = ExtResource("1_0jdnn")
-mode = null
+min_value = 0.0
+max_value = null
 
 [node name="Value_Panel" type="PanelContainer" parent="."]
 layout_mode = 2
+size_flags_horizontal = 3
 theme_type_variation = &"DialogicEventEdit"
 
 [node name="Layout" type="HBoxContainer" parent="Value_Panel"]
@@ -61,8 +63,8 @@ size_flags_vertical = 4
 mouse_filter = 1
 mouse_default_cursor_shape = 1
 theme_override_colors/default_color = Color(0.54099, 0.540991, 0.54099, 1)
-theme_override_styles/focus = SubResource("StyleBoxEmpty_sj3oj")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_sj3oj")
+theme_override_styles/focus = SubResource("StyleBoxEmpty_sj3oj")
 bbcode_enabled = true
 fit_content = true
 scroll_active = false
@@ -78,11 +80,10 @@ layout_mode = 2
 size_flags_horizontal = 3
 focus_mode = 1
 theme_override_constants/minimum_character_width = 0
-theme_override_styles/focus = SubResource("StyleBoxEmpty_8yqsu")
-theme_override_styles/read_only = SubResource("StyleBoxEmpty_8yqsu")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_8yqsu")
+theme_override_styles/read_only = SubResource("StyleBoxEmpty_8yqsu")
+theme_override_styles/focus = SubResource("StyleBoxEmpty_8yqsu")
 text = "0"
-alignment = 1
 expand_to_text_length = true
 virtual_keyboard_type = 3
 
@@ -96,8 +97,8 @@ size_flags_horizontal = 8
 size_flags_vertical = 4
 mouse_default_cursor_shape = 1
 theme_override_colors/default_color = Color(0.435192, 0.435192, 0.435192, 1)
-theme_override_styles/focus = SubResource("StyleBoxEmpty_smq50")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_smq50")
+theme_override_styles/focus = SubResource("StyleBoxEmpty_smq50")
 bbcode_enabled = true
 fit_content = true
 scroll_active = false
@@ -122,11 +123,11 @@ focus_neighbor_top = NodePath(".")
 focus_neighbor_bottom = NodePath("../Decrement")
 theme_override_colors/icon_focus_color = Color(0.412738, 0.550094, 0.760917, 1)
 theme_override_colors/icon_hover_color = Color(0.412738, 0.550094, 0.760917, 1)
-theme_override_styles/focus = SubResource("StyleBoxFlat_increment")
-theme_override_styles/disabled = SubResource("StyleBoxFlat_increment")
-theme_override_styles/hover = SubResource("StyleBoxFlat_increment")
-theme_override_styles/pressed = SubResource("StyleBoxFlat_increment")
 theme_override_styles/normal = SubResource("StyleBoxFlat_increment")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_increment")
+theme_override_styles/hover = SubResource("StyleBoxFlat_increment")
+theme_override_styles/disabled = SubResource("StyleBoxFlat_increment")
+theme_override_styles/focus = SubResource("StyleBoxFlat_increment")
 icon = ExtResource("3_v5cne")
 flat = true
 vertical_icon_alignment = 2
@@ -140,11 +141,11 @@ focus_neighbor_top = NodePath("../Increment")
 focus_neighbor_bottom = NodePath(".")
 theme_override_colors/icon_focus_color = Color(0.412738, 0.550094, 0.760917, 1)
 theme_override_colors/icon_hover_color = Color(0.412738, 0.550094, 0.760917, 1)
-theme_override_styles/focus = SubResource("StyleBoxFlat_decrement")
-theme_override_styles/disabled = SubResource("StyleBoxFlat_decrement")
-theme_override_styles/hover = SubResource("StyleBoxFlat_decrement")
-theme_override_styles/pressed = SubResource("StyleBoxFlat_decrement")
 theme_override_styles/normal = SubResource("StyleBoxFlat_decrement")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_decrement")
+theme_override_styles/hover = SubResource("StyleBoxFlat_decrement")
+theme_override_styles/disabled = SubResource("StyleBoxFlat_decrement")
+theme_override_styles/focus = SubResource("StyleBoxFlat_decrement")
 icon = ExtResource("4_ph52o")
 flat = true
 vertical_icon_alignment = 2

addons/dialogic/Editor/Events/Fields/field_text_multiline.gd

@@ -31,7 +31,7 @@ func _autofocus() -> void:
 #region SIGNAL METHODS
 ################################################################################
 
-func _on_text_changed(value := "") -> void:
+func _on_text_changed(_value := "") -> void:
 	value_changed.emit(property_name, self.text)
 
 #endregion

addons/dialogic/Editor/Events/Fields/field_vector2.gd

@@ -24,3 +24,8 @@ func _on_sub_value_changed(sub_component: String, value: float) -> void:
 func _update_sub_component_text(value: Variant) -> void:
 	$X._on_value_text_submitted(str(value.x), true)
 	$Y._on_value_text_submitted(str(value.y), true)
+
+
+func _on_step_changed(new_step:float) -> void:
+	$X.step = new_step
+	$Y.step = new_step

addons/dialogic/Editor/Events/Fields/field_vector2.tscn

@@ -16,16 +16,16 @@ script = ExtResource("1_v6lp0")
 
 [node name="X" parent="." instance=ExtResource("2_a0b6y")]
 layout_mode = 2
-mode = 0
-step = 0.001
+size_flags_horizontal = 3
 enforce_step = false
 min = -9999.0
 max = 9999.0
+prefix = "x"
 
 [node name="Y" parent="." instance=ExtResource("2_a0b6y")]
 layout_mode = 2
-mode = 0
-step = 0.001
+size_flags_horizontal = 3
 enforce_step = false
 min = -9999.0
 max = 9999.0
+prefix = "y"

addons/dialogic/Editor/Events/Fields/field_vector3.gd

@@ -26,3 +26,9 @@ func _update_sub_component_text(value: Variant) -> void:
 	$X._on_value_text_submitted(str(value.x), true)
 	$Y._on_value_text_submitted(str(value.y), true)
 	$Z._on_value_text_submitted(str(value.z), true)
+
+
+func _on_step_changed(new_step:float) -> void:
+	$X.step = new_step
+	$Y.step = new_step
+	$Z.step = new_step

addons/dialogic/Editor/Events/Fields/field_vector3.tscn

@@ -10,7 +10,8 @@ script = ExtResource("2_gktf1")
 
 [node name="Z" parent="." index="2" instance=ExtResource("3_k0u0p")]
 layout_mode = 2
-step = 0.001
+size_flags_horizontal = 3
+enforce_step = false
 min = -9999.0
 max = 9999.0
-affix = "z:"
+prefix = "z"

addons/dialogic/Editor/Events/Fields/field_vector4.gd

@@ -28,3 +28,10 @@ func _update_sub_component_text(value: Variant) -> void:
 	$Y._on_value_text_submitted(str(value.y), true)
 	$Z._on_value_text_submitted(str(value.z), true)
 	$W._on_value_text_submitted(str(value.w), true)
+
+
+func _on_step_changed(new_step:float) -> void:
+	$X.step = new_step
+	$Y.step = new_step
+	$Z.step = new_step
+	$W.step = new_step

addons/dialogic/Editor/Events/Fields/field_vector4.tscn

@@ -8,9 +8,18 @@
 offset_right = -908.0
 script = ExtResource("2_yksrc")
 
+[node name="X" parent="." index="0"]
+size_flags_horizontal = 1
+prefix = ""
+
+[node name="Y" parent="." index="1"]
+size_flags_horizontal = 1
+prefix = ""
+
 [node name="W" parent="." index="3" instance=ExtResource("3_1jogk")]
 layout_mode = 2
-step = 0.001
+size_flags_horizontal = 3
+enforce_step = false
 min = -9999.0
 max = 9999.0
-affix = "w:"
+prefix = "w"