huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00
Code Issues Wiki Activity

UndoRedo vol 5 - Added undo/redo for clear selection & flip h/v edit menu options

Browse source 
- Undo/redo for clear selection, flip horizontal & flip vertical
- Moved undo and redo on the top of the edit menu
This commit is contained in:
OverloadedOrama 2019-11-04 19:12:35 +02:00
parent 8fadacdf12
commit 4ba2f3280a
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Scripts/Main.gd
View file

@ -31,13 +31,13 @@ func _ready() -> void:
"Quit" : KEY_MASK_CTRL + KEY_Q "Quit" : KEY_MASK_CTRL + KEY_Q
} }
var edit_menu_items := { var edit_menu_items := {
"Undo" : KEY_MASK_CTRL + KEY_Z,
"Redo" : KEY_MASK_SHIFT + KEY_MASK_CTRL + KEY_Z,
"Scale Image" : 0, "Scale Image" : 0,
"Crop Image" : 0, "Crop Image" : 0,
"Clear Selection" : 0, "Clear Selection" : 0,
"Flip Horizontal": KEY_MASK_SHIFT + KEY_H, "Flip Horizontal": KEY_MASK_SHIFT + KEY_H,
"Flip Vertical": KEY_MASK_SHIFT + KEY_V, "Flip Vertical": KEY_MASK_SHIFT + KEY_V
"Undo" : KEY_MASK_CTRL + KEY_Z,
"Redo" : KEY_MASK_SHIFT + KEY_MASK_CTRL + KEY_Z
} }
var view_menu_items := { var view_menu_items := {
"Tile Mode" : KEY_MASK_CTRL + KEY_T, "Tile Mode" : KEY_MASK_CTRL + KEY_T,
@ -145,10 +145,14 @@ func file_menu_id_pressed(id : int) -> void:
func edit_menu_id_pressed(id : int) -> void: func edit_menu_id_pressed(id : int) -> void:
match id: match id:
0: #Scale Image 0: #Undo
Global.undo_redo.undo()
1: #Redo
Global.undo_redo.redo()
2: #Scale Image
$ScaleImage.popup_centered() $ScaleImage.popup_centered()
Global.can_draw = false Global.can_draw = false
1: #Crop Image 3: #Crop Image
#Use first layer as a starting rectangle #Use first layer as a starting rectangle
var used_rect : Rect2 = Global.canvas.layers[0][0].get_used_rect() var used_rect : Rect2 = Global.canvas.layers[0][0].get_used_rect()
#However, if first layer is empty, loop through all layers until we find one that isn't #However, if first layer is empty, loop through all layers until we find one that isn't
@ -178,28 +182,28 @@ func edit_menu_id_pressed(id : int) -> void:
var height = Global.canvas.layers[0][0].get_height() var height = Global.canvas.layers[0][0].get_height()
Global.canvas.size = Vector2(width, height).floor() Global.canvas.size = Vector2(width, height).floor()
Global.canvas.camera_zoom() Global.canvas.camera_zoom()
2: #Clear selection 4: #Clear selection
Global.canvas.handle_undo("Rectangle Select")
Global.selection_rectangle.polygon[0] = Vector2.ZERO Global.selection_rectangle.polygon[0] = Vector2.ZERO
Global.selection_rectangle.polygon[1] = Vector2.ZERO Global.selection_rectangle.polygon[1] = Vector2.ZERO
Global.selection_rectangle.polygon[2] = Vector2.ZERO Global.selection_rectangle.polygon[2] = Vector2.ZERO
Global.selection_rectangle.polygon[3] = Vector2.ZERO Global.selection_rectangle.polygon[3] = Vector2.ZERO
Global.selected_pixels.clear() Global.selected_pixels.clear()
3: # Flip Horizontal Global.canvas.handle_redo("Rectangle Select")
var canvas = Global.canvas 5: # Flip Horizontal
var canvas : Canvas = Global.canvas
canvas.handle_undo("Draw")
canvas.layers[canvas.current_layer_index][0].unlock() canvas.layers[canvas.current_layer_index][0].unlock()
canvas.layers[canvas.current_layer_index][0].flip_x() canvas.layers[canvas.current_layer_index][0].flip_x()
canvas.layers[canvas.current_layer_index][0].lock() canvas.layers[canvas.current_layer_index][0].lock()
canvas.update_texture(canvas.current_layer_index) canvas.handle_redo("Draw")
4: # Flip Vertical 6: # Flip Vertical
var canvas = Global.canvas var canvas : Canvas = Global.canvas
canvas.handle_undo("Draw")
canvas.layers[canvas.current_layer_index][0].unlock() canvas.layers[canvas.current_layer_index][0].unlock()
canvas.layers[canvas.current_layer_index][0].flip_y() canvas.layers[canvas.current_layer_index][0].flip_y()
canvas.layers[canvas.current_layer_index][0].lock() canvas.layers[canvas.current_layer_index][0].lock()
canvas.update_texture(canvas.current_layer_index) canvas.handle_redo("Draw")
5: #Undo
Global.undo_redo.undo()
6: #Redo
Global.undo_redo.redo()
func view_menu_id_pressed(id : int) -> void: func view_menu_id_pressed(id : int) -> void:
match id: match id:
@ -492,10 +496,11 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
func _on_ScaleImage_confirmed() -> void: func _on_ScaleImage_confirmed() -> void:
var width = $ScaleImage/VBoxContainer/WidthCont/WidthValue.value var width = $ScaleImage/VBoxContainer/WidthCont/WidthValue.value
var height = $ScaleImage/VBoxContainer/HeightCont/HeightValue.value var height = $ScaleImage/VBoxContainer/HeightCont/HeightValue.value
var interpolation = $ScaleImage/VBoxContainer/InterpolationContainer/InterpolationType.selected
for i in range(Global.canvas.layers.size() - 1, -1, -1): for i in range(Global.canvas.layers.size() - 1, -1, -1):
var sprite = Image.new() var sprite := Image.new()
sprite = Global.canvas.layers[i][1].get_data() sprite = Global.canvas.layers[i][1].get_data()
sprite.resize(width, height, $ScaleImage/VBoxContainer/InterpolationContainer/InterpolationType.selected) sprite.resize(width, height, interpolation)
Global.canvas.layers[i][0] = sprite Global.canvas.layers[i][0] = sprite
Global.canvas.layers[i][0].lock() Global.canvas.layers[i][0].lock()
Global.canvas.update_texture(i) Global.canvas.update_texture(i)