Fix export scale precision issues (#1775)

Author: MewPurPur

src/data_classes/ElementLinearGradient.gd

@@ -20,7 +20,7 @@ func get_percentage_handling(attribute_name: String) -> DB.PercentageHandling:
 func generate_texture() -> DPITexture:
 	var svg_texture_text := """<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg"><linearGradient id="a" """
 
-	var scaling := Vector2(64.0, 64.0) / svg.get_size()
+	var scaling := Vector2(64/svg.width, 64/svg.height)
 	var is_user_space_on_use := (get_attribute_value("gradientUnits") == "userSpaceOnUse")
 
 	for attrib in ["x1", "x2"]:

src/data_classes/ElementRadialGradient.gd

@@ -21,7 +21,7 @@ func get_percentage_handling(attribute_name: String) -> DB.PercentageHandling:
 func generate_texture() -> DPITexture:
 	var svg_texture_text := """<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg"><radialGradient id="a" """
 
-	var scaling := Vector2(64.0, 64.0) / svg.get_size()
+	var scaling := Vector2(64/svg.width, 64/svg.height)
 	var is_user_space_on_use := (get_attribute_value("gradientUnits") == "userSpaceOnUse")
 
 	for attrib in ["cx", "fx"]:

src/data_classes/ElementSVG.gd

@@ -1,6 +1,7 @@
 ## An <svg> element.
 class_name ElementSVG extends Element
 
+# These are important to keep as 64-bit in some situations.
 var width: float
 var height: float
 var precise_viewbox := PackedFloat64Array([0, 0, 0, 0])
@@ -91,9 +92,6 @@ func world_to_canvas(pos: Vector2) -> Vector2:
 func world_to_canvas_64_bit(pos: PackedFloat64Array) -> PackedFloat64Array:
 	return Utils64Bit.transform_vector_mult(Utils64Bit.get_transform_affine_inverse(canvas_precise_transform), pos)
 
-func get_size() -> Vector2:
-	return Vector2(width, height)
-
 
 func _get_own_default(attribute_name: String) -> String:
 	match attribute_name:

src/ui_parts/export_menu.gd

@@ -17,7 +17,8 @@ var export_data_resources: Dictionary[String, ImageExportData] = {
 	"dds": ImageExportDataDDS.new(),
 }
 var current_format := ""
-var dimensions := Vector2.ZERO
+var svg_width := 0.0
+var svg_height := 0.0
 
 @onready var dimensions_label: Label = %DimensionsLabel
 @onready var texture_preview: PreviewRect = %TexturePreview
@@ -47,14 +48,15 @@ func _ready() -> void:
 	format_dropdown.value_changed.connect(_on_format_dropdown_value_changed)
 
 	# Update dimensions label.
-	dimensions = State.root_element.get_size()
-	dimensions_label.text = Translator.translate("Dimensions") + ": " + get_dimensions_text(dimensions)
+	svg_width = State.root_element.width
+	svg_height = State.root_element.height
+	dimensions_label.text = Translator.translate("Dimensions") + ": " + get_dimensions_text(svg_width, svg_height)
 	set_current_format("svg")
 
 	# Setup the warning for when the image is too big to have a preview.
-	var scaling_factor := texture_preview.MAX_IMAGE_DIMENSION / maxf(dimensions.x, dimensions.y)
+	var scaling_factor := texture_preview.MAX_IMAGE_DIMENSION / maxf(svg_width, svg_height)
 	info_tooltip.tooltip_text = Translator.translate("Preview image size is limited to {dimensions}").format(
-			{"dimensions": get_dimensions_text(Vector2(maxf(dimensions.x * scaling_factor, 1.0), maxf(dimensions.y * scaling_factor, 1.0)), true)})
+			{"dimensions": get_dimensions_text(maxf(svg_width * scaling_factor, 1.0), maxf(svg_height * scaling_factor, 1.0), true)})
 	info_tooltip.modulate = ThemeUtils.info_icon_color
 
 	if Configs.savedata.get_active_tab().svg_file_path.is_empty():
@@ -121,7 +123,7 @@ func set_current_format(new_format: String) -> void:
 	if is_instance_valid(new_properties_scene_root):
 		content_container.add_child(new_properties_scene_root)
 		HandlerGUI.register_focus_sequence(content_container, [new_properties_scene_root])
-		new_properties_scene_root.setup(get_edited_export_data(), undo_redo, dimensions)
+		new_properties_scene_root.setup(get_edited_export_data(), undo_redo, svg_width, svg_height)
 
 	var file_name := Utils.get_file_name(Configs.savedata.get_active_tab().svg_file_path)
 	if not file_name.is_empty():
@@ -139,21 +141,21 @@ func _on_edited_export_data_changed() -> void:
 	var export_size: int
 	if export_data is ImageExportDataRaster:
 		texture_preview.setup_image(export_data)
