tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 22:44:42 -04:00
Code Issues Projects Releases Wiki Activity

Added Resize Canvas option to Image menu

Browse source
This commit is contained in:
OverloadedOrama 2020-06-13 20:22:25 +03:00
parent 53b91a4bf4
commit 7219a5a274
7 changed files with 142 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/UI/Dialogs/ResizeCanvas.gd Normal file
View file

@ -0,0 +1,7 @@
extends ConfirmationDialog
func _on_ResizeCanvas_confirmed() -> void:
var width : int = $VBoxContainer/OptionsContainer/WidthValue.value
var height : int = $VBoxContainer/OptionsContainer/HeightValue.value
DrawingAlgos.resize_canvas(width, height)

61
src/UI/Dialogs/ResizeCanvas.tscn Normal file
View file

@ -0,0 +1,61 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/UI/Dialogs/ResizeCanvas.gd" type="Script" id=1]
[node name="ResizeCanvas" type="ConfirmationDialog"]
margin_right = 200.0
margin_bottom = 114.0
script = ExtResource( 1 )
[node name="VBoxContainer" type="VBoxContainer" parent="."]
margin_left = 8.0
margin_top = 8.0
margin_right = 192.0
margin_bottom = 78.0
[node name="ImageSize" type="Label" parent="VBoxContainer"]
margin_right = 184.0
margin_bottom = 14.0
text = "Canvas Size"
[node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"]
margin_top = 18.0
margin_right = 184.0
margin_bottom = 70.0
custom_constants/vseparation = 4
custom_constants/hseparation = 2
columns = 2
[node name="WidthLabel" type="Label" parent="VBoxContainer/OptionsContainer"]
margin_top = 5.0
margin_right = 46.0
margin_bottom = 19.0
text = "Width:"
[node name="WidthValue" type="SpinBox" parent="VBoxContainer/OptionsContainer"]
margin_left = 48.0
margin_right = 122.0
margin_bottom = 24.0
mouse_default_cursor_shape = 2
min_value = 1.0
max_value = 16384.0
value = 64.0
suffix = "px"
[node name="Height" type="Label" parent="VBoxContainer/OptionsContainer"]
margin_top = 33.0
margin_right = 46.0
margin_bottom = 47.0
text = "Height:"
[node name="HeightValue" type="SpinBox" parent="VBoxContainer/OptionsContainer"]
margin_left = 48.0
margin_top = 28.0
margin_right = 122.0
margin_bottom = 52.0
mouse_default_cursor_shape = 2
min_value = 1.0
max_value = 16384.0
value = 64.0
suffix = "px"
[connection signal="confirmed" from="." to="." method="_on_ResizeCanvas_confirmed"]

46
src/UI/Dialogs/ScaleImage.tscn
View file

@ -2,8 +2,6 @@
[ext_resource path="res://src/UI/Dialogs/ScaleImage.gd" type="Script" id=1]
[node name="ScaleImage" type="ConfirmationDialog"]
margin_right = 200.0
margin_bottom = 114.0
@ -17,27 +15,27 @@ margin_bottom = 102.0
[node name="ImageSize" type="Label" parent="VBoxContainer"]
margin_right = 184.0
margin_bottom = 15.0
margin_bottom = 14.0
text = "Image Size"
[node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"]
margin_top = 19.0
margin_top = 18.0
margin_right = 184.0
margin_bottom = 90.0
margin_bottom = 94.0
custom_constants/vseparation = 4
custom_constants/hseparation = 2
columns = 2
[node name="WidthLabel" type="Label" parent="VBoxContainer/OptionsContainer"]
margin_top = 5.0
margin_right = 72.0
margin_bottom = 20.0
margin_right = 87.0
margin_bottom = 19.0
text = "Width:"
[node name="WidthValue" type="SpinBox" parent="VBoxContainer/OptionsContainer"]
margin_left = 72.0
margin_right = 155.0
margin_bottom = 25.0
margin_left = 89.0
margin_right = 168.0
margin_bottom = 24.0
mouse_default_cursor_shape = 2
min_value = 1.0
max_value = 16384.0
@ -45,16 +43,16 @@ value = 64.0
suffix = "px"
[node name="Height" type="Label" parent="VBoxContainer/OptionsContainer"]
margin_top = 30.0
margin_right = 72.0
margin_bottom = 45.0
margin_top = 33.0
margin_right = 87.0
margin_bottom = 47.0
text = "Height:"
[node name="HeightValue" type="SpinBox" parent="VBoxContainer/OptionsContainer"]
margin_left = 72.0
margin_top = 25.0
margin_right = 155.0
margin_bottom = 50.0
margin_left = 89.0
margin_top = 28.0
margin_right = 168.0
margin_bottom = 52.0
mouse_default_cursor_shape = 2
min_value = 1.0
max_value = 16384.0
@ -62,16 +60,16 @@ value = 64.0
suffix = "px"
[node name="InterpolationLabel" type="Label" parent="VBoxContainer/OptionsContainer"]
margin_top = 53.0
margin_right = 72.0
margin_bottom = 68.0
margin_top = 59.0
margin_right = 87.0
margin_bottom = 73.0
text = "Interpolation:"
[node name="InterpolationType" type="OptionButton" parent="VBoxContainer/OptionsContainer"]
margin_left = 72.0
margin_top = 50.0
margin_right = 155.0
margin_bottom = 71.0
margin_left = 89.0
margin_top = 56.0
margin_right = 168.0
margin_bottom = 76.0
text = "Nearest"
items = [ "Nearest", null, false, 0, null, "Bilinear", null, false, 1, null, "Cubic", null, false, 2, null, "Trilinear", null, false, 3, null, "Lanczos", null, false, 4, null ]
selected = 0

23
src/UI/TopMenuContainer.gd
View file

@ -79,6 +79,7 @@ func setup_image_menu() -> void:
var image_menu_items := {
"Scale Image" : 0,
"Crop Image" : 0,
"Resize Canvas" : 0,
"Flip Horizontal" : InputMap.get_action_list("image_flip_horizontal")[0].get_scancode_with_modifiers(),
"Flip Vertical" : InputMap.get_action_list("image_flip_vertical")[0].get_scancode_with_modifiers(),
"Rotate Image" : 0,
@ -275,25 +276,28 @@ func image_menu_id_pressed(id : int) -> void:
1: # Crop Image
DrawingAlgos.crop_image(image)
2: # Flip Horizontal
2: # Resize Canvas
show_resize_canvas_popup()
3: # Flip Horizontal
flip_image(true)
3: # Flip Vertical
4: # Flip Vertical
flip_image(false)
4: # Rotate
5: # Rotate
show_rotate_image_popup()
5: # Invert Colors
6: # Invert Colors
DrawingAlgos.invert_image_colors(image)
6: # Desaturation
7: # Desaturation
DrawingAlgos.desaturate_image(image)
7: # Outline
8: # Outline
show_add_outline_popup()
8: # HSV
9: # HSV
show_hsv_configuration_popup()
@ -302,6 +306,11 @@ func show_scale_image_popup() -> void:
Global.dialog_open(true)
func show_resize_canvas_popup() -> void:
Global.control.get_node("ResizeCanvas").popup_centered()
Global.dialog_open(true)
func flip_image(horizontal : bool) -> void:
var image : Image = Global.current_project.frames[Global.current_project.current_frame].cels[Global.current_project.current_layer].image
Global.canvas.handle_undo("Draw")