Skip to content

Commit

Permalink
Rework Reference Images (#786)
Browse files Browse the repository at this point in the history
  • Loading branch information
Qainguin committed Jun 6, 2024
1 parent a7e9136 commit e254c45
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 5 additions & 3 deletions src/FileUtils.gd
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static func open_reference_load_dialog() -> void:
if FileUtils._is_native_preferred():
DisplayServer.file_dialog_show(TranslationServer.translate("Load an image file"),
Utils.get_last_dir(), "", false, DisplayServer.FILE_DIALOG_MODE_OPEN_FILE,
PackedStringArray(["*.svg,*.png,*.jpeg,*.jpg,*.webp"]),
PackedStringArray(["*.png,*.jpeg,*.jpg,*.webp,*.svg"]),
native_reference_image_load)
# TODO: Add Web Support
#elif OS.has_feature("web"):
Expand All @@ -124,7 +124,7 @@ static func open_reference_load_dialog() -> void:
var image_import_dialog := GoodFileDialog.instantiate()
image_import_dialog.setup(Utils.get_last_dir(), "",
GoodFileDialogType.FileMode.SELECT,
PackedStringArray(["svg", "png", "jpeg", "jpg", "webp"]))
PackedStringArray(["png", "jpeg", "jpg", "webp", "svg"]))
HandlerGUI.add_overlay(image_import_dialog)
image_import_dialog.file_selected.connect(load_reference_image)

Expand All @@ -139,7 +139,9 @@ _filter_idx: int) -> void:
load_reference_image(files[0])

static func load_reference_image(path: String) -> void:
GlobalSettings.modify_save_data("reference_path", path)
var img = Image.new()
img.load_from_file(path)
img.save_png("user://reference_image.png")
Indications.imported_reference.emit()

static func apply_svg_from_path(path: String) -> int:
Expand Down
1 change: 0 additions & 1 deletion src/data_classes/SaveData.gd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ class_name SaveData extends Resource
const GoodColorPicker = preload("res://src/ui_elements/good_color_picker.gd")

@export var svg_text := ""
@export var reference_path := ""
@export var viewbox_coupling := true
@export var snap := -0.5 # Negative when disabled.
@export var color_picker_slider_mode := GoodColorPicker.SliderMode.RGB
Expand Down
3 changes: 1 addition & 2 deletions src/ui_parts/display.gd
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ func toggle_reference_overlay() -> void:
func load_reference_image() -> void:
FileUtils.open_reference_load_dialog()
await Indications.imported_reference
var ref_path = GlobalSettings.save_data.get("reference_path")
var img = Image.load_from_file(ref_path)
var img = Image.load_from_file("user://reference_image.png")
reference_texture.texture = ImageTexture.create_from_image(img)
reference_texture.show()

Expand Down
4 changes: 2 additions & 2 deletions src/ui_parts/display.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,17 @@ mouse_filter = 2
layout_mode = 2
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
theme_override_constants/outline_size = 4
theme_override_constants/line_spacing = 0
theme_override_constants/outline_size = 4
theme_override_font_sizes/font_size = 14
horizontal_alignment = 2

[node name="InputDebugLabel" type="Label" parent="ViewportPanel/DebugMargins/DebugContainer"]
layout_mode = 2
theme_override_colors/font_color = Color(0.75, 0.75, 0.75, 1)
theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
theme_override_constants/outline_size = 4
theme_override_constants/line_spacing = 0
theme_override_constants/outline_size = 4
theme_override_font_sizes/font_size = 14
horizontal_alignment = 2

Expand Down

0 comments on commit e254c45

Please sign in to comment.