-		var export_size_factor := roundf(export_data.upscale_amount * maxf(dimensions.x, dimensions.y)) / texture_preview.MAX_IMAGE_DIMENSION
+		var export_size_factor := roundf(export_data.upscale_amount * maxf(svg_width, svg_height)) / texture_preview.MAX_IMAGE_DIMENSION
 		# Calculate or estimate size. WebP fares better when scaled.
 		if not export_data is ImageExportDataWEBP:
 			export_size_factor **= 2
 		export_size = roundi(texture_preview.last_image_size * maxf(1.0, export_size_factor))
 		final_size_label.text = Translator.translate("Size") if export_size_factor <= 1.0 else Translator.translate("Estimated size")
 	else:
-		texture_preview.setup_svg(State.get_export_text(), dimensions)
+		texture_preview.setup_svg(State.get_export_text(), Vector2(svg_width, svg_height))
 		export_size = State.get_export_text().length()
 		final_size_label.text = Translator.translate("Size")
 
 	final_size_label.text += ": " + String.humanize_size(export_size)
 	info_tooltip.visible = (export_data is ImageExportDataRaster and\
-			roundi(export_data.upscale_amount * maxf(dimensions.x, dimensions.y)) > texture_preview.MAX_IMAGE_DIMENSION)
+			roundi(export_data.upscale_amount * maxf(svg_width, svg_height)) > texture_preview.MAX_IMAGE_DIMENSION)
 
-func get_dimensions_text(sides: Vector2, integer := false) -> String:
+func get_dimensions_text(width: float, height: float, integer := false) -> String:
 	var precision := 0 if integer else 2
-	return "%s×%s" % [Utils.num_simple(sides.x, precision), Utils.num_simple(sides.y, precision)]
+	return "%s×%s" % [Utils.num_simple(width, precision), Utils.num_simple(height, precision)]

src/ui_parts/import_warning_menu.gd

@@ -1,12 +1,14 @@
 extends PanelContainer
 
+const PreviewRect = preload("res://src/ui_widgets/preview_rect.gd")
+
 var import_success := false
 
 signal imported
 signal canceled
 
 @onready var warnings_label: RichTextLabel = %WarningsLabel
-@onready var texture_preview: CenterContainer = %TexturePreview
+@onready var texture_preview: PreviewRect = %TexturePreview
 @onready var ok_button: Button = %ButtonContainer/OKButton
 @onready var margin_container: MarginContainer = %MarginContainer
 @onready var cancel_button: Button = $VBoxContainer/ButtonContainer/CancelButton
@@ -34,7 +36,7 @@ func _ready() -> void:
 		var preview_parse_result := SVGParser.markup_to_root(preview_text)
 		var preview := preview_parse_result.svg
 		if is_instance_valid(preview):
-			texture_preview.setup_svg(SVGParser.root_to_editor_markup(preview), preview.get_size())
+			texture_preview.setup_svg(SVGParser.root_to_editor_markup(preview), Vector2(preview.width, preview.height))
 
 	if imported_text_parse_result.error != SVGParser.ParseError.OK:
 		texture_preview.hide()

src/ui_parts/main_canvas.gd

@@ -34,13 +34,15 @@ func sync_camera_zoom_in_tab() -> void:
 	Configs.savedata.get_active_tab().camera_zoom = camera_zoom
 
 func sync_svg_size() -> void:
-	if _current_svg_size != root_element.get_size():
-		_current_svg_size = root_element.get_size()
+	if _current_svg_width != root_element.width or _current_svg_height != root_element.height:
+		_current_svg_width = root_element.width
+		_current_svg_width = root_element.height
 		sync_checkerboard()
 		center_frame()
 		queue_redraw()
 
-var _current_svg_size: Vector2
+var _current_svg_width: float
+var _current_svg_height: float
 
 func react_to_last_parsing() -> void:
 	if State.last_parse_error == SVGParser.ParseError.OK:
@@ -53,7 +55,8 @@ func _on_svg_changed(is_edit: bool) -> void:
 	if is_edit:
 		sync_svg_size()
 	else:
-		_current_svg_size = root_element.get_size()
+		_current_svg_width = root_element.width
+		_current_svg_height = root_element.height
 	queue_texture_update()
 	handles_manager.queue_update_handles()
 

src/ui_parts/previews.gd

@@ -40,7 +40,7 @@ class IconPreviewTileData extends RefCounted:
 	func _init(new_index: int) -> void:
 		index = new_index
 		bigger_dimension = Configs.savedata.preview_presentation_sizes[index]
-		var svg_size := State.root_element.get_size()
+		var svg_size := Vector2(State.root_element.width, State.root_element.height)
 		var multiplier := bigger_dimension / maxf(svg_size.x, svg_size.y)
 		svg_size *= multiplier
 		var font := ThemeUtils.main_font
