From 8118381b0bd82dc176f24704ab4aeefe5775696a Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Tue, 9 Jun 2020 18:44:08 +0300 Subject: [PATCH] Fixed issue where new images had the size of the previous project --- src/Canvas.gd | 4 ++-- src/Classes/Cel.gd | 4 +++- src/Classes/Frame.gd | 1 + src/UI/Dialogs/CreateNewImage.gd | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Canvas.gd b/src/Canvas.gd index 466289d..9936bb7 100644 --- a/src/Canvas.gd +++ b/src/Canvas.gd @@ -243,7 +243,7 @@ func camera_zoom() -> void: Global.transparent_checker._ready() # To update the rect size -func new_empty_frame(first_time := false, single_layer := false) -> Frame: +func new_empty_frame(first_time := false, single_layer := false, size := Global.current_project.size) -> Frame: var frame := Frame.new() for l in Global.current_project.layers: # Create as many cels as there are layers # The sprite itself @@ -255,7 +255,7 @@ func new_empty_frame(first_time := false, single_layer := false) -> Frame: Global.current_project.size.y = Global.config_cache.get_value("preferences", "default_image_height") if Global.config_cache.has_section_key("preferences", "default_fill_color"): fill_color = Global.config_cache.get_value("preferences", "default_fill_color") - sprite.create(Global.current_project.size.x, Global.current_project.size.y, false, Image.FORMAT_RGBA8) + sprite.create(size.x, size.y, false, Image.FORMAT_RGBA8) sprite.fill(fill_color) sprite.lock() frame.cels.append(Cel.new(sprite, 1)) diff --git a/src/Classes/Cel.gd b/src/Classes/Cel.gd index da1fe80..1a79058 100644 --- a/src/Classes/Cel.gd +++ b/src/Classes/Cel.gd @@ -1,5 +1,7 @@ class_name Cel extends Reference -# A class for cel properties +# A class for cel properties. +# The term "cel" comes from "celluloid" (https://en.wikipedia.org/wiki/Cel). +# The "image" variable is where the image data of each cel are. var image : Image setget image_changed diff --git a/src/Classes/Frame.gd b/src/Classes/Frame.gd index 70e453f..ed7bd62 100644 --- a/src/Classes/Frame.gd +++ b/src/Classes/Frame.gd @@ -5,5 +5,6 @@ class_name Frame extends Reference var cels : Array # An array of Cels + func _init(_cels := []) -> void: cels = _cels diff --git a/src/UI/Dialogs/CreateNewImage.gd b/src/UI/Dialogs/CreateNewImage.gd index 9548ded..152e2ea 100644 --- a/src/UI/Dialogs/CreateNewImage.gd +++ b/src/UI/Dialogs/CreateNewImage.gd @@ -74,7 +74,7 @@ func _on_CreateNewImage_confirmed() -> void: var height : int = height_value.value var fill_color : Color = fill_color_node.color - var frame : Frame = Global.canvas.new_empty_frame(false, true) + var frame : Frame = Global.canvas.new_empty_frame(false, true, Vector2(width, height)) var new_project := Project.new([frame]) new_project.layers.append(Layer.new()) Global.projects.append(new_project)