diff --git a/Prefabs/Dialogs/ImportSprites.tscn b/Prefabs/Dialogs/ImportSprites.tscn index cbd05bea4..b38d0c41f 100644 --- a/Prefabs/Dialogs/ImportSprites.tscn +++ b/Prefabs/Dialogs/ImportSprites.tscn @@ -23,12 +23,15 @@ margin_bottom = 312.0 [node name="ImportAsNewFrame" type="CheckBox" parent="HBoxContainer2"] margin_right = 156.0 margin_bottom = 304.0 +mouse_default_cursor_shape = 2 +pressed = true text = "IMPORT_FILE_LABEL" [node name="ImportSpritesheet" type="CheckBox" parent="HBoxContainer2"] margin_left = 160.0 margin_right = 327.0 margin_bottom = 304.0 +mouse_default_cursor_shape = 2 text = "Import as spritesheet" [node name="Spritesheet" type="HBoxContainer" parent="."] diff --git a/Scripts/Dialogs/CreateNewImage.gd b/Scripts/Dialogs/CreateNewImage.gd index 53dcc3d4f..dc0871da6 100644 --- a/Scripts/Dialogs/CreateNewImage.gd +++ b/Scripts/Dialogs/CreateNewImage.gd @@ -15,4 +15,3 @@ func _on_CreateNewImage_confirmed() -> void: Global.canvas.layers[0][0].fill(fill_color) Global.canvas.layers[0][0].lock() Global.canvas.update_texture(0) - Global.undo_redo.clear_history(false) diff --git a/Scripts/Dialogs/ImportSprites.gd b/Scripts/Dialogs/ImportSprites.gd index f9585f6b5..31876873e 100644 --- a/Scripts/Dialogs/ImportSprites.gd +++ b/Scripts/Dialogs/ImportSprites.gd @@ -1,6 +1,6 @@ extends FileDialog -var new_frame := false +var new_frame := true var import_spritesheet := false var spritesheet_horizontal := 1 var spritesheet_vertical := 1 @@ -107,6 +107,5 @@ func _on_ImportSprites_files_selected(paths : PoolStringArray) -> void: Global.canvas = Global.canvases[Global.canvases.size() - 1] Global.canvas.visible = true - Global.undo_redo.clear_history(false) OS.set_window_title(first_path.get_file() + " (imported) - Pixelorama") diff --git a/Scripts/Main.gd b/Scripts/Main.gd index ae1eb1dce..d89646ce2 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -431,7 +431,6 @@ func _on_OpenSprite_file_selected(path : String) -> void: brush_line = file.get_line() file.close() - Global.undo_redo.clear_history(false) OS.set_window_title(path.get_file() + " - Pixelorama") @@ -503,6 +502,7 @@ func clear_canvases() -> void: current_save_path = "" $ExportSprites.current_export_path = "" file_menu.set_item_text(5, "Export PNG...") + Global.undo_redo.clear_history(false) func _on_ImportSprites_popup_hide() -> void: if !opensprite_file_selected: @@ -721,17 +721,17 @@ func add_frame() -> void: func _on_LoopAnim_pressed() -> void: match animation_loop: 0: - #Make it loop + # Make it loop animation_loop = 1 Global.loop_animation_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Loop.png" % Global.theme_type) Global.loop_animation_button.hint_tooltip = "Cycle loop" 1: - #Make it ping-pong + # Make it ping-pong animation_loop = 2 Global.loop_animation_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Loop_PingPong.png" % Global.theme_type) Global.loop_animation_button.hint_tooltip = "Ping-pong loop" 2: - #Make it stop + # Make it stop animation_loop = 0 Global.loop_animation_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Loop_None.png" % Global.theme_type) Global.loop_animation_button.hint_tooltip = "No loop"