@@ -281,9 +281,8 @@ func _sync_texture() -> void:
 	var tile := tiles[selected_tile_index]
 	size_label.text = tile.dimensions_text + tile.additional_text
 
-	var svg_size := State.root_element.get_size()
-	var multiplier := Configs.savedata.preview_presentation_sizes[selected_tile_index] / maxf(svg_size.x, svg_size.y)
-	texture_rect.texture = Configs.savedata.preview_presentation.generate_texture(multiplier)
+	texture_rect.texture = Configs.savedata.preview_presentation.generate_texture(
+			Configs.savedata.preview_presentation_sizes[selected_tile_index] / maxf(State.root_element.width, State.root_element.height))
 
 
 func _generate_tile_popup(tile: IconPreviewTileData) -> ContextPopup:

src/ui_widgets/Canvas.gd

@@ -150,15 +150,15 @@ func toggle_show_handles() -> void:
 	handles_manager.update_show_handles()
 
 func center_frame() -> void:
-	var available_size := size * ZOOM_RESET_BUFFER
-	var ratio := available_size / root_element.get_size()
-	if ratio.is_finite():
-		camera_zoom = nearest_po2(ceili(minf(ratio.x, ratio.y) * 32.0)) / 64.0
+	var ratio_x := size.x * ZOOM_RESET_BUFFER / root_element.width
+	var ratio_y := size.y * ZOOM_RESET_BUFFER / root_element.height
+	if is_finite(ratio_x) and is_finite(ratio_y):
+		camera_zoom = nearest_po2(ceili(minf(ratio_x, ratio_y) * 32.0)) / 64.0
 	else:
 		camera_zoom = 1.0
 
 	adjust_view()
-	set_view(root_element.get_size() / 2.0)
+	set_view(Vector2(root_element.width, root_element.height) / 2)
 
 func sync_canvas_transform() -> void:
 	viewport.canvas_transform = Transform2D(0.0, Vector2(camera_zoom, camera_zoom), 0.0, -get_camera_position() * camera_zoom)
@@ -212,9 +212,8 @@ func _texture_update() -> void:
 
 
 func sync_checkerboard() -> void:
-	var root_element_size := root_element.get_size()
-	if root_element_size.is_finite():
-		checkerboard.size = root_element_size
+	if is_finite(root_element.width) and is_finite(root_element.height):
+		checkerboard.size = Vector2(root_element.width, root_element.height)
 
 
 func update_show_grid() -> void:

src/ui_widgets/export_properties_jpg.gd

@@ -18,7 +18,7 @@ func _ready() -> void:
 	background_label.text = Translator.translate("Background") + ":"
 	HandlerGUI.register_focus_sequence(self, [quality_edit, background_edit, export_scale_config])
 
-func setup(new_export_data_object: ImageExportDataJPG, new_undo_redo: UndoRedoRef, dimensions: Vector2) -> void:
+func setup(new_export_data_object: ImageExportDataJPG, new_undo_redo: UndoRedoRef, new_width: float, new_height: float) -> void:
 	export_data_object = new_export_data_object
 	undo_redo = new_undo_redo
 
@@ -46,7 +46,7 @@ func setup(new_export_data_object: ImageExportDataJPG, new_undo_redo: UndoRedoRe
 				export_data_object.background_color = new_background_color
 	)
 
-	export_scale_config.setup(dimensions, export_data_object.upscale_amount)
+	export_scale_config.setup(new_width, new_height, export_data_object.upscale_amount)
 	export_scale_config.scale_changed.connect(
 		func(new_value: float) -> void:
 			undo_redo.create_action()

src/ui_widgets/export_properties_raster_lossless.gd

@@ -14,7 +14,7 @@ func _ready() -> void:
 	background_label.text = Translator.translate("Background") + ":"
 	HandlerGUI.register_focus_sequence(self, [background_edit, export_scale_config])
 
-func setup(new_export_data_object: ImageExportDataRaster, new_undo_redo: UndoRedoRef, dimensions: Vector2) -> void:
+func setup(new_export_data_object: ImageExportDataRaster, new_undo_redo: UndoRedoRef, new_width: float, new_height: float) -> void:
 	export_data_object = new_export_data_object
 	undo_redo = new_undo_redo
 
@@ -31,7 +31,7 @@ func setup(new_export_data_object: ImageExportDataRaster, new_undo_redo: UndoRed
 				export_data_object.background_color = new_background_color
 	)
 
-	export_scale_config.setup(dimensions, export_data_object.upscale_amount)
+	export_scale_config.setup(new_width, new_height, export_data_object.upscale_amount)
 	# The actual limit is ~2 million pixels, but that doesn't seem relevant.
 	if export_data_object is ImageExportDataPNG:
 		export_scale_config.max_dimension = 